769 files changed, 0 insertions, 151267 deletions

diff --git a/qpid/dotnet/LICENCE.txt b/qpid/dotnet/LICENCE.txt
deleted file mode 100644
index 6b0b1270ff..0000000000
--- a/qpid/dotnet/LICENCE.txt
+++ /dev/null
@@ -1,203 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
diff --git a/qpid/dotnet/NOTICE.txt b/qpid/dotnet/NOTICE.txt
deleted file mode 100644
index 910974b01c..0000000000
--- a/qpid/dotnet/NOTICE.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-=========================================================================
-==  NOTICE file corresponding to the section 4 d of                    ==
-==  the Apache License, Version 2.0,                                   ==
-==  in this case for the Apache Ant distribution.                      ==
-=========================================================================
-
-Apache Qpid.NET
-Copyright 2006 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
-This product also includes software developed by:
-
-  - The SAXON XSLT Processor from Michael Kay distributed under the Mozilla
-    Public License v1.0, which is available for download at
-    http://saxon.sourceforge.net/
-
-  - The nunit library, Copyright © 2002 James W. Newkirk, Michael C. Two,
-    Alexei A. Vorontsov or Copyright © 2000-2002 Philip A. Craig. Available
-    under terms based on the zlib/libpng licence. Available from 
-    http://www.nunit.org/
-
-  - The Mentalis Security Library, Copyright © 2002-2006, , The Mentalis.org Team
-    under tterms based on the BSD license (http://www.mentalis.org/site/license.qpx).
-    Available from http://www.mentalis.org/soft/projects/seclib/
\ No newline at end of file
diff --git a/qpid/dotnet/Qpid.Buffer.Tests/Properties/AssemblyInfo.cs b/qpid/dotnet/Qpid.Buffer.Tests/Properties/AssemblyInfo.cs
deleted file mode 100644
index 1191d49954..0000000000
--- a/qpid/dotnet/Qpid.Buffer.Tests/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System.Reflection;

-using System.Runtime.CompilerServices;

-using System.Runtime.InteropServices;

-

-// General Information about an assembly is controlled through the following 

-// set of attributes. Change these attribute values to modify the information

-// associated with an assembly.

-[assembly: AssemblyTitle("Apache.Qpid.Buffer.Tests")]

-[assembly: AssemblyDescription("")]

-[assembly: AssemblyConfiguration("")]

-[assembly: AssemblyCompany("")]

-[assembly: AssemblyProduct("Apache.Qpid.Buffer.Tests")]

-[assembly: AssemblyCopyright("Copyright ©  2007")]

-[assembly: AssemblyTrademark("")]

-[assembly: AssemblyCulture("")]

-

-// Setting ComVisible to false makes the types in this assembly not visible 

-// to COM components.  If you need to access a type in this assembly from 

-// COM, set the ComVisible attribute to true on that type.

-[assembly: ComVisible(false)]

-

-// The following GUID is for the ID of the typelib if this project is exposed to COM

-[assembly: Guid("9d967d0b-9454-4f00-8f53-fa86fd62b696")]

-

-// Version information for an assembly consists of the following four values:

-//

-//      Major Version

-//      Minor Version 

-//      Build Number

-//      Revision

-//

-// You can specify all the values or you can default the Revision and Build Numbers 

-// by using the '*' as shown below:

-[assembly: AssemblyVersion("1.0.0.0")]

-[assembly: AssemblyFileVersion("1.0.0.0")]

diff --git a/qpid/dotnet/Qpid.Buffer.Tests/Qpid.Buffer.Tests.csproj b/qpid/dotnet/Qpid.Buffer.Tests/Qpid.Buffer.Tests.csproj
deleted file mode 100644
index c3459aff29..0000000000
--- a/qpid/dotnet/Qpid.Buffer.Tests/Qpid.Buffer.Tests.csproj
+++ /dev/null
@@ -1,59 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <PropertyGroup>

-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ProductVersion>8.0.50727</ProductVersion>

-    <SchemaVersion>2.0</SchemaVersion>

-    <ProjectGuid>{74640962-99D0-4D06-B57A-9CD66517CF52}</ProjectGuid>

-    <OutputType>Library</OutputType>

-    <AppDesignerFolder>Properties</AppDesignerFolder>

-    <RootNamespace>Apache.Qpid.Buffer.Tests</RootNamespace>

-    <AssemblyName>Apache.Qpid.Buffer.Tests</AssemblyName>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

-    <DebugSymbols>true</DebugSymbols>

-    <DebugType>full</DebugType>

-    <Optimize>false</Optimize>

-    <OutputPath>..\bin\net-2.0\debug\</OutputPath>

-    <DefineConstants>DEBUG;TRACE</DefineConstants>

-    <ErrorReport>prompt</ErrorReport>

-    <WarningLevel>4</WarningLevel>

-    <UseVSHostingProcess>true</UseVSHostingProcess>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

-    <DebugType>pdbonly</DebugType>

-    <Optimize>true</Optimize>

-    <OutputPath>..\bin\net-2.0\release\</OutputPath>

-    <DefineConstants>TRACE</DefineConstants>

-    <ErrorReport>prompt</ErrorReport>

-    <WarningLevel>4</WarningLevel>

-  </PropertyGroup>

-  <ItemGroup>

-    <Reference Include="nunit.framework, Version=2.2.8.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77">

-      <SpecificVersion>False</SpecificVersion>

-      <HintPath>..\Qpid.Client.Tests\lib\nunit\nunit.framework.dll</HintPath>

-    </Reference>

-    <Reference Include="System" />

-    <Reference Include="System.Data" />

-    <Reference Include="System.Xml" />

-  </ItemGroup>

-  <ItemGroup>

-    <Compile Include="SlicedByteBufferTests.cs" />

-    <Compile Include="SimpleByteBufferTests.cs" />

-    <Compile Include="Properties\AssemblyInfo.cs" />

-  </ItemGroup>

-  <ItemGroup>

-    <ProjectReference Include="..\Qpid.Buffer\Qpid.Buffer.csproj">

-      <Project>{44384DF2-B0A4-4580-BDBC-EE4BAA87D995}</Project>

-      <Name>Qpid.Buffer</Name>

-    </ProjectReference>

-  </ItemGroup>

-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

-       Other similar extension points exist, see Microsoft.Common.targets.

-  <Target Name="BeforeBuild">

-  </Target>

-  <Target Name="AfterBuild">

-  </Target>

-  -->

-</Project>

diff --git a/qpid/dotnet/Qpid.Buffer.Tests/SimpleByteBufferTests.cs b/qpid/dotnet/Qpid.Buffer.Tests/SimpleByteBufferTests.cs
deleted file mode 100644
index 9af8801627..0000000000
--- a/qpid/dotnet/Qpid.Buffer.Tests/SimpleByteBufferTests.cs
+++ /dev/null
@@ -1,333 +0,0 @@
-/*

- *

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- *

- */

-

-using NUnit.Framework;

-using Apache.Qpid.Buffer;

-

-namespace Apache.Qpid.Buffer.Tests

-{

-   /// <summary>

-   /// Tests for the SimpleByteBuffer class

-   /// </summary>

-   [TestFixture]

-   public class SimpleByteBufferTests

-   {

-      [Test]

-      public void CanCreateNewBuffer()

-      {

-         const int size = 10;

-         ByteBuffer buffer = ByteBuffer.Allocate(size);

-         Assert.AreEqual(size, buffer.Capacity);

-         Assert.AreEqual(0, buffer.Position);

-         Assert.AreEqual(size, buffer.Remaining);

-         Assert.AreEqual(true, buffer.HasRemaining);

-      }

-

-      [Test]

-      public void CanWrapArray()

-      {

-         byte[] array = new byte[10];

-         for ( int i=0; i < array.Length; i++ )

-         {

-            array[i] = (byte) i;

-         }

-         ByteBuffer buffer = ByteBuffer.Wrap(array);

-         // the buffer should be the same size, 

-         // and positioned at the end

-         Assert.AreEqual(array.Length, buffer.Capacity);

-         Assert.AreEqual(array.Length, buffer.Position);

-         Assert.AreEqual(array.Length, buffer.Limit);

-      }

-

-      #region Base Read/Write tests

-      //

-      // Base Read/Write tests

-      //

-      [Test]

-      public void CanReadWriteBytes()

-      {

-         ByteBuffer buffer = ByteBuffer.Allocate(10);

-         buffer.Put((byte)0x01).Put((byte)0x02).Put((byte)0x03);

-         buffer.Rewind();

-         Assert.AreEqual(0x01, buffer.GetByte());

-         Assert.AreEqual(0x02, buffer.GetByte());

-         Assert.AreEqual(0x03, buffer.GetByte());

-      }

-

-      [Test]

-      [ExpectedException(typeof(BufferUnderflowException))]

-      public void ThrowOnReadByteWithNoSpace()

-      {

-         ByteBuffer buffer = ByteBuffer.Allocate(1);

-         buffer.Put((byte)0x01);

-         buffer.GetByte();

-      }

-

-      [Test]

-      [ExpectedException(typeof(BufferOverflowException))]

-      public void ThrowOnWriteByteWithNoSpace()

-      {

-         ByteBuffer buffer = ByteBuffer.Allocate(1);

-         buffer.Put((byte)0x01).Put((byte)0x02);

-      }

-

-      #endregion Base Read/Write tests

-

-      #region Other Buffer Operations

-      //

-      // Other Buffer Operations

-      //

-      

-      [Test]

-      public void CanFlipBuffer()

-      {

-         ByteBuffer buffer = ByteBuffer.Allocate(10);

-         buffer.Put((byte)0x01).Put((byte)0x02).Put((byte)0x03);

-         buffer.Flip();

-         Assert.AreEqual(10, buffer.Capacity);

-         Assert.AreEqual(3, buffer.Limit);

-         Assert.AreEqual(0, buffer.Position);

-         Assert.AreEqual(3, buffer.Remaining);

-      }

-

-      [Test]

-      public void CanCompactBuffer()

-      {

-         ByteBuffer buffer = ByteBuffer.Allocate(10);

-         buffer.Put((byte)0x01).Put((byte)0x02).Put((byte)0x03);

-         buffer.Flip();

-         buffer.Position = 1;

-         buffer.Compact();

-         Assert.AreEqual(10, buffer.Capacity);

-         Assert.AreEqual(10, buffer.Limit);

-         Assert.AreEqual(2, buffer.Position);

-         Assert.AreEqual(8, buffer.Remaining);

-         buffer.Rewind();

-         Assert.AreEqual((byte)0x02, buffer.GetByte());

-         Assert.AreEqual((byte)0x03, buffer.GetByte());

-      }

-

-      [Test]

-      public void CanClearBuffer()

-      {

-         ByteBuffer buffer = ByteBuffer.Allocate(10);

-         buffer.Put((byte)0x01).Put((byte)0x02).Put((byte)0x03);

-         buffer.Flip();

-         buffer.Position = 2;

-         buffer.Clear();

-         Assert.AreEqual(10, buffer.Capacity);

-         Assert.AreEqual(10, buffer.Limit);

-         Assert.AreEqual(0, buffer.Position);

-         Assert.AreEqual(10, buffer.Remaining);

-      }

-

-      [Test]

-      public void CanExpandBuffer()

-      {

-         ByteBuffer buffer = ByteBuffer.Allocate(10);

-         buffer.Put((byte)0x01).Put((byte)0x02).Put((byte)0x03);

-         buffer.Flip();

-         buffer.Position = 2;

-         int pos = buffer.Position;

-         buffer.Expand(20);

-

-         Assert.AreEqual(pos, buffer.Position);

-         Assert.IsTrue(buffer.Remaining >= 20);

-         buffer.Rewind();

-         Assert.AreEqual(0x01, buffer.GetByte());

-      }

-

-      [Test]

-      public void CanAutoExpand()

-      {

-         ByteBuffer buffer = ByteBuffer.Allocate(2);

-         buffer.IsAutoExpand = true;

-         // should cause autoexpand

-         buffer.Put((byte)0x01).Put((byte)0x02).Put((byte)0x03);

-         Assert.IsTrue(buffer.Capacity > 2);

-      }

-

-      [Test]

-      public void CanGetArray()

-      {

-         ByteBuffer buffer = ByteBuffer.Allocate(10);

-         buffer.Put((byte)0x01).Put((byte)0x02).Put((byte)0x03);

-         buffer.Flip();

-

-         byte[] array = buffer.Array;

-         for ( int i=0; i < buffer.Limit; i++ )

-         {

-            Assert.AreEqual(buffer.GetByte(), array[i]);

-         }

-      }

-

-      [Test]

-      public void CanSkip()

-      {

-         ByteBuffer buffer = ByteBuffer.Allocate(10);

-         buffer.Skip(4);

-         Assert.AreEqual(4, buffer.Position);

-      }

-

-      #endregion // Base Read/Write tests

-

-      #region Typed Accessors

-      //

-      // Typed Accessors

-      //

-      [Test]

-      public void CanReadWriteSByte()

-      {

-         ByteBuffer buffer = ByteBuffer.Allocate(10);

-         sbyte value = -12;

-         buffer.Put(value);

-         buffer.Flip();

-         Assert.AreEqual(value, buffer.GetSByte());

-      }

-      [Test]

-      public void CanReadWriteUInt16()

-      {

-         ByteBuffer buffer = ByteBuffer.Allocate(10);

-         ushort value = 41233;

-         buffer.Put(value);

-         buffer.Flip();

-         Assert.AreEqual(value, buffer.GetUInt16());

-      }

-      [Test]

-      public void CanReadWriteInt16()

-      {

-         ByteBuffer buffer = ByteBuffer.Allocate(10);

-         short value = -21233;

-         buffer.Put(value);

-         buffer.Flip();

-         Assert.AreEqual(value, buffer.GetInt16());

-      }

-      [Test]

-      public void CanReadWriteUInt32()

-      {

-         ByteBuffer buffer = ByteBuffer.Allocate(10);

-         uint value = 41233211;

-         buffer.Put(value);

-         buffer.Flip();

-         Assert.AreEqual(value, buffer.GetUInt32());

-      }

-      [Test]

-      public void CanReadWriteInt32()

-      {

-         ByteBuffer buffer = ByteBuffer.Allocate(10);

-         int value = -22221233;

-         buffer.Put(value);

-         buffer.Flip();

-         Assert.AreEqual(value, buffer.GetInt32());

-      }

-      [Test]

-      public void CanReadWriteUInt64()

-      {

-         ByteBuffer buffer = ByteBuffer.Allocate(10);

-         ulong value = 41233218871;

-         buffer.Put(value);

-         buffer.Flip();

-         Assert.AreEqual(value, buffer.GetUInt64());

-      }

-      [Test]

-      public void CanReadWriteInt64()

-      {

-         ByteBuffer buffer = ByteBuffer.Allocate(10);

-         long value = -9887335411;

-         buffer.Put(value);

-         buffer.Flip();

-         Assert.AreEqual(value, buffer.GetInt64());

-      }

-      [Test]

-      public void CanReadWriteFloat()

-      {

-         ByteBuffer buffer = ByteBuffer.Allocate(10);

-         float value = -1.2331f;

-         buffer.Put(value);

-         buffer.Flip();

-         Assert.AreEqual(value, buffer.GetFloat());

-      }

-

-      [Test]

-      public void CanReadWriteDouble()

-      {

-         ByteBuffer buffer = ByteBuffer.Allocate(10);

-         double value = -1.2331E12;

-         buffer.Put(value);

-         buffer.Flip();

-         Assert.AreEqual(value, buffer.GetDouble());

-      }

-

-      [Test]

-      public void CanReadWriteChar()

-      {

-         ByteBuffer buffer = ByteBuffer.Allocate(10);

-         char value = 'H';

-         buffer.Put(value);

-         buffer.Flip();

-         Assert.AreEqual(value, buffer.GetChar());

-      }

-

-      [Test]

-      public void CanReadWriteByteArray()

-      {

-         ByteBuffer buffer = ByteBuffer.Allocate(10);

-         buffer.Put(new byte[] { 0x01, 0x02, 0x03});

-         buffer.Flip();

-         byte[] data = new byte[3];

-         buffer.GetBytes(data);

-         Assert.AreEqual(0x01, data[0]);

-         Assert.AreEqual(0x02, data[1]);

-         Assert.AreEqual(0x03, data[2]);

-      }

-

-      [Test]

-      public void CanReadWriteByteArrayWithOffset()

-      {

-         ByteBuffer buffer = ByteBuffer.Allocate(10);

-         buffer.Put(new byte[] { 0x01, 0x02, 0x03, 0x04, 0x05 }, 1, 4);

-         buffer.Flip();

-         byte[] data = new byte[3];

-         buffer.GetBytes(data, 2, 1);

-         Assert.AreEqual(0x00, data[0]);

-         Assert.AreEqual(0x00, data[1]);

-         Assert.AreEqual(0x02, data[2]);

-      }

-

-      [Test]

-      public void CanWriteByteBuffer()

-      {

-         ByteBuffer buffer1 = ByteBuffer.Allocate(10);

-         buffer1.Put((byte)0x01).Put((byte)0x02).Put((byte)0x03);

-         buffer1.Flip();

-

-         ByteBuffer buffer2 = ByteBuffer.Allocate(10);

-         buffer2.Put(buffer1);

-         buffer2.Flip();

-         Assert.AreEqual(buffer1.Limit, buffer2.Limit);

-         Assert.AreEqual(0x01, buffer2.GetByte());

-      }

-      #endregion // Typed Accessors

-

-   } // class SimpleByteBufferTests

-}

-

-

diff --git a/qpid/dotnet/Qpid.Buffer.Tests/SlicedByteBufferTests.cs b/qpid/dotnet/Qpid.Buffer.Tests/SlicedByteBufferTests.cs
deleted file mode 100644
index 071aa23830..0000000000
--- a/qpid/dotnet/Qpid.Buffer.Tests/SlicedByteBufferTests.cs
+++ /dev/null
@@ -1,133 +0,0 @@
-/*

- *

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- *

- */

-

-using System;

-using NUnit.Framework;

-using Apache.Qpid.Buffer;

-

-namespace Apache.Qpid.Buffer.Tests

-{

-   /// <summary>

-   /// Tests for the SlicedByteBuffer class

-   /// </summary>

-   [TestFixture]

-   public class SlicedByteBufferTests

-   {

-      private ByteBuffer _baseBuffer;

-

-      [SetUp]

-      public void Setup()

-      {

-         const int size = 50;

-         _baseBuffer = ByteBuffer.Allocate(size);

-         for ( byte b = 0; b < 10; b++ )

-         {

-            _baseBuffer.Put(b);

-         }

-         _baseBuffer.Flip();

-      }

-

-      [Test]

-      public void CanSliceBuffer()

-      {

-         _baseBuffer.Position = 5;

-

-         ByteBuffer slice = _baseBuffer.Slice();

-         Assert.AreEqual(5, slice.Capacity);

-         Assert.AreEqual(0, slice.Position);

-         Assert.AreEqual(5, slice.Remaining);

-         Assert.AreEqual(5, slice.Limit);

-      }

-

-      [Test]

-      public void CanReadWriteSlice()

-      {

-         _baseBuffer.Position = 5;

-

-         ByteBuffer slice = _baseBuffer.Slice();

-         slice.Put((byte) 0xFF).Put((byte) 0xF0).Put((byte) 0xA0);

-         slice.Flip();

-

-         Assert.AreEqual(3, slice.Limit);

-         Assert.AreEqual(0xFF, slice.GetByte());

-         Assert.AreEqual(0xF0, slice.GetByte());

-         Assert.AreEqual(0xA0, slice.GetByte());

-      }

-

-      [Test]

-      public void WriteModifiesBaseBufferOnCorrectPosition()

-      {

-         _baseBuffer.Position = 5;

-

-         ByteBuffer slice = _baseBuffer.Slice();

-         slice.Put((byte) 0xFF);

-         slice.Flip();

-         // reading the _baseBuffer at position 5 should yield 0xFF

-         _baseBuffer.Position = 5;

-         Assert.AreEqual(0xFF, _baseBuffer.GetByte());

-         

-      }

-

-      [Test]

-      public void CanReadWriteByteArray()

-      {

-         _baseBuffer.Position = 5;

-

-         ByteBuffer slice = _baseBuffer.Slice();

-         byte[] data = {0xFF, 0xF0, 0xF2, 0xEE, 0x23};

-         slice.Put(data, 2, 2);

-         slice.Flip();

-

-         Assert.AreEqual(2, slice.Limit);

-         Assert.AreEqual(0xF2, slice.GetByte());

-         Assert.AreEqual(0xEE, slice.GetByte());

-      }

-

-      [Test]

-      [ExpectedException(typeof(BufferOverflowException))]

-      public void ThrowWhenWritePastLimit()

-      {

-         _baseBuffer.Position = 5;

-

-         ByteBuffer slice = _baseBuffer.Slice();

-         slice.Put(0x01).Put(0x02);

-      }

-

-

-      [Test]

-      [ExpectedException(typeof(NotSupportedException))]

-      public void ThrowOnCompact()

-      {

-         // we don't support compacting

-         ByteBuffer slice = _baseBuffer.Slice();

-         slice.Compact();

-      }

-

-      [Test]

-      [ExpectedException(typeof(NotSupportedException))]

-      public void ThrowOnResize()

-      {

-         // we don't support resizing

-         ByteBuffer slice = _baseBuffer.Slice();

-         slice.Expand(50);

-      }

-   } // class SlicedByteBufferTests

-}

diff --git a/qpid/dotnet/Qpid.Buffer.Tests/default.build b/qpid/dotnet/Qpid.Buffer.Tests/default.build
deleted file mode 100644
index 688633fc11..0000000000
--- a/qpid/dotnet/Qpid.Buffer.Tests/default.build
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0"?>

-<project name="Apache.Qpid.Buffer" default="test">

-

-   <target name="build">

-        <csc target="library" 

-			define="${build.defines}" 

-			warnaserror="true" debug="${build.debug}" 

-         output="${build.dir}/${project::get-name()}.Tests.dll">

-			

-            <sources>

-                <include name="**/*.cs" />

-            </sources>

-            <references>

-               <include name="${build.dir}/nunit.framework.dll" />

-               <include name="${build.dir}/${project::get-name()}.dll" />

-            </references>

-            

-        </csc>

-    </target>

-    <target name="test" depends="build">

-         <nunit2>

-            <formatter type="${nant.formatter}" usefile="false" />

-            <test assemblyname="${build.dir}/${project::get-name()}.Tests.dll" />

-         </nunit2>

-    </target>

-</project>

-

diff --git a/qpid/dotnet/Qpid.Buffer/BufferOverflowException.cs b/qpid/dotnet/Qpid.Buffer/BufferOverflowException.cs
deleted file mode 100644
index 5a2fff74a7..0000000000
--- a/qpid/dotnet/Qpid.Buffer/BufferOverflowException.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using System;
-using System.Runtime.Serialization;
-
-namespace Apache.Qpid.Buffer
-{
-    [Serializable]
-    public class BufferOverflowException : Exception
-    {
-        public BufferOverflowException(string message) : base(message)
-        {
-        }
-
-         protected BufferOverflowException(SerializationInfo info, StreamingContext ctxt)
-           : base(info, ctxt)
-        {
-        }
-    }
-}
-
-
-
diff --git a/qpid/dotnet/Qpid.Buffer/BufferUnderflowException.cs b/qpid/dotnet/Qpid.Buffer/BufferUnderflowException.cs
deleted file mode 100644
index 13939b77a8..0000000000
--- a/qpid/dotnet/Qpid.Buffer/BufferUnderflowException.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using System;
-using System.Runtime.Serialization;
-
-namespace Apache.Qpid.Buffer
-{
-    [Serializable]
-    public class BufferUnderflowException : Exception
-    {
-        public BufferUnderflowException(string message)
-            : base(message)
-        {
-        }
-
-        protected BufferUnderflowException(SerializationInfo info, StreamingContext ctxt)
-           : base(info, ctxt)
-        {
-        }
-    }
-}
-
-
-
diff --git a/qpid/dotnet/Qpid.Buffer/ByteBuffer.cs b/qpid/dotnet/Qpid.Buffer/ByteBuffer.cs
deleted file mode 100644
index 67f0edd440..0000000000
--- a/qpid/dotnet/Qpid.Buffer/ByteBuffer.cs
+++ /dev/null
@@ -1,982 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using System;
-
-namespace Apache.Qpid.Buffer
-{
-   /// <summary>
-   /// Abstract class implementing a byte buffer
-   /// </summary>
-   public abstract class ByteBuffer
-   {
-      private int _position;
-      private int _limit;
-      private bool _isAutoExpand;
-      private static IByteBufferAllocator _allocator = 
-         new SimpleByteBufferAllocator();
-
-      #region Properties
-      //
-      // Properties
-      //
-
-      /// <summary>
-      /// The maximum number of bytes the buffer can hold
-      /// </summary>
-      public abstract int Capacity
-      {
-         get;
-      }
-
-      /// <summary>
-      /// Return the backing array of this buffer
-      /// </summary>
-      public abstract byte[] Array
-      { 
-         get;
-      }
-      
-      /// <summary>
-      /// The current position inside this buffer
-      /// </summary>
-      public int Position
-      {
-         get { return _position; }
-         set { Seek(value); }
-      }
-
-      /// <summary>
-      /// Index of the first element that should not be read or written. 
-      /// A buffer's limit is never negative and is never greater than the its capacity.
-      /// </summary>
-      public int Limit
-      {
-         get { return _limit; }
-         set { SetLimit(value);  }
-      }
-
-      /// <summary>
-      /// Number of bytes remaining in the buffer from the current position
-      /// </summary>
-      public int Remaining
-      {
-         get { return Limit - Position; }
-      }
-
-      /// <summary>
-      /// True if there are bytes remaining in the buffer
-      /// </summary>
-      public bool HasRemaining
-      {
-         get { return Remaining > 0; }
-      }
-
-      /// <summary>
-      /// If true, the buffer will be resized as necessary
-      /// to allow space for writing. By default is false.
-      /// </summary>
-      public bool IsAutoExpand
-      {
-         get { return _isAutoExpand; }
-         set { _isAutoExpand = value; }
-      }
-
-      #endregion // Properties
-
-      #region Buffer Manipulation
-      //
-      // Buffer Manipulation
-      //
-
-      /// <summary>
-      /// Move the buffer to Position 0
-      /// </summary>
-      /// <returns>This instance</returns>
-      public ByteBuffer Rewind()
-      {
-         Seek(0);
-         return this;
-      }
-
-      /// <summary>
-      /// Prepare the buffer to read back what's been written
-      /// </summary>
-      /// <returns>This instance</returns>
-      public ByteBuffer Flip()
-      {
-         Limit = Position;
-         Position = 0;
-         return this;
-      }
-
-      /// <summary>
-      /// Compact this buffer.
-      /// </summary>
-      /// <returns>This instance</returns>
-      /// <remarks>
-      /// The bytes between the buffer's current position and its limit, if any, 
-      /// are copied to the beginning of the buffer.
-      /// </remarks>
-      public ByteBuffer Compact()
-      {
-         DoCompact();
-         return this;
-      }
-
-      /// <summary>
-      /// Clears this buffer. The position is set to zero, the limit is set to the capacity
-      /// </summary>
-      /// <returns>This instance</returns>
-      public ByteBuffer Clear()
-      {
-         Limit = Capacity;
-         Position = 0;
-         return this;
-      }
-
-      /// <summary>
-      /// Expands this buffer's capacity so that 
-      /// Remaining == expectedRemaining
-      /// </summary>
-      /// <param name="expectedRemaining">Number of bytes that should be accessable after resizing</param>
-      /// <returns>This instance</returns>
-      public ByteBuffer Expand(int expectedRemaining)
-      {
-         return Expand(Position, expectedRemaining);
-      }
-
-      /// <summary>
-      /// Expands this buffer's capacity so that 
-      /// Remaining == expectedRemaining
-      /// </summary>
-      /// <param name="position">Position from which to start the resize</param>
-      /// <param name="expectedRemaining">Number of bytes that should be accessable after resizing</param>
-      /// <returns>This instance</returns>
-      public ByteBuffer Expand(int position, int expectedRemaining)
-      {
-         if ( expectedRemaining <= 0 )
-            throw new ArgumentException("expectedRemaining must be greater than 0");
-
-         int end = position + expectedRemaining;
-         if ( end > Capacity )
-         {
-            DoResize(end);
-         }
-         if ( end > Limit )
-            Limit = end;
-         return this;
-      }
-
-      /// <summary>
-      /// Creates a new byte buffer whose content is a shared 
-      /// subsequence of this buffer's content.
-      /// </summary>
-      /// <remarks>
-      ///  The content of the new buffer will start at this buffer's current position. 
-      /// Changes to this buffer's content will be visible in the new buffer, 
-      /// and vice versa; the two buffers' position and limit values will be independent.
-      /// <para>
-      /// The new buffer's position will be zero, its capacity and its limit will 
-      /// be the number of bytes remaining in this buffer.
-      /// </para>
-      /// </remarks>
-      /// <returns>A view on top of this instance</returns>
-      public ByteBuffer Slice()
-      {
-         return new SlicedByteBuffer(this);
-      }
-
-      /// <summary>
-      /// Skip the specified number of bytes
-      /// </summary>
-      /// <param name="numBytes">Number of bytes to move forward by</param>
-      /// <returns>This instance</returns>
-      public ByteBuffer Skip(int numBytes)
-      {
-         Position += numBytes;
-         return this;
-      }
-
-      /// <summary>
-      /// Acquire this buffer to keep it alive.
-      /// </summary>
-      public virtual void Acquire()
-      {
-         // override in subclass if supported
-      }
-
-      /// <summary>
-      /// Release this buffer instance
-      /// </summary>
-      public virtual void Release()
-      {
-         // override in subclass if supported
-      }
-
-      /// <summary>
-      /// Return a string with a Hex Dump of this buffer's contents
-      /// </summary>
-      /// <returns>The hex dump</returns>
-      public string GetHexDump()
-      {
-         return ByteBufferHexDumper.GetHexDump(this);
-      }
-
-      public override string ToString()
-      {
-         return GetHexDump();
-      }
-      #endregion // Buffer Manipulation
-
-      #region Static Operations
-      //
-      // Static Operations
-      //
-      /// <summary>
-      /// Replaces the default allocator with your own implementation
-      /// </summary>
-      /// <param name="allocator">New allocator</param>
-      public static void SetAllocator(IByteBufferAllocator allocator)
-      {
-         if ( allocator == null )
-            throw new ArgumentNullException("allocator");
-         _allocator = allocator;
-      }
-
-      /// <summary>
-      /// Allocate a new buffer with the specified capacity
-      /// using the default allocator
-      /// </summary>
-      /// <param name="capacity">Desired capacity</param>
-      /// <returns>The new buffer</returns>
-      public static ByteBuffer Allocate(int capacity)
-      {
-         return _allocator.Allocate(capacity);
-      }
-
-      /// <summary>
-      /// Wraps the specified arrat into a new buffer
-      /// </summary>
-      /// <param name="buffer"></param>
-      /// <returns></returns>
-      public static ByteBuffer Wrap(byte[] buffer)
-      {
-         return _allocator.Wrap(buffer);
-      }
-      #endregion // Static Operations
-
-      #region Data Accessors
-      //
-      // Data Accessors
-      //
-      
-      // Byte Stuff
-
-      /// <summary>
-      /// Read the next byte in the buffer
-      /// </summary>
-      /// <returns>The next byte available</returns>
-      public byte GetByte()
-      {
-         byte value = GetByte(Position);
-         Position += 1;
-         return value;
-      }
-      /// <summary>
-      /// Read the byte at the specified position
-      /// </summary>
-      /// <param name="position">Position to read from</param>
-      /// <returns>The value at the position</returns>
-      public byte GetByte(int position)
-      {
-         CheckSpaceForReading(position, 1);
-         return ReadByte(position);
-      }
-      /// <summary>
-      /// Write a byte at the current position
-      /// </summary>
-      /// <param name="value">Value to write</param>
-      /// <returns>This instance</returns>
-      public ByteBuffer Put(byte value)
-      {
-         Put(Position, value);
-         Position++;
-         return this;
-      }
-      /// <summary>
-      /// Write a byte at the specified position
-      /// </summary>
-      /// <param name="position">Position to write to</param>
-      /// <param name="value">Value to write</param>
-      /// <returns>This instance</returns>
-      public ByteBuffer Put(int position, byte value)
-      {
-         CheckSpaceForWriting(position, 1);
-         Write(position, value);
-         return this;
-      }
-
-      // SByte Stuff
-
-      /// <summary>
-      /// Read the next signed byte in the buffer
-      /// </summary>
-      /// <returns>The next signed byte available</returns>
-      public sbyte GetSByte()
-      {
-         sbyte value = GetSByte(Position);
-         Position += 1;
-         return value;
-      }
-      /// <summary>
-      /// Read the signed byte at the specified position
-      /// </summary>
-      /// <param name="position">Position to read from</param>
-      /// <returns>The value at the position</returns>
-      public sbyte GetSByte(int position)
-      {
-         CheckSpaceForReading(position, 1);
-         return (sbyte)ReadByte(position);
-      }
-
-      /// <summary>
-      /// Write a signed byte at the current position
-      /// </summary>
-      /// <param name="value">Value to write</param>
-      /// <returns>This instance</returns>
-      public ByteBuffer Put(sbyte value)
-      {
-         Put(Position, value);
-         Position += 1;
-         return this;
-      }
-
-      /// <summary>
-      /// Write a signed byte at the specified position
-      /// </summary>
-      /// <param name="position">Position to write to</param>
-      /// <param name="value">Value to write</param>
-      /// <returns>This instance</returns>
-      public ByteBuffer Put(int position, sbyte value)
-      {
-         CheckSpaceForWriting(position, 1);
-         Write(position, (byte)value);
-         return this;
-      }
-
-      // UInt16 Stuff
-
-      /// <summary>
-      /// Read the next uint16 in the buffer
-      /// </summary>
-      /// <returns>The next uint16 available</returns>
-      public ushort GetUInt16()
-      {
-         ushort value = GetUInt16(Position);
-         Position += 2;
-         return value;
-      }
-      /// <summary>
-      /// Read the uint16 at the specified position
-      /// </summary>
-      /// <param name="position">Position to read from</param>
-      /// <returns>The value at the position</returns>
-      public ushort GetUInt16(int position)
-      {
-         CheckSpaceForReading(position, 2);
-         byte upper = ReadByte(position);
-         byte lower = ReadByte(position+1);
-         return (ushort)(((ushort)upper << 8) + lower);
-      }
-
-      /// <summary>
-      /// Write a uint16 at the current position
-      /// </summary>
-      /// <param name="value">Value to write</param>
-      /// <returns>This instance</returns>
-      public ByteBuffer Put(ushort value)
-      {
-         Put(Position, value);
-         Position += 2;
-         return this;
-      }
-
-      /// <summary>
-      /// Write a uint16 at the specified position
-      /// </summary>
-      /// <param name="position">Position to write to</param>
-      /// <param name="value">Value to write</param>
-      /// <returns>This instance</returns>
-      public ByteBuffer Put(int position, ushort value)
-      {
-         CheckSpaceForWriting(position, 2);
-         Write(position, (byte)(value >> 8));
-         Write(position+1, (byte)(value));
-         return this;
-      }
-
-      // Int16 Stuff
-
-      /// <summary>
-      /// Read the next int16 in the buffer
-      /// </summary>
-      /// <returns>The next int16 available</returns>
-      public short GetInt16()
-      {
-         return (short) GetUInt16();
-      }
-      /// <summary>
-      /// Read the int16 at the specified position
-      /// </summary>
-      /// <param name="position">Position to read from</param>
-      /// <returns>The value at the position</returns>
-      public short GetInt16(int position)
-      {
-         return (short)GetUInt16(position);
-      }
-
-      /// <summary>
-      /// Write a int16 at the current position
-      /// </summary>
-      /// <param name="value">Value to write</param>
-      /// <returns>This instance</returns>
-      public ByteBuffer Put(short value)
-      {
-         return Put((ushort) value);
-      }
-
-      /// <summary>
-      /// Write a int16 at the specified position
-      /// </summary>
-      /// <param name="position">Position to write to</param>
-      /// <param name="value">Value to write</param>
-      /// <returns>This instance</returns>
-      public ByteBuffer Put(int position, short value)
-      {
-         return Put(position, (ushort)value);
-      }
-
-
-      // UInt32 Stuff
-
-      /// <summary>
-      /// Read the next uint32 in the buffer
-      /// </summary>
-      /// <returns>The next uint32 available</returns>
-      public uint GetUInt32()
-      {
-         uint value = GetUInt32(Position);
-         Position += 4;
-         return value;
-      }
-      /// <summary>
-      /// Read the uint32 at the specified position
-      /// </summary>
-      /// <param name="position">Position to read from</param>
-      /// <returns>The value at the position</returns>
-      public uint GetUInt32(int position)
-      {
-         CheckSpaceForReading(position, 4);
-         byte b1 = ReadByte(position);
-         byte b2 = ReadByte(position + 1);
-         byte b3 = ReadByte(position + 2);
-         byte b4 = ReadByte(position + 3);
-         return (uint)((b1 << 24) + (b2 << 16) + (b3 << 8) + b4);
-      }
-
-      /// <summary>
-      /// Write a uint32 at the current position
-      /// </summary>
-      /// <param name="value">Value to write</param>
-      /// <returns>This instance</returns>
-      public ByteBuffer Put(uint value)
-      {
-         Put(Position, value);
-         Position += 4;
-         return this;
-      }
-
-      /// <summary>
-      /// Write a uint32 at the specified position
-      /// </summary>
-      /// <param name="position">Position to write to</param>
-      /// <param name="value">Value to write</param>
-      /// <returns>This instance</returns>
-      public ByteBuffer Put(int position, uint value)
-      {
-         CheckSpaceForWriting(position, 4);
-         Write(position, (byte)(value >> 24));
-         Write(position + 1, (byte)(value >> 16));
-         Write(position + 2, (byte)(value >> 8));
-         Write(position + 3, (byte)(value));
-         return this;
-      }
-
-      // Int32 Stuff
-
-      /// <summary>
-      /// Read the next int32 in the buffer
-      /// </summary>
-      /// <returns>The next int32 available</returns>
-      public int GetInt32()
-      {
-         return (int)GetUInt32();
-      }
-      /// <summary>
-      /// Read the int32 at the specified position
-      /// </summary>
-      /// <param name="position">Position to read from</param>
-      /// <returns>The value at the position</returns>
-      public int GetInt32(int position)
-      {
-         return (int)GetUInt32(position);
-      }
-
-      /// <summary>
-      /// Write a int32 at the current position
-      /// </summary>
-      /// <param name="value">Value to write</param>
-      /// <returns>This instance</returns>
-      public ByteBuffer Put(int value)
-      {
-         return Put((uint)value);
-      }
-
-      /// <summary>
-      /// Write a int32 at the specified position
-      /// </summary>
-      /// <param name="position">Position to write to</param>
-      /// <param name="value">Value to write</param>
-      /// <returns>This instance</returns>
-      public ByteBuffer Put(int position, int value)
-      {
-         return Put(position, (uint)value);
-      }
-
-      // UInt64 Stuff
-
-      /// <summary>
-      /// Read the next uint64 in the buffer
-      /// </summary>
-      /// <returns>The next uint64 available</returns>
-      public ulong GetUInt64()
-      {
-         ulong value = GetUInt64(Position);
-         Position += 8;
-         return value;
-      }
-      /// <summary>
-      /// Read the uint64 at the specified position
-      /// </summary>
-      /// <param name="position">Position to read from</param>
-      /// <returns>The value at the position</returns>
-      public ulong GetUInt64(int position)
-      {
-         CheckSpaceForReading(position, 8);
-         byte b1 = ReadByte(position);
-         byte b2 = ReadByte(position + 1);
-         byte b3 = ReadByte(position + 2);
-         byte b4 = ReadByte(position + 3);
-         byte b5 = ReadByte(position + 4);
-         byte b6 = ReadByte(position + 5);
-         byte b7 = ReadByte(position + 6);
-         byte b8 = ReadByte(position + 7);
-         // all the casts necessary because otherwise each subexpression
-         // only gets promoted to uint and cause incorrect results
-         return (((ulong)b1 << 56) + ((ulong)b2 << 48) + ((ulong)b3 << 40) +
-            ((ulong)b4 << 32) + ((ulong)b5 << 24) +
-            ((ulong)b6 << 16) + ((ulong)b7 << 8) + b8);
-      }
-
-      /// <summary>
-      /// Write a uint64 at the current position
-      /// </summary>
-      /// <param name="value">Value to write</param>
-      /// <returns>This instance</returns>
-      public ByteBuffer Put(ulong value)
-      {
-         Put(Position, value);
-         Position += 8;
-         return this;
-      }
-
-      /// <summary>
-      /// Write a uint64 at the specified position
-      /// </summary>
-      /// <param name="position">Position to write to</param>
-      /// <param name="value">Value to write</param>
-      /// <returns>This instance</returns>
-      public ByteBuffer Put(int position, ulong value)
-      {
-         CheckSpaceForWriting(position, 8);
-         Write(position, (byte)(value >> 56));
-         Write(position + 1, (byte)(value >> 48));
-         Write(position + 2, (byte)(value >> 40));
-         Write(position + 3, (byte)(value >> 32));
-         Write(position + 4, (byte)(value >> 24));
-         Write(position + 5, (byte)(value >> 16));
-         Write(position + 6, (byte)(value >> 8));
-         Write(position + 7, (byte)(value));
-         return this;
-      }
-
-      // Int64 Stuff
-
-      /// <summary>
-      /// Read the next int64 in the buffer
-      /// </summary>
-      /// <returns>The next int64 available</returns>
-      public long GetInt64()
-      {
-         return (long)GetUInt64();
-      }
-      /// <summary>
-      /// Read the int64 at the specified position
-      /// </summary>
-      /// <param name="position">Position to read from</param>
-      /// <returns>The value at the position</returns>
-      public long GetInt64(int position)
-      {
-         return (long)GetUInt64(position);
-      }
-
-      /// <summary>
-      /// Write a int64 at the current position
-      /// </summary>
-      /// <param name="value">Value to write</param>
-      /// <returns>This instance</returns>
-      public ByteBuffer Put(long value)
-      {
-         return Put((ulong)value);
-      }
-
-      /// <summary>
-      /// Write a int64 at the specified position
-      /// </summary>
-      /// <param name="position">Position to write to</param>
-      /// <param name="value">Value to write</param>
-      /// <returns>This instance</returns>
-      public ByteBuffer Put(int position, long value)
-      {
-         return Put(position, (ulong)value);
-      }
-
-
-      // Float Stuff
-
-      /// <summary>
-      /// Read the next float in the buffer
-      /// </summary>
-      /// <returns>The next float available</returns>
-      public float GetFloat()
-      {
-         unsafe
-         {
-            uint val = GetUInt32();
-            return *((float*)&val);
-         }
-      }
-      /// <summary>
-      /// Read the float at the specified position
-      /// </summary>
-      /// <param name="position">Position to read from</param>
-      /// <returns>The value at the position</returns>
-      public float GetFloat(int position)
-      {
-         unsafe
-         {
-            uint val = GetUInt32(position);
-            return *((float*)&val);
-         }
-      }
-
-      /// <summary>
-      /// Write a float at the current position
-      /// </summary>
-      /// <param name="value">Value to write</param>
-      /// <returns>This instance</returns>
-      public ByteBuffer Put(float value)
-      {
-         unsafe
-         {
-            uint val = *((uint*)&value);
-            return Put(val);
-         }
-      }
-
-      /// <summary>
-      /// Write a float at the specified position
-      /// </summary>
-      /// <param name="position">Position to write to</param>
-      /// <param name="value">Value to write</param>
-      /// <returns>This instance</returns>
-      public ByteBuffer Put(int position, float value)
-      {
-         unsafe
-         {
-            uint val = *((uint*)&value);
-            return Put(position, val);
-         }
-      }
-
-      // Double Stuff
-
-      /// <summary>
-      /// Read the next double in the buffer
-      /// </summary>
-      /// <returns>The next double available</returns>
-      public double GetDouble()
-      {
-         unsafe
-         {
-            ulong val = GetUInt64();
-            return *((double*)&val);
-         }
-      }
-      /// <summary>
-      /// Read the double at the specified position
-      /// </summary>
-      /// <param name="position">Position to read from</param>
-      /// <returns>The value at the position</returns>
-      public double GetDouble(int position)
-      {
-         unsafe
-         {
-            ulong val = GetUInt64(position);
-            return *((double*)&val);
-         }
-      }
-
-      /// <summary>
-      /// Write a double at the current position
-      /// </summary>
-      /// <param name="value">Value to write</param>
-      /// <returns>This instance</returns>
-      public ByteBuffer Put(double value)
-      {
-         unsafe
-         {
-            ulong val = *((ulong*)&value);
-            return Put(val);
-         }
-      }
-
-      /// <summary>
-      /// Write a double at the specified position
-      /// </summary>
-      /// <param name="position">Position to write to</param>
-      /// <param name="value">Value to write</param>
-      /// <returns>This instance</returns>
-      public ByteBuffer Put(int position, double value)
-      {
-         unsafe
-         {
-            ulong val = *((ulong*)&value);
-            return Put(position, val);
-         }
-      }
-
-      // Char Stuff
-
-      /// <summary>
-      /// Read the next char in the buffer
-      /// </summary>
-      /// <returns>The next char available</returns>
-      public char GetChar()
-      {
-         return (char)GetUInt16();
-      }
-      /// <summary>
-      /// Read the char at the specified position
-      /// </summary>
-      /// <param name="position">Position to read from</param>
-      /// <returns>The value at the position</returns>
-      public char GetChar(int position)
-      {
-         return (char)GetUInt16(position);
-      }
-
-      /// <summary>
-      /// Write a char at the current position
-      /// </summary>
-      /// <param name="value">Value to write</param>
-      /// <returns>This instance</returns>
-      public ByteBuffer Put(char value)
-      {
-         return Put((ushort) value);
-      }
-
-      /// <summary>
-      /// Write a char at the specified position
-      /// </summary>
-      /// <param name="position">Position to write to</param>
-      /// <param name="value">Value to write</param>
-      /// <returns>This instance</returns>
-      public ByteBuffer Put(int position, char value)
-      {
-         return Put(position, (ushort)value);
-      }
-
-      // Byte[] stuff
-
-      public void GetBytes(byte[] buffer)
-      {
-         GetBytes(buffer, 0, buffer.Length);
-      }
-
-      public void GetBytes(byte[] buffer, int offset, int length)
-      {
-         GetBytes(Position, buffer, offset, length);
-         Position += length;
-      }
-      public void GetBytes(int position, byte[] buffer, int offset, int length)
-      {
-         CheckSpaceForReading(position, length);
-         if ( offset + length > buffer.Length )
-            throw new ArgumentException("Invalid offset +  length");
-         ReadBytes(position, buffer, offset, length);
-      }
-
-      public ByteBuffer Put(byte[] buffer)
-      {
-         return Put(buffer, 0, buffer.Length);
-      }
-
-      public ByteBuffer Put(byte[] buffer, int offset, int length)
-      {
-         Put(Position, buffer, offset, length);
-         Position += length;
-         return this;
-      }
-
-      public ByteBuffer Put(int position, byte[] buffer, int offset, int length)
-      {
-         CheckSpaceForWriting(position, length);
-         if ( offset + length > buffer.Length )
-            throw new ArgumentException("Invalid offset +  length");
-
-         Write(position, buffer, offset, length);
-         return this;
-      }
-
-      public ByteBuffer Put(ByteBuffer data)
-      {
-         Put(Position, data);
-         Position += data.Remaining;
-         return this;
-      }
-
-      public ByteBuffer Put(int position, ByteBuffer data)
-      {
-         CheckSpaceForWriting(position, data.Remaining);
-         Write(position, data.Array, data.Position, data.Remaining);
-         return this;
-      }
-
-      #endregion // Data Accessors
-
-      #region Core Overrides
-      //
-      // Core Overrides
-      //
-
-      protected abstract void DoWrite(int position, byte value);
-      protected abstract void DoWrite(int position, byte[] src, int offset, int length);
-      protected abstract byte DoReadByte(int position);
-      protected abstract void DoReadBytes(int position, byte[] dest, int offset, int length);
-      protected abstract void DoCompact();
-      protected abstract void DoResize(int newSize);
-
-      #endregion // Core Overrides
-
-      #region Private Methods
-      //
-      // Private Methods
-      //
-
-      private void Seek(int offset)
-      {
-         if ( offset > Capacity )
-            throw new ArgumentException("Cannot position beyond end of buffer");
-         _position = offset;
-         AdjustLimit();
-      }
-
-      private void SetLimit(int newLimit)
-      {
-         if ( newLimit < 0 )
-            throw new ArgumentOutOfRangeException("The new limit must be a positive value");
-         if ( newLimit > Capacity )
-            throw new ArgumentOutOfRangeException("The new limit must not be greater than the capacity");
-         _limit = newLimit;
-         if ( _position > newLimit )
-            _position = newLimit;
-      }
-
-      private void AdjustLimit()
-      {
-         if ( _limit < _position )
-            _limit = _position;
-      }
-
-      private void CheckSpaceForReading(int position, int length)
-      {
-         if ( position + length > Limit )
-         {
-            throw new BufferUnderflowException("Attempt to read " + length + " byte(s) to buffer where position is " + position +
-                                               " and limit is " + Limit);
-         }
-      }
-      
-      private void CheckSpaceForWriting(int position, int length)
-      {
-         if ( IsAutoExpand )
-         {
-            Expand(position, length);
-         }
-         if ( position + length > Limit )
-         {
-            throw new BufferOverflowException("Attempt to write " + length + " byte(s) to buffer where position is " + position +
-                                              " and limit is " + Limit);
-         }
-      }
-
-      private void Write(int position, byte value)
-      {
-         DoWrite(position, value);
-      }
-      private void Write(int position, byte[] src, int offset, int length)
-      {
-         DoWrite(position, src, offset, length);
-      }
-      private byte ReadByte(int position)
-      {
-         return DoReadByte(position);
-      }
-      private void ReadBytes(int position, byte[] dest, int offset, int length)
-      {
-         DoReadBytes(position, dest, offset, length);
-      }
-
-      #endregion // Private Methods
-
-   } // class ByteBuffer
-}
diff --git a/qpid/dotnet/Qpid.Buffer/ByteBufferHexDumper.cs b/qpid/dotnet/Qpid.Buffer/ByteBufferHexDumper.cs
deleted file mode 100644
index 4c2856c333..0000000000
--- a/qpid/dotnet/Qpid.Buffer/ByteBufferHexDumper.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using System.Text;
-
-namespace Apache.Qpid.Buffer
-{
-    public class ByteBufferHexDumper
-    {
-        private static byte[] highDigits;
-        
-        private static byte[] lowDigits;
-        
-        static ByteBufferHexDumper()
-        {
-            byte[] digits = { (byte)'0', (byte)'1', (byte)'2', (byte)'3', (byte)'4', (byte)'5', (byte)'6',
-                              (byte)'7', (byte)'8', (byte)'9', (byte)'A', (byte)'B', (byte)'C', (byte)'D', 
-                              (byte)'E', (byte)'F' };
-            int i;
-            byte[] high = new byte[256];
-            byte[] low = new byte[256];
-            
-            for (i = 0; i < 256; i++)
-            {
-                high[i] = digits[i >> 4];
-                low[i] = digits[i & 0x0F];                
-            }
-            
-            highDigits = high;
-            lowDigits = low;
-        }
-        
-        public static string GetHexDump(ByteBuffer input)
-        {
-            int size = input.Remaining;
-            if (size == 0)
-            {
-                return "empty";
-            }
-            
-            StringBuilder output = new StringBuilder(size * 3 - 1);
-
-            byte[] data = input.Array;
-            int byteValue = data[0] & 0xFF;
-            output.Append((char) highDigits[byteValue]);
-            output.Append((char) lowDigits[byteValue]);            
-            
-            for (int i = 1 ; i < size; i++)
-            {
-                output.Append(' ');
-                byteValue = data[i] & 0xFF;
-                output.Append((char) highDigits[byteValue]);
-                output.Append((char) lowDigits[byteValue]);
-            }
-            
-            return output.ToString();
-        }
-    }
-}
-
-
-
diff --git a/qpid/dotnet/Qpid.Buffer/IByteBufferAllocator.cs b/qpid/dotnet/Qpid.Buffer/IByteBufferAllocator.cs
deleted file mode 100644
index 0f457df065..0000000000
--- a/qpid/dotnet/Qpid.Buffer/IByteBufferAllocator.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-/*

- *

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- *

- */

-

-using System;

-

-namespace Apache.Qpid.Buffer

-{

-   /// <summary>

-   /// Allocates <see cref="ByteBuffer"/>'s and manages them. Please 

-   /// implement this interface if you need more advanced memory management scheme

-   /// </summary>

-   public interface IByteBufferAllocator : IDisposable

-   {

-      /// <summary>

-      /// Returns the buffer which is capable of the specified size.

-      /// </summary>

-      /// <param name="capacity">The capacity of the buffer</param>

-      /// <returns>A new buffer</returns>

-      ByteBuffer Allocate(int capacity);

-

-      /// <summary>

-      /// Wrap the specified byte array in a new buffer

-      /// </summary>

-      /// <param name="src">Source array</param>

-      /// <returns>A new buffer</returns>

-      ByteBuffer Wrap(byte[] src);

-

-   } // interface IByteBufferAllocator

-}

-

-

-

diff --git a/qpid/dotnet/Qpid.Buffer/Properties/AssemblyInfo.cs b/qpid/dotnet/Qpid.Buffer/Properties/AssemblyInfo.cs
deleted file mode 100644
index 4dd92ccdc2..0000000000
--- a/qpid/dotnet/Qpid.Buffer/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using System.Reflection;
-using System.Runtime.InteropServices;
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("Apache.Qpid.ByteBuffer")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Apache Qpid")]
-[assembly: AssemblyProduct("Apache.Qpid.ByteBuffer")]
-[assembly: AssemblyCopyright("Copyright (c) 2006 The Apache Software Foundation")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("2b3333e5-03b5-4f00-9215-66009f8a5c47")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Revision and Build Numbers 
-// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/qpid/dotnet/Qpid.Buffer/Qpid.Buffer.csproj b/qpid/dotnet/Qpid.Buffer/Qpid.Buffer.csproj
deleted file mode 100644
index 9320438f6f..0000000000
--- a/qpid/dotnet/Qpid.Buffer/Qpid.Buffer.csproj
+++ /dev/null
@@ -1,59 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <PropertyGroup>

-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ProductVersion>8.0.50727</ProductVersion>

-    <SchemaVersion>2.0</SchemaVersion>

-    <ProjectGuid>{44384DF2-B0A4-4580-BDBC-EE4BAA87D995}</ProjectGuid>

-    <OutputType>Library</OutputType>

-    <AppDesignerFolder>Properties</AppDesignerFolder>

-    <RootNamespace>Apache.Qpid.Buffer</RootNamespace>

-    <AssemblyName>Apache.Qpid.Buffer</AssemblyName>

-    <SignAssembly>true</SignAssembly>

-    <AssemblyOriginatorKeyFile>

-    </AssemblyOriginatorKeyFile>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

-    <DebugSymbols>true</DebugSymbols>

-    <DebugType>full</DebugType>

-    <Optimize>false</Optimize>

-    <OutputPath>..\bin\net-2.0\debug\</OutputPath>

-    <DefineConstants>DEBUG;TRACE</DefineConstants>

-    <ErrorReport>prompt</ErrorReport>

-    <WarningLevel>4</WarningLevel>

-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

-    <DebugType>pdbonly</DebugType>

-    <Optimize>true</Optimize>

-    <OutputPath>..\bin\net-2.0\release\</OutputPath>

-    <DefineConstants>TRACE</DefineConstants>

-    <ErrorReport>prompt</ErrorReport>

-    <WarningLevel>4</WarningLevel>

-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>

-  </PropertyGroup>

-  <ItemGroup>

-    <Reference Include="System" />

-    <Reference Include="System.Data" />

-    <Reference Include="System.Xml" />

-  </ItemGroup>

-  <ItemGroup>

-    <Compile Include="BufferOverflowException.cs" />

-    <Compile Include="BufferUnderflowException.cs" />

-    <Compile Include="ByteBuffer.cs" />

-    <Compile Include="ByteBufferHexDumper.cs" />

-    <Compile Include="IByteBufferAllocator.cs" />

-    <Compile Include="Properties\AssemblyInfo.cs" />

-    <Compile Include="SimpleByteBuffer.cs" />

-    <Compile Include="SimpleByteBufferAllocator.cs" />

-    <Compile Include="SlicedByteBuffer.cs" />

-  </ItemGroup>

-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

-       Other similar extension points exist, see Microsoft.Common.targets.

-  <Target Name="BeforeBuild">

-  </Target>

-  <Target Name="AfterBuild">

-  </Target>

-  -->

-</Project>

diff --git a/qpid/dotnet/Qpid.Buffer/SimpleByteBuffer.cs b/qpid/dotnet/Qpid.Buffer/SimpleByteBuffer.cs
deleted file mode 100644
index d3b7245cb1..0000000000
--- a/qpid/dotnet/Qpid.Buffer/SimpleByteBuffer.cs
+++ /dev/null
@@ -1,120 +0,0 @@
-/*

- *

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- *

- */

-using System;

-

-namespace Apache.Qpid.Buffer

-{

-   internal sealed class SimpleByteBuffer : ByteBuffer

-   {

-      private byte[] _buffer;

-

-      public override int Capacity

-      {

-         get { return _buffer.Length; }

-      }

-

-      public override byte[] Array

-      {

-         get { return _buffer; }

-      }

-

-      /// <summary>

-      /// Initialize a new instance with the desired size

-      /// </summary>

-      /// <param name="desiredSize">Initial Length of the array</param>

-      internal SimpleByteBuffer(int desiredSize)

-      {

-         _buffer = new byte[desiredSize];

-         Position = 0;

-         Limit = Capacity;

-      }

-

-      /// <summary>

-      /// Initialize a new instance with the data from

-      /// an underlying array

-      /// </summary>

-      /// <param name="buffer">Initial data</param>

-      /// <remarks>The original array is copied during construction and is not modified</remarks>

-      internal SimpleByteBuffer(byte[] buffer)

-      {

-         _buffer = (byte[])buffer.Clone();

-         // position at end

-         Position = Limit = Capacity;

-      }

-

-      protected override void DoWrite(int position, byte value)

-      {

-         // available space is already handled by base class

-         _buffer[position] = value;

-      }

-

-      protected override void DoWrite(int position, byte[] src, int offset, int length)

-      {

-         // available space is already handled by base class

-         for ( int i = 0; i < length; i++ )

-         {

-            _buffer[position+i] = src[offset+i];

-         }

-      }

-

-      protected override byte DoReadByte(int position)

-      {

-         return _buffer[position];

-      }

-

-      protected override void DoReadBytes(int position, byte[] dest, int offset, int length)

-      {

-         System.Array.Copy(_buffer, position, dest, offset, length);

-      }

-

-      protected override void DoCompact()

-      {

-         if ( Remaining > 0 )

-         {

-            if ( Position > 0 )

-            {

-               System.Array.Copy(_buffer, Position, _buffer, 0, Remaining);

-            }

-            Position = Remaining;

-         } else

-         {

-            Position = 0;

-         }

-         Limit = Capacity;

-      }

-

-      protected override void DoResize(int newSize)

-      {

-         if ( newSize < Capacity )

-            throw new NotSupportedException("Cannot resize a buffer to make it smaller");

-

-         int newCapacity = 1;

-         while ( newCapacity < newSize )

-         {

-            newCapacity <<= 1;

-         }

-

-         byte[] newBuffer = new byte[newCapacity];

-         System.Array.Copy(_buffer, newBuffer, _buffer.Length);

-         _buffer = newBuffer;

-      }

-   } // class SimpleByteBuffer

-}

diff --git a/qpid/dotnet/Qpid.Buffer/SimpleByteBufferAllocator.cs b/qpid/dotnet/Qpid.Buffer/SimpleByteBufferAllocator.cs
deleted file mode 100644
index e772e59ae3..0000000000
--- a/qpid/dotnet/Qpid.Buffer/SimpleByteBufferAllocator.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-namespace Apache.Qpid.Buffer
-{
-   /// <summary>
-   /// Allocates <see cref="ByteBuffer"/>'s and manages them. 
-   /// This is a simple implementation that just returns buffers
-   /// as they are. Buffers are not reused or refcounted
-   /// </summary>
-   public class SimpleByteBufferAllocator : IByteBufferAllocator
-   {
-      #region IByteBufferAllocator Members
-
-      public ByteBuffer Allocate(int capacity)
-      {
-         return new SimpleByteBuffer(capacity);
-      }
-
-      public ByteBuffer Wrap(byte[] src)
-      {
-         return new SimpleByteBuffer(src);
-      }
-
-      #endregion
-
-      #region IDisposable Members
-
-      public void Dispose()
-      {
-         // no need to do anaything
-      }
-
-      #endregion
-
-   } // class SimpleByteBufferAllocator
-}
-
-
-
diff --git a/qpid/dotnet/Qpid.Buffer/SlicedByteBuffer.cs b/qpid/dotnet/Qpid.Buffer/SlicedByteBuffer.cs
deleted file mode 100644
index c27b7949b6..0000000000
--- a/qpid/dotnet/Qpid.Buffer/SlicedByteBuffer.cs
+++ /dev/null
@@ -1,86 +0,0 @@
-/*

- *

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- *

- */

-using System;

-

-namespace Apache.Qpid.Buffer

-{

-   internal sealed class SlicedByteBuffer : ByteBuffer

-   {

-      private ByteBuffer _buffer;

-      private int _capacity;

-      private int _startPos;

-

-      public override int Capacity

-      {

-         get { return _capacity; }

-      }

-

-      public override byte[] Array

-      {

-         get { return _buffer.Array; }

-      }

-

-      /// <summary>

-      /// Initialize a new instance

-      /// </summary>

-      /// <param name="buffer">Underlying byte buffer</param>

-      internal SlicedByteBuffer(ByteBuffer buffer)

-      {

-         _buffer = buffer;

-         _startPos = buffer.Position;

-         Position = 0;

-         _capacity = buffer.Remaining;

-         Limit = Capacity;

-         // cannot autoexpand

-         IsAutoExpand = false;

-      }

-

-      protected override void DoWrite(int position, byte value)

-      {

-         _buffer.Put(_startPos + position, value);

-      }

-

-      protected override void DoWrite(int position, byte[] src, int offset, int length)

-      {

-         _buffer.Put(_startPos + position, src, offset, length);

-      }

-

-      protected override byte DoReadByte(int position)

-      {

-         return _buffer.GetByte(_startPos + position);

-      }

-

-      protected override void DoReadBytes(int position, byte[] dest, int offset, int length)

-      {

-         _buffer.GetBytes(_startPos + position, dest, offset, length);

-      }

-

-      protected override void DoCompact()

-      {

-         throw new NotSupportedException();

-      }

-

-      protected override void DoResize(int newSize)

-      {

-         throw new NotSupportedException();

-      }

-   } // class SlicedByteBuffer

-}

diff --git a/qpid/dotnet/Qpid.Buffer/default.build b/qpid/dotnet/Qpid.Buffer/default.build
deleted file mode 100644
index c2d36d15e6..0000000000
--- a/qpid/dotnet/Qpid.Buffer/default.build
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0"?>

-<project name="Apache.Qpid.Buffer" default="build">

-    <!--

-		Properties that come from master build file

-		- build.dir: root directory for build

-		- build.debug: true if building debug release

-		- build.defines: variables to define during build

-    -->

-

-    <target name="build">

-        <csc target="library" 

-				define="${build.defines}" 

-            debug="${build.debug}"

-            unsafe="true"

-				output="${build.dir}/${project::get-name()}.dll">

-			

-			<sources>

-			   <include name="**/*.cs" />

-         </sources>

-         <references>

-         </references>

-        </csc>

-    </target>

-</project>

-

diff --git a/qpid/dotnet/Qpid.Client.Tests/App.config b/qpid/dotnet/Qpid.Client.Tests/App.config
deleted file mode 100644
index fd7c412a57..0000000000
--- a/qpid/dotnet/Qpid.Client.Tests/App.config
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>

-<configuration>

-   <configSections>

-      <sectionGroup name="qpid.client">

-         <section name="authentication" type="Apache.Qpid.Client.Configuration.AuthenticationConfigurationSectionHandler, Apache.Qpid.Client"/>

-      </sectionGroup>

-   </configSections>

-   <qpid.client>

-      <authentication>

-         <add key="TEST" value="Apache.Qpid.Client.Tests.Security.TestCallbackHandler, Apache.Qpid.Client.Tests"/>

-      </authentication>

-   </qpid.client>

-</configuration>

diff --git a/qpid/dotnet/Qpid.Client.Tests/BrokerDetails/BrokerDetailsTest.cs b/qpid/dotnet/Qpid.Client.Tests/BrokerDetails/BrokerDetailsTest.cs
deleted file mode 100644
index 8e8d8ced3b..0000000000
--- a/qpid/dotnet/Qpid.Client.Tests/BrokerDetails/BrokerDetailsTest.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-/*

- *

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- *

- */

-using System;

-using System.Net;

-using NUnit.Framework;

-using Apache.Qpid.Client.Qms;

-

-namespace Apache.Qpid.Client.Tests.BrokerDetails

-{

-    [TestFixture]

-    public class BrokerDetailsTest

-    {

-

-        [Test]

-        public void ValidateBrokerInfoEqualsMethod()

-        {

-            AmqBrokerInfo broker = new AmqBrokerInfo("amqp", "localhost", 5672, true);

-            AmqBrokerInfo broker1 = new AmqBrokerInfo("Amqp", "localhost", 5672, true);

-

-            Assert.IsTrue(broker.Equals(broker1),"The two AmqBrokerInfo objects are not equals");

-            Console.WriteLine(string.Format("The object broker: {0} and broker1: {1} are equals", broker, broker1));

-        }

-

-        [Test]

-        public void ValidateBrokerInfoWithDifferentSSL()

-        {

-            AmqBrokerInfo broker = new AmqBrokerInfo("amqp", "localhost", 5672, true);

-            AmqBrokerInfo broker1 = new AmqBrokerInfo("amqp", "localhost", 5672, false);

-

-            Assert.IsFalse(broker.Equals(broker1), "The two AmqBrokerInfo objects are equals");

-            Console.WriteLine(string.Format("The object broker: {0} and broker1: {1} are not equals", broker, broker1));

-        }

-

-        [Test]

-        public void ValidateBrokerInfoFromToString()

-        { 

-            String url = "tcp://localhost:5672?timeout='200',immediatedelivery='true'";

-

-            AmqBrokerInfo broker = new AmqBrokerInfo(url);

-            AmqBrokerInfo broker1 = new AmqBrokerInfo(broker.ToString());

-

-            Assert.AreEqual(broker.GetOption("timeout"), broker1.GetOption("timeout"));

-            Assert.AreEqual(broker.GetOption("immediatedelivery"), broker1.GetOption("immediatedelivery"));

-        }

-

-    }

-}

diff --git a/qpid/dotnet/Qpid.Client.Tests/Channel/ChannelMessageCreationTests.cs b/qpid/dotnet/Qpid.Client.Tests/Channel/ChannelMessageCreationTests.cs
deleted file mode 100644
index c27aa9a503..0000000000
--- a/qpid/dotnet/Qpid.Client.Tests/Channel/ChannelMessageCreationTests.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-/*

- *

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- *

- */

-

-using System;

-

-using log4net;

-using NUnit.Framework;

-using Apache.Qpid.Client;

-using Apache.Qpid.Client.Message;

-using Apache.Qpid.Messaging;

-

-namespace Apache.Qpid.Client.Tests.Channel

-{

-   /// <summary>

-   /// Test that channels can create messages correctly

-   /// </summary>

-   [TestFixture]

-   public class ChannelMessageCreationTests

-   {

-      [Test]

-      public void CanCreateTextMessage()

-      {

-         IChannel channel = AmqChannel.CreateDisconnectedChannel();

-         ITextMessage msg = channel.CreateTextMessage();

-         Assert.IsNotNull(msg);

-      }

-      [Test]

-      public void CanCreateTextMessageWithContent()

-      {

-         IChannel channel = AmqChannel.CreateDisconnectedChannel();

-         const string CONTENT = "1234567890";

-         ITextMessage msg = channel.CreateTextMessage(CONTENT);

-         Assert.IsNotNull(msg);

-         Assert.AreEqual(CONTENT, msg.Text);

-      }

-      [Test]

-      public void CanCreateBytesMessage()

-      {

-         IChannel channel = AmqChannel.CreateDisconnectedChannel();

-         IBytesMessage msg = channel.CreateBytesMessage();

-         Assert.IsNotNull(msg);

-      }

-      [Test]

-      public void CanCreateMessage()

-      {

-         IChannel channel = AmqChannel.CreateDisconnectedChannel();

-         IMessage msg = channel.CreateMessage();

-         Assert.IsNotNull(msg);

-      }

-      [Test]

-      public void CanCreateMessageFromMimeType()

-      {

-         IChannel channel = AmqChannel.CreateDisconnectedChannel();

-         IMessage msg = channel.CreateMessage("text/xml");

-         Assert.IsNotNull(msg);

-         Assert.IsInstanceOfType(typeof(ITextMessage), msg);

-      }

-   }

-} // namespace Apache.Qpid.Client.Tests.Channel

-

-

diff --git a/qpid/dotnet/Qpid.Client.Tests/Channel/ChannelQueueTest.cs b/qpid/dotnet/Qpid.Client.Tests/Channel/ChannelQueueTest.cs
deleted file mode 100644
index a9a39f87f8..0000000000
--- a/qpid/dotnet/Qpid.Client.Tests/Channel/ChannelQueueTest.cs
+++ /dev/null
@@ -1,237 +0,0 @@
-/*

- *

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- *

- */

-using System;

-using System.Net;

-using System.Threading;

-using log4net;

-using Apache.Qpid.Client.Qms;

-using Apache.Qpid.Messaging;

-using NUnit.Framework;

-

-namespace Apache.Qpid.Client.Tests.Channel

-{

-    /// <summary>

-    /// Test the queue methods

-    /// </summary>

-    [TestFixture]

-    public class ChannelQueueTest

-    {

-

-        private static ILog _logger = LogManager.GetLogger(typeof(ChannelQueueTest));

-

-        /// <summary> The default AMQ connection URL to use for tests. </summary>

-        const string DEFAULT_URI = "amqp://guest:guest@default/test?brokerlist='tcp://localhost:5672'";

-        const string _routingKey = "ServiceQ1";

-

-        private ExceptionListenerDelegate _exceptionDelegate;

-        private AutoResetEvent _evt = new AutoResetEvent(false);

-        private Exception _lastException = null;

-

-        private IMessageConsumer _consumer;

-        private IMessagePublisher _publisher;

-        private IChannel _channel;

-        private IConnection _connection;

-

-        private string _queueName;

-

-        [SetUp]

-        public virtual void Init()

-        {

-            _logger.Info("public virtual void Init(): called");

-

-            // Create a connection to the broker.

-            IConnectionInfo connectionInfo = QpidConnectionInfo.FromUrl(DEFAULT_URI);

-            _connection = new AMQConnection(connectionInfo);

-            _logger.Info("Starting...");

-

-            // Register this to listen for exceptions on the test connection.

-            _exceptionDelegate = new ExceptionListenerDelegate(OnException);

-            _connection.ExceptionListener += _exceptionDelegate;

-

-            // Establish a session on the broker.

-            _channel = _connection.CreateChannel(false, AcknowledgeMode.AutoAcknowledge, 1);

-

-            // Create a durable, non-temporary, non-exclusive queue.

-            _queueName = _channel.GenerateUniqueName();

-            _channel.DeclareQueue(_queueName, true, false, false);

-

-            _channel.Bind(_queueName, ExchangeNameDefaults.TOPIC, _routingKey);

-

-            // Clear the most recent message and exception.

-            _lastException = null;

-        }

-

-        [TearDown]

-        public virtual void ShutDown()

-        {

-            _logger.Info("public virtual void Shutdown(): called");

-

-            if (_connection != null)

-            {

-                _logger.Info("Disposing connection.");

-                _connection.Dispose();

-                _logger.Info("Connection disposed.");

-            }

-        }

-        

-        [Test]

-        public void DeleteUsedQueue()

-        {

-            // Create the consumer

-            _consumer = _channel.CreateConsumerBuilder(_queueName)

-                    .WithPrefetchLow(100)

-                    .Create();

-            _logger.Info("Consumer was created...");

-

-            // delete the queue

-            _channel.DeleteQueue(_queueName, false, true, true);

-            _logger.InfoFormat("Queue {0} was delete", _queueName);

-

-            Assert.IsNull(_lastException);

-        }

-

-        [Test]

-        public void DeleteUnusedQueue()

-        {

-            // delete the queue

-            _channel.DeleteQueue(_queueName, true, true, true);

-            _logger.InfoFormat("Queue {0} was delete", _queueName);

-

-            Assert.IsNull(_lastException);

-        }

-

-        [Test]

-        public void DeleteNonEmptyQueue()

-        {

-            // Create the publisher

-            _publisher = _channel.CreatePublisherBuilder()

-                .WithExchangeName(ExchangeNameDefaults.TOPIC)

-                .WithRoutingKey(_routingKey)

-                .Create();

-            _logger.Info("Publisher created...");

-            SendTestMessage("Message 1");

-

-            try

-            {

-                _channel.DeleteQueue(_queueName, true, false, true);

-            }

-            catch (AMQException)

-            {

-                Assert.Fail("The test fails");

-            }            

-        }

-

-        [Test]

-        public void DeleteEmptyQueue()

-        {

-            // Create the publisher

-            _publisher = _channel.CreatePublisherBuilder()

-                .WithExchangeName(ExchangeNameDefaults.TOPIC)

-                .WithRoutingKey(_routingKey)

-                .Create();

-            _logger.Info("Publisher created...");

-

-            // delete an empty queue with ifEmpty = true

-            _channel.DeleteQueue(_queueName, false, true, true);

-

-            Assert.IsNull(_lastException);

-        }

-

-        [Test]

-        public void DeleteQueueWithResponse()

-        {

-            // Create the publisher

-            _publisher = _channel.CreatePublisherBuilder()

-                .WithExchangeName(ExchangeNameDefaults.TOPIC)

-                .WithRoutingKey(_routingKey)

-                .Create();

-            _logger.Info("Publisher created...");

-

-            SendTestMessage("Message 1");

-            SendTestMessage("Message 2");

-            

-            // delete the queue, the server must respond

-            _channel.DeleteQueue(_queueName, false, false, false);

-        }

-

-        [Test]

-        public void PurgeQueueWithResponse()

-        {

-            _publisher = _channel.CreatePublisherBuilder()

-                .WithExchangeName(ExchangeNameDefaults.TOPIC)

-                .WithRoutingKey(_routingKey)

-                .Create();

-            _logger.Info("Pubisher created");

-

-            SendTestMessage("Message 1");

-            SendTestMessage("Message 2");

-

-            _channel.PurgeQueue(_queueName, false);

-        }

-

-        [Test]

-        public void PurgeQueueWithOutResponse()

-        {

-            _publisher = _channel.CreatePublisherBuilder()

-                .WithExchangeName(ExchangeNameDefaults.TOPIC)

-                .WithRoutingKey(_routingKey)

-                .Create();

-            _logger.Info("Pubisher created");

-

-            SendTestMessage("Message 1");

-            SendTestMessage("Message 2");

-

-            _channel.PurgeQueue(_queueName, true);

-        }

-

-

-        /// <summary>

-        /// Callback method to handle any exceptions raised by the test connection.</summary>        /// 

-        /// <param name="e">The connection exception.</param>

-        public void OnException(Exception e)

-        {

-            // Preserve the most recent exception in case test cases need to examine it.

-            _lastException = e;

-

-            // Notify any waiting threads that an exception event has occurred.

-            _evt.Set();

-        }

-

-        /// <summary>

-        /// Sends the specified message to the test publisher, and confirms that it was received by the test consumer or not

-        /// depending on whether or not the message should be received by the consumer.

-        /// 

-        /// Any exceptions raised by the connection will cause an Assert failure exception to be raised.

-        /// </summary>

-        /// 

-        /// <param name="msgSend">The message to send.</param>

-        private void SendTestMessage(string msg)

-        {

-            // create the IMessage object

-            IMessage msgSend = _channel.CreateTextMessage(msg);

-

-            // send the message

-            _publisher.Send(msgSend);

-            _logger.InfoFormat("The messages \"{0}\" was sent", msg);

-        }

-

-    }

-}

diff --git a/qpid/dotnet/Qpid.Client.Tests/Common/BaseMessagingTestFixture.cs b/qpid/dotnet/Qpid.Client.Tests/Common/BaseMessagingTestFixture.cs
deleted file mode 100644
index 9f91958028..0000000000
--- a/qpid/dotnet/Qpid.Client.Tests/Common/BaseMessagingTestFixture.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using System;
-using log4net;
-using NUnit.Framework;
-using Apache.Qpid.Messaging;
-using Apache.Qpid.Client.Qms;
-
-namespace Apache.Qpid.Client.Tests
-{
-    /// <summary>
-    /// Provides a basis for writing Unit tests that communicate with an AMQ protocol broker. By default it creates a connection
-    /// to a message broker running on localhost on the standard AMQ port, 5672, using guest:guest login credentials, on the default exchange,
-    /// 'test' queue.
-    /// </summary>
-    public class BaseMessagingTestFixture
-    {
-        private static ILog _logger = LogManager.GetLogger(typeof(BaseMessagingTestFixture));
-
-        /// <summary> The default AMQ connection URL to use for tests. </summary>
-        const string connectionUri = "amqp://guest:guest@default/test?brokerlist='tcp://localhost:5672'";
-
-        /// <summary> Holds the test connection. </summary>
-        protected IConnection _connection;
-
-        /// <summary> Holds the test channel. </summary>
-        protected IChannel _channel;
-
-        /// <summary>
-        /// Creates the test connection and channel.
-        /// </summary>
-        [SetUp]
-        public virtual void Init()
-        {
-            _logger.Info("public virtual void Init(): called");
-
-            try
-            {
-                IConnectionInfo connectionInfo = QpidConnectionInfo.FromUrl(connectionUri);               
-                _connection = new AMQConnection(connectionInfo);
-                _channel = _connection.CreateChannel(false, AcknowledgeMode.NoAcknowledge, 500, 300);
-            }
-            catch (QpidException e)
-            {
-                _logger.Error("Error initialisng test fixture: " + e, e);
-                throw e;
-            }
-        }
-
-        /// <summary>
-        /// Disposes the test connection. This is called manually because the connection is a field so dispose will not be automatically 
-        /// called on it.
-        /// </summary>
-        [TearDown]
-        public virtual void Shutdown()
-        {
-            _logger.Info("public virtual void Shutdown(): called");
-
-            if (_connection != null)
-            {
-                _logger.Info("Disposing connection.");
-                _connection.Dispose();
-                _logger.Info("Connection disposed.");
-            }
-        }
-    }
-}
diff --git a/qpid/dotnet/Qpid.Client.Tests/HeadersExchange/HeadersExchangeTest.cs b/qpid/dotnet/Qpid.Client.Tests/HeadersExchange/HeadersExchangeTest.cs
deleted file mode 100644
index f3ce695de8..0000000000
--- a/qpid/dotnet/Qpid.Client.Tests/HeadersExchange/HeadersExchangeTest.cs
+++ /dev/null
@@ -1,268 +0,0 @@
-/*

- *

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- *

- */

-using System;

-using System.Threading;

-using log4net;

-using NUnit.Framework;

-using Apache.Qpid.Framing;

-using Apache.Qpid.Messaging;

-

-namespace Apache.Qpid.Client.Tests

-{

-    /// <summary>

-    /// Sets up a producer/consumer pair to send test messages through a header exchange. The header exchange matching pattern is tested to

-    /// verify that it correctly matches or filters out messages based on their headers.

-    /// 

-    /// Check that a message matching all fields of a headers exchange is passed by the exchange.

-    /// Check that a message containing values for empty fields of a headers exchange is passed by the exchange.

-    /// Check that a message matching only some fields of a headers exhcnage is not passed by the exchange.

-    /// Check that a message with additional fields to the correct matching fields of a headers exchange is passed by the exchange.

-    /// </summary>

-    ///

-    /// <todo>Remove the HeadersMatchingProducer class and rename this to HeaderExchangeTest. The producer and consumer are implemented

-    ///       in a single test class to make running this as part of an automated test suite possible.</todo>

-    /// 

-    /// <todo>Consider not using a delegate to callback the OnMessage method. Easier to just call receive on the consumer but using the 

-    ///       callback does demonstrate how to do so.</todo>

-    [TestFixture]

-    public class HeadersExchangeTest : BaseMessagingTestFixture

-    {

-        private static ILog _logger = LogManager.GetLogger(typeof(HeadersExchangeTest));

-

-        /// <summary> Holds the default test timeout for broker communications before tests give up. </summary>

-        private static readonly int TIMEOUT = 1000;

-

-        /// <summary> Holds the name of the headers exchange to create to send test messages on. </summary>

-        private string _exchangeName = "ServiceQ1";

-

-        /// <summary> Used to preserve the most recent exception in case test cases need to examine it. </summary>

-        private Exception _lastException = null;

-

-        /// <summary> Used to preserve the most recent message from the test consumer. </summary>

-        private IMessage _lastMessage = null;

-

-        /// <summary> The test consumer to get messages from the broker with. </summary>

-        private IMessageConsumer _consumer;

-

-        private IMessagePublisher _publisher;

-

-        private AutoResetEvent _evt = new AutoResetEvent(false);

-

-        private MessageReceivedDelegate _msgRecDelegate;

-        private ExceptionListenerDelegate _exceptionDelegate;

-

-        [SetUp]

-        public override void Init()

-        {          

-            // Ensure that the base init method is called. It establishes a connection with the broker.

-            base.Init();            

-

-            _logger.Info("Starting...");

-            _logger.Info("Exchange name is '" + _exchangeName + "'...");

-

-            // Register this to listen for exceptions on the test connection.

-            _exceptionDelegate = new ExceptionListenerDelegate(OnException);

-            _connection.ExceptionListener += _exceptionDelegate;

-

-            // Declare a new headers exchange with the name of the test service.

-            _channel.DeclareExchange(_exchangeName, ExchangeClassConstants.HEADERS);

-

-            // Create a non-durable, temporary (aka auto-delete), exclusive queue.

-            string queueName = _channel.GenerateUniqueName();

-            _channel.DeclareQueue(queueName, false, true, true);

-

-            // Bind the queue to the new headers exchange, setting up some header patterns for the exchange to match.

-            _channel.Bind(queueName, _exchangeName, null, CreatePatternAsFieldTable());

-

-            // Create a test consumer to consume messages from the test exchange.

-            _consumer = _channel.CreateConsumerBuilder(queueName)

-                .WithPrefetchLow(100)

-                .WithPrefetchHigh(500)

-                .WithNoLocal(false) // make sure we get our own messages

-                .Create();

-

-            // Register this to listen for messages on the consumer.

-            _msgRecDelegate = new MessageReceivedDelegate(OnMessage);

-            _consumer.OnMessage += _msgRecDelegate;

-            

-            // Clear the most recent message and exception.

-            _lastException = null;

-            _lastMessage = null;

-

-            _publisher = _channel.CreatePublisherBuilder()

-                    .WithExchangeName(_exchangeName)

-                    .WithMandatory(true)

-                    .Create();

-

-            _publisher.DeliveryMode = DeliveryMode.NonPersistent;

-

-            // Start all channel

-            _connection.Start();

-        }

-

-        /// <summary>

-        /// Deregisters the on message delegate before closing the connection.

-        /// </summary>

-        [TearDown]

-        public override void Shutdown()

-        {

-            _logger.Info("public void Shutdown(): called");

-

-            //_consumer.OnMessage -= _msgRecDelegate;

-            //_connection.ExceptionListener -= _exceptionDelegate;

-

-            _connection.Stop();

-

-            base.Shutdown();

-        }

-

-        /// <summary>

-        /// Callback method that is passed any messages received on the test channel.

-        /// </summary>

-        /// 

-        /// <param name="message">The received message.</param>

-        public void OnMessage(IMessage message)

-        {

-            _logger.Debug(string.Format("message.Type = {0}", message.GetType()));

-            _logger.Debug("Got message '" + message + "'");

-

-            // Preserve the most recent exception so that test cases can examine it.

-            _lastMessage = message;

-

-            // Notify any waiting threads that a message has been received.

-            _evt.Set();

-        }

-

-        /// <summary>Callback method to handle any exceptions raised by the test connection.</summary>

-        /// 

-        /// <param name="e">The connection exception.</param>

-        public void OnException(Exception e)

-        {

-            // Preserve the most recent exception in case test cases need to examine it.

-            _lastException = e;

-

-            // Notify any waiting threads that an exception event has occurred.

-            _evt.Set();

-        }

-

-        /// <summary>Check that a message matching all fields of a headers exchange is passed by the exchange.</summary>

-        [Test]

-        public void TestMatchAll()

-        {

-            IMessage msg = _channel.CreateTextMessage("matches match2=''");

-            msg.Headers["match1"] = "foo";

-            msg.Headers["match2"] = "";

-

-            // Use the SendTestMessage helper method to verify that the message was sent and received.

-            SendTestMessage(msg, true);

-        }

-

-        /// <summary>Check that a message containing values for empty fields of a headers exchange is passed by the exchange.</summary>

-        [Test]

-        public void TestMatchEmptyMatchesAnything()

-        {

-            // Send a test message that matches the headers exchange.

-            IMessage msg = _channel.CreateTextMessage("matches match1='foo' and match2='bar'");

-            msg.Headers["match1"] = "foo";

-            msg.Headers["match2"] = "bar";

-

-            // Use the SendTestMessage helper method to verify that the message was sent and received.

-            SendTestMessage(msg, true);

-        }

-

-        /// <summary>Check that a message matching only some fields of a headers exchange is not passed by the exchange.</summary>

-        [Test]

-        public void TestMatchOneFails()

-        {

-            IMessage msg = _channel.CreateTextMessage("not match - only match1");

-            msg.Headers["match1"] = "foo";

-

-            // Use the SendTestMessage helper method to verify that the message was sent and not received.

-            SendTestMessage(msg, false);

-        }

-

-        /// <summary>

-        /// Check that a message with additional fields to the correct matching fields of a headers exchange is passed by 

-        /// the exchange.

-        /// </summary>

-        [Test]

-        public void TestMatchExtraFields()

-        {

-            IMessage msg = _channel.CreateTextMessage("matches - extra headers");

-            msg.Headers["match1"] = "foo";

-            msg.Headers["match2"] = "bar";

-            msg.Headers["match3"] = "not required";

-

-            // Use the SendTestMessage helper method to verify that the message was sent and received.

-            SendTestMessage(msg, true);

-        }

-

-        /// <summary>

-        /// Sends the specified message to the test publisher, and confirms that it was received by the test consumer or not

-        /// depending on whether or not the message should be received by the consumer.

-        /// 

-        /// Any exceptions raised by the connection will cause an Assert failure exception to be raised.

-        /// </summary>

-        /// 

-        /// <param name="msgSend">The message to send.</param>

-        /// <param name="shouldPass">A flag to indicate whether or not the message should be received by the consumer.</param>

-        private void SendTestMessage(IMessage msgSend, bool shouldPass)

-        {

-            _publisher.Send(msgSend);

-            _evt.WaitOne(TIMEOUT, true);

-

-            // Check that an exception other than not routable was raised in which case re-raise it as a test error.

-            if (_lastException != null && !(_lastException.InnerException is AMQUndeliveredException))

-            {

-                Assert.Fail("Exception {0} was raised by the broker connection.", _lastException);

-            }

-            // Check that a message was returned if the test is expecting the message to pass.

-            else if (shouldPass)

-            {

-                Assert.IsNotNull(_lastMessage, "Did not get a matching message from the headers exchange.");

-            }

-            // Check that a not routable exception was raised if the test is expecting the message to fail.

-            else if (_lastException != null && _lastException.InnerException is AMQUndeliveredException)

-            {

-                Assert.IsNull(_lastMessage, "Message could not be routed so consumer should not have received it.");

-            }

-            // The broker did not respond within the test timeout so fail the test.

-            else

-            {

-                Assert.Fail("The test timed out without a response from the broker.");

-            }

-        }

-

-        /// <summary> Returns a field table containing patterns to match the test header exchange against. </summary>

-        /// 

-        /// <returns> A field table containing test patterns. </returns>

-        private FieldTable CreatePatternAsFieldTable()

-        {

-            FieldTable matchTable = new FieldTable();

-

-            matchTable["match1"] = "foo";

-            matchTable["match2"] = "";

-            matchTable["x-match"] = "all";

-

-            return matchTable;

-        }

-    }

-}

diff --git a/qpid/dotnet/Qpid.Client.Tests/Messages/MessageFactoryRegistryTests.cs b/qpid/dotnet/Qpid.Client.Tests/Messages/MessageFactoryRegistryTests.cs
deleted file mode 100644
index 1211196541..0000000000
--- a/qpid/dotnet/Qpid.Client.Tests/Messages/MessageFactoryRegistryTests.cs
+++ /dev/null
@@ -1,114 +0,0 @@
-/*

- *

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- *

- */

-

-using System;

-

-using log4net;

-using NUnit.Framework;

-using Apache.Qpid.Messaging;

-using Apache.Qpid.Client.Message;

-

-namespace Apache.Qpid.Client.Tests.Messages

-{

-   /// <summary>

-   /// Ensure a factory creates messages correctly

-   /// </summary>

-   [TestFixture]

-   public class MessageFactoryRegistryTests

-   {

-      const string TEXT_PLAIN = "text/plain";

-      const string TEXT_XML = "text/xml";

-      const string OCTET_STREAM = "application/octet-stream";

-

-      /// <summary>

-      /// Check default registry can create text/plain messages

-      /// </summary>

-      [Test]

-      public void CanCreateTextPlain()

-      {

-         MessageFactoryRegistry registry = 

-            MessageFactoryRegistry.NewDefaultRegistry();

-

-         IMessage message = registry.CreateMessage(TEXT_PLAIN);

-         Assert.IsNotNull(message);

-         Assert.AreEqual(TEXT_PLAIN, message.ContentType);

-         Assert.IsInstanceOfType(typeof(QpidTextMessage), message);

-      }

-      /// <summary>

-      /// Check default registry can create text/xml messages

-      /// </summary>

-      [Test]

-      public void CanCreateTextXml()

-      {

-         MessageFactoryRegistry registry =

-            MessageFactoryRegistry.NewDefaultRegistry();

-

-         IMessage message = registry.CreateMessage(TEXT_XML);

-         Assert.IsNotNull(message);

-         Assert.AreEqual(TEXT_XML, message.ContentType);

-         Assert.IsInstanceOfType(typeof(QpidTextMessage), message);

-      }

-      /// <summary>

-      /// Check default registry can create application/octet-stream messages

-      /// </summary>

-      [Test]

-      public void CanCreateBinary()

-      {

-         MessageFactoryRegistry registry =

-            MessageFactoryRegistry.NewDefaultRegistry();

-

-         IMessage message = registry.CreateMessage(OCTET_STREAM);

-         Assert.IsNotNull(message);

-         Assert.AreEqual(OCTET_STREAM, message.ContentType);

-         Assert.IsInstanceOfType(typeof(QpidBytesMessage), message);

-      }

-      /// <summary>

-      /// Check default registry can create messages for unknown types

-      /// </summary>

-      [Test]

-      public void CanCreateUnknownType()

-      {

-         MessageFactoryRegistry registry =

-            MessageFactoryRegistry.NewDefaultRegistry();

-

-         const string OTHER = "application/unknown";

-         IMessage message = registry.CreateMessage(OTHER);

-         Assert.IsNotNull(message);

-         Assert.AreEqual(OTHER, message.ContentType);

-         Assert.IsInstanceOfType(typeof(QpidBytesMessage), message);

-      }

-      /// <summary>

-      /// Check that text messages default to UTF-8 encoding

-      /// </summary>

-      [Test]

-      public void TextMessagesDefaultToUTF8Encoding()

-      {

-         MessageFactoryRegistry registry =

-            MessageFactoryRegistry.NewDefaultRegistry();

-

-         IMessage message = registry.CreateMessage(TEXT_PLAIN);

-         Assert.AreEqual("utf-8", message.ContentEncoding.ToLower());

-      }

-

-   }

-} // namespace Apache.Qpid.Client.Tests.Messages

-

-

diff --git a/qpid/dotnet/Qpid.Client.Tests/MultiConsumer/ProducerMultiConsumer.cs b/qpid/dotnet/Qpid.Client.Tests/MultiConsumer/ProducerMultiConsumer.cs
deleted file mode 100644
index dc3b436a41..0000000000
--- a/qpid/dotnet/Qpid.Client.Tests/MultiConsumer/ProducerMultiConsumer.cs
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using System;
-using System.Text;
-using System.Threading;
-using log4net;
-using NUnit.Framework;
-using Apache.Qpid.Messaging;
-
-namespace Apache.Qpid.Client.Tests
-{
-    [TestFixture]
-    public class ProducerMultiConsumer : BaseMessagingTestFixture
-    {
-        private static readonly ILog _logger = LogManager.GetLogger(typeof(ProducerMultiConsumer));
-
-        private string _commandQueueName = "ServiceQ1";
-
-        private const int CONSUMER_COUNT = 5;
-
-        private const int MESSAGE_COUNT = 1000;
-
-        private const string MESSAGE_DATA_BYTES = "****jfd ghljgl hjvhlj cvhvjf ldhfsj lhfdsjf hldsjfk hdslkfj hsdflk  ";
-
-        AutoResetEvent _finishedEvent = new AutoResetEvent(false);
-
-        private static String GetData(int size)
-        {
-            StringBuilder buf = new StringBuilder(size);
-            int count = 0;
-            while (count < size + MESSAGE_DATA_BYTES.Length)
-            {
-                buf.Append(MESSAGE_DATA_BYTES);
-                count += MESSAGE_DATA_BYTES.Length;
-            }
-            if (count < size)
-            {
-                buf.Append(MESSAGE_DATA_BYTES, 0, size - count);
-            }
-
-            return buf.ToString();
-        }
-
-        private IMessagePublisher _publisher;
-
-        private IMessageConsumer[] _consumers = new IMessageConsumer[CONSUMER_COUNT];
-
-        private int _messageReceivedCount = 0;
-
-        [SetUp]
-        public override void Init()
-        {
-            base.Init();
-            _publisher = _channel.CreatePublisherBuilder()
-                .WithRoutingKey(_commandQueueName)
-                .WithExchangeName(ExchangeNameDefaults.TOPIC)
-                .Create();
-
-            _publisher.DisableMessageTimestamp = true;
-            _publisher.DeliveryMode = DeliveryMode.NonPersistent;
-
-            for (int i = 0; i < CONSUMER_COUNT; i++)
-            {
-                string queueName = _channel.GenerateUniqueName();
-                _channel.DeclareQueue(queueName, false, true, true);
-                
-                _channel.Bind(queueName, ExchangeNameDefaults.TOPIC, _commandQueueName);
-
-                _consumers[i] = _channel.CreateConsumerBuilder(queueName)
-                    .WithPrefetchLow(100).Create();
-                _consumers[i].OnMessage = new MessageReceivedDelegate(OnMessage);
-            }
-            _connection.Start();
-        }
-
-        public void OnMessage(IMessage m)
-        {
-            int newCount = Interlocked.Increment(ref _messageReceivedCount);
-            if (newCount % 1000 == 0) _logger.Info("Received count=" + newCount);
-            if (newCount == (MESSAGE_COUNT * CONSUMER_COUNT))
-            {
-                _logger.Info("All messages received");
-                _finishedEvent.Set();
-            }
-            if ( newCount % 100 == 0 ) 
-               System.Diagnostics.Debug.WriteLine(((ITextMessage)m).Text);
-         }
-        
-        [Test]
-        public void RunTest()
-        {
-            for (int i = 0; i < MESSAGE_COUNT; i++)
-            {
-                ITextMessage msg;
-                try
-                {
-                   msg = _channel.CreateTextMessage(GetData(512 + 8*i));
-                }
-                catch (Exception e)
-                {
-                    _logger.Error("Error creating message: " + e, e);
-                    break;
-                }
-                _publisher.Send(msg);
-            }
-            _finishedEvent.WaitOne();
-        }
-    }
-}
diff --git a/qpid/dotnet/Qpid.Client.Tests/Properties/AssemblyInfo.cs b/qpid/dotnet/Qpid.Client.Tests/Properties/AssemblyInfo.cs
deleted file mode 100644
index b3648391c1..0000000000
--- a/qpid/dotnet/Qpid.Client.Tests/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using System.Reflection;
-using System.Runtime.InteropServices;
-using log4net.Config;
-[assembly: XmlConfigurator(ConfigFile="log4net.config")]
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("Apache.Qpid.Client.Tests")]
-[assembly: AssemblyDescription("Test Suite for Qpid Clients")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Apache Qpid")]
-[assembly: AssemblyProduct("Apache.Qpid.Client.Tests")]
-[assembly: AssemblyCopyright("Copyright (c) 2006 The Apache Software Foundation")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("7ebdea21-1352-4673-b66e-fdc0beff461f")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-[assembly: AssemblyVersion("0.5.*")]
diff --git a/qpid/dotnet/Qpid.Client.Tests/Qpid.Client.Tests.csproj b/qpid/dotnet/Qpid.Client.Tests/Qpid.Client.Tests.csproj
deleted file mode 100644
index a1a34d480d..0000000000
--- a/qpid/dotnet/Qpid.Client.Tests/Qpid.Client.Tests.csproj
+++ /dev/null
@@ -1,114 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <PropertyGroup>

-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ProductVersion>8.0.50727</ProductVersion>

-    <SchemaVersion>2.0</SchemaVersion>

-    <ProjectGuid>{BA1B0032-4CE6-40DD-A2DC-119F0FFA0A1D}</ProjectGuid>

-    <OutputType>Library</OutputType>

-    <AppDesignerFolder>Properties</AppDesignerFolder>

-    <RootNamespace>Apache.Qpid.Client.Tests</RootNamespace>

-    <AssemblyName>Apache.Qpid.Client.Tests</AssemblyName>

-    <StartupObject>

-    </StartupObject>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

-    <DebugSymbols>true</DebugSymbols>

-    <DebugType>full</DebugType>

-    <Optimize>false</Optimize>

-    <OutputPath>..\bin\net-2.0\debug\</OutputPath>

-    <DefineConstants>DEBUG;TRACE</DefineConstants>

-    <ErrorReport>prompt</ErrorReport>

-    <WarningLevel>4</WarningLevel>

-    <UseVSHostingProcess>true</UseVSHostingProcess>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

-    <DebugType>pdbonly</DebugType>

-    <Optimize>true</Optimize>

-    <OutputPath>..\bin\net-2.0\release\</OutputPath>

-    <DefineConstants>TRACE</DefineConstants>

-    <ErrorReport>prompt</ErrorReport>

-    <WarningLevel>4</WarningLevel>

-  </PropertyGroup>

-  <ItemGroup>

-    <Reference Include="log4net, Version=1.2.9.0, Culture=neutral, PublicKeyToken=b32731d11ce58905">

-      <SpecificVersion>False</SpecificVersion>

-      <HintPath>..\Qpid.Common\lib\log4net\log4net.dll</HintPath>

-    </Reference>

-    <Reference Include="nunit.framework, Version=2.2.6.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77">

-      <SpecificVersion>False</SpecificVersion>

-      <HintPath>lib\nunit\nunit.framework.dll</HintPath>

-    </Reference>

-    <Reference Include="System" />

-    <Reference Include="System.Data" />

-    <Reference Include="System.Xml" />

-  </ItemGroup>

-  <ItemGroup>

-    <Compile Include="BrokerDetails\BrokerDetailsTest.cs" />

-    <Compile Include="Channel\ChannelMessageCreationTests.cs" />

-    <Compile Include="Channel\ChannelQueueTest.cs" />

-    <Compile Include="interop\InteropClientTestCase.cs" />

-    <Compile Include="interop\TestCases\TestCase1DummyRun.cs" />

-    <Compile Include="interop\TestCases\TestCase2BasicP2P.cs" />

-    <Compile Include="interop\TestCases\TestCase3BasicPubSub.cs" />

-    <Compile Include="interop\TestClient.cs" />

-    <Compile Include="Messages\MessageFactoryRegistryTests.cs" />

-    <Compile Include="connection\ConnectionTest.cs" />

-    <Compile Include="connection\SslConnectionTest.cs" />

-    <Compile Include="failover\FailoverTest.cs" />

-    <Compile Include="failover\FailoverTxTest.cs" />

-    <Compile Include="HeadersExchange\HeadersExchangeTest.cs" />

-    <Compile Include="interop\TopicListener.cs" />

-    <Compile Include="interop\TopicPublisher.cs" />

-    <Compile Include="MultiConsumer\ProducerMultiConsumer.cs" />

-    <Compile Include="Properties\AssemblyInfo.cs" />

-    <Compile Include="Common\BaseMessagingTestFixture.cs" />

-    <Compile Include="requestreply1\ServiceProvidingClient.cs" />

-    <Compile Include="requestreply1\ServiceRequestingClient.cs" />

-    <Compile Include="Security\CallbackHandlerRegistryTests.cs" />

-    <Compile Include="SimpleConsumer\TestSyncConsumer.cs" />

-    <Compile Include="undeliverable\UndeliverableTest.cs" />

-    <Compile Include="url\ConnectionUrlTest.cs" />

-  </ItemGroup>

-  <ItemGroup>

-    <ProjectReference Include="..\Qpid.Buffer\Qpid.Buffer.csproj">

-      <Project>{44384DF2-B0A4-4580-BDBC-EE4BAA87D995}</Project>

-      <Name>Qpid.Buffer</Name>

-    </ProjectReference>

-    <ProjectReference Include="..\Qpid.Messaging\Qpid.Messaging.csproj">

-      <Project>{6688F826-C58E-4C1B-AA1F-22AFAB4B7D07}</Project>

-      <Name>Qpid.Messaging</Name>

-    </ProjectReference>

-    <ProjectReference Include="..\Qpid.Client\Qpid.Client.csproj">

-      <Project>{68987C05-3768-452C-A6FC-6BA1D372852F}</Project>

-      <Name>Qpid.Client</Name>

-    </ProjectReference>

-    <ProjectReference Include="..\Qpid.Common\Qpid.Common.csproj">

-      <Project>{77064C42-24D2-4CEB-9EA2-0EF481A43205}</Project>

-      <Name>Qpid.Common</Name>

-    </ProjectReference>

-    <ProjectReference Include="..\Qpid.Sasl\Qpid.Sasl.csproj">

-      <Project>{1465B0EE-6452-42A6-AB73-B2F9EABEEE75}</Project>

-      <Name>Qpid.Sasl</Name>

-    </ProjectReference>

-  </ItemGroup>

-  <ItemGroup>

-    <None Include="log4net.config">

-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

-    </None>

-  </ItemGroup>

-  <ItemGroup>

-    <None Include="App.config" />

-    <None Include="Qpid.Common.DLL.config">

-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

-    </None>

-  </ItemGroup>

-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

-       Other similar extension points exist, see Microsoft.Common.targets.

-  <Target Name="BeforeBuild">

-  </Target>

-  <Target Name="AfterBuild">

-  </Target>

-  -->

-</Project>

diff --git a/qpid/dotnet/Qpid.Client.Tests/Qpid.Common.DLL.config b/qpid/dotnet/Qpid.Client.Tests/Qpid.Common.DLL.config
deleted file mode 100644
index e1300549d7..0000000000
--- a/qpid/dotnet/Qpid.Client.Tests/Qpid.Common.DLL.config
+++ /dev/null
@@ -1,5 +0,0 @@
-<configuration>
-  <assemblySettings>
-    <add key="OpenAMQ1d4Compatibility" value="false"/>
-  </assemblySettings>
-</configuration>
\ No newline at end of file
diff --git a/qpid/dotnet/Qpid.Client.Tests/Security/CallbackHandlerRegistryTests.cs b/qpid/dotnet/Qpid.Client.Tests/Security/CallbackHandlerRegistryTests.cs
deleted file mode 100644
index 1345511cbf..0000000000
--- a/qpid/dotnet/Qpid.Client.Tests/Security/CallbackHandlerRegistryTests.cs
+++ /dev/null
@@ -1,66 +0,0 @@
-/*

- *

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- *

- */

-using System;

-using NUnit.Framework;

-using Apache.Qpid.Client.Security;

-

-

-namespace Apache.Qpid.Client.Tests.Security

-{

-   [TestFixture]

-   public class CallbackRegistryHandlerTests

-   {

-      [Test]

-      public void ParsesConfiguration()

-      {

-         CallbackHandlerRegistry registry = CallbackHandlerRegistry.Instance;

-         Assert.AreEqual(4, registry.Mechanisms.Length);

-         Assert.Contains("TEST", registry.Mechanisms);

-

-         Type handlerType = registry.GetCallbackHandler("TEST");

-         Assert.IsNotNull(handlerType);

-         Assert.AreEqual(typeof(TestCallbackHandler), handlerType);

-      }

-

-      [Test]

-      public void MechanimsInOrder()

-      {

-         CallbackHandlerRegistry registry = CallbackHandlerRegistry.Instance;

-         Assert.AreEqual(4, registry.Mechanisms.Length);

-         Assert.AreEqual("TEST", registry.Mechanisms[0]);

-         Assert.AreEqual("EXTERNAL", registry.Mechanisms[1]);

-         Assert.AreEqual("CRAM-MD5", registry.Mechanisms[2]);

-         Assert.AreEqual("PLAIN", registry.Mechanisms[3]);

-      }

-   } // class CallbackRegistryHandlerTests

-

-   public class TestCallbackHandler : IAMQCallbackHandler

-   {

-      public void Initialize(Qpid.Client.Protocol.AMQProtocolSession session)

-      {

-      }

-      public void Handle(Qpid.Sasl.ISaslCallback[] callbacks)

-      {

-      }

-

-   } // class TestCallbackHandler

-

-} // namespace Apache.Qpid.Client.Tests.Connection

diff --git a/qpid/dotnet/Qpid.Client.Tests/SimpleConsumer/TestSyncConsumer.cs b/qpid/dotnet/Qpid.Client.Tests/SimpleConsumer/TestSyncConsumer.cs
deleted file mode 100644
index f299812989..0000000000
--- a/qpid/dotnet/Qpid.Client.Tests/SimpleConsumer/TestSyncConsumer.cs
+++ /dev/null
@@ -1,127 +0,0 @@
-/*

- *

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- *

- */

-using System;

-using System.Text;

-using System.Threading;

-using log4net;

-using NUnit.Framework;

-using Apache.Qpid.Messaging;

-

-namespace Apache.Qpid.Client.Tests

-{

-   [TestFixture]

-   public class TestSyncConsumer : BaseMessagingTestFixture

-   {

-      private static readonly ILog _logger = LogManager.GetLogger(typeof(TestSyncConsumer));

-

-      private string _commandQueueName = "ServiceQ1";

-      private const int MESSAGE_COUNT = 1000;

-      private const string MESSAGE_DATA_BYTES = "jfd ghljgl hjvhlj cvhvjf ldhfsj lhfdsjf hldsjfk hdslkfj hsdflk  ";

-

-      private static String GetData(int size)

-      {

-         StringBuilder buf = new StringBuilder(size);

-         int count = 0;

-         while ( count < size + MESSAGE_DATA_BYTES.Length )

-         {

-            buf.Append(MESSAGE_DATA_BYTES);

-            count += MESSAGE_DATA_BYTES.Length;

-         }

-         if ( count < size )

-         {

-            buf.Append(MESSAGE_DATA_BYTES, 0, size - count);

-         }

-

-         return buf.ToString();

-      }

-

-      private IMessageConsumer _consumer;

-      private IMessagePublisher _publisher;

-

-      [SetUp]

-      public override void Init()

-      {

-         base.Init();

-         _publisher = _channel.CreatePublisherBuilder()

-             .WithRoutingKey(_commandQueueName)

-             .WithExchangeName(ExchangeNameDefaults.TOPIC)

-             .Create();

-

-         _publisher.DisableMessageTimestamp = true;

-         _publisher.DeliveryMode = DeliveryMode.NonPersistent;

-

-         string queueName = _channel.GenerateUniqueName();

-         _channel.DeclareQueue(queueName, false, true, true);

-

-         _channel.Bind(queueName, ExchangeNameDefaults.TOPIC, _commandQueueName);

-

-         _consumer = _channel.CreateConsumerBuilder(queueName)

-             .WithPrefetchLow(100).Create();

-         _connection.Start();

-      }

-

-      [Test]

-      public void ReceiveWithInfiniteWait()

-      {

-         // send all messages

-         for ( int i = 0; i < MESSAGE_COUNT; i++ )

-         {

-            ITextMessage msg;

-            try

-            {

-               msg = _channel.CreateTextMessage(GetData(512 + 8 * i));

-            } catch ( Exception e )

-            {

-               _logger.Error("Error creating message: " + e, e);

-               break;

-            }

-            _publisher.Send(msg);

-         }

-

-         _logger.Debug("All messages sent");

-         // receive all messages

-         for ( int i = 0; i < MESSAGE_COUNT; i++ )

-         {

-            try

-            {

-               IMessage msg = _consumer.Receive();

-               Assert.IsNotNull(msg);

-            } catch ( Exception e )

-            {

-               _logger.Error("Error receiving message: " + e, e);

-               Assert.Fail(e.ToString());

-            }

-         }

-      }

-

-      [Test]

-      public void ReceiveWithTimeout()

-      {

-         ITextMessage msg = _channel.CreateTextMessage(GetData(512 + 8));

-         _publisher.Send(msg);

-

-         IMessage recvMsg = _consumer.Receive();

-         Assert.IsNotNull(recvMsg);

-         // empty queue, should timeout

-         Assert.IsNull(_consumer.Receive(1000));

-      }

-   }

-}

diff --git a/qpid/dotnet/Qpid.Client.Tests/connection/ConnectionTest.cs b/qpid/dotnet/Qpid.Client.Tests/connection/ConnectionTest.cs
deleted file mode 100644
index 165da62828..0000000000
--- a/qpid/dotnet/Qpid.Client.Tests/connection/ConnectionTest.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using System;
-using NUnit.Framework;
-using Apache.Qpid.Client.Qms;
-using Apache.Qpid.Messaging;
-
-namespace Apache.Qpid.Client.Tests.Connection
-{
-    [TestFixture]
-    public class ConnectionTest
-    {
-        private AmqBrokerInfo _broker = 
-           new AmqBrokerInfo("amqp", "localhost", 5672, false);
-        
-        [Test]
-        public void SimpleConnection()
-        {
-            IConnectionInfo connectionInfo = new QpidConnectionInfo();
-            connectionInfo.VirtualHost = "test";
-            connectionInfo.AddBrokerInfo(_broker);
-            using (IConnection connection = new AMQConnection(connectionInfo))
-            {
-                Console.WriteLine("connection = " + connection);
-            }
-        }
-
-        [Test]
-        [ExpectedException(typeof(AMQAuthenticationException))]
-        public void PasswordFailureConnection()
-        {
-            IConnectionInfo connectionInfo = new QpidConnectionInfo();
-            connectionInfo.VirtualHost = "test";
-            connectionInfo.Password = "rubbish";
-            connectionInfo.AddBrokerInfo(_broker);
-
-            using (IConnection connection = new AMQConnection(connectionInfo))
-            {
-                 Console.WriteLine("connection = " + connection);
-                 // wrong
-                 Assert.Fail("Authentication succeeded but should've failed");
-            }
-        }
-
-        [Test]
-        [ExpectedException(typeof(AMQConnectionException))]
-        public void ConnectionFailure()
-        {
-            string url = "amqp://guest:guest@clientid/testpath?brokerlist='tcp://localhost:5673?retries='0''";
-            new AMQConnection(QpidConnectionInfo.FromUrl(url));
-            Assert.Fail("Connection should not be established");
-        }
-    }
-}
diff --git a/qpid/dotnet/Qpid.Client.Tests/connection/SslConnectionTest.cs b/qpid/dotnet/Qpid.Client.Tests/connection/SslConnectionTest.cs
deleted file mode 100644
index e1c61f9059..0000000000
--- a/qpid/dotnet/Qpid.Client.Tests/connection/SslConnectionTest.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-/*

- *

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- *

- */

-using System;

-using System.IO;

-using System.Reflection;

-using System.Security.Cryptography.X509Certificates;

-using NUnit.Framework;

-using Apache.Qpid.Client.Qms;

-using Apache.Qpid.Messaging;

-

-namespace Apache.Qpid.Client.Tests.Connection

-{

-   /// <summary>

-   /// Test SSL/TLS connections to the broker

-   /// </summary>

-   [TestFixture, Category("SSL")]

-   public class SslConnectionTest

-   {

-      /// <summary>

-      /// Make a test TLS connection to the broker

-      /// without using client-certificates

-      /// </summary>

-      [Test]

-      public void DoSslConnection()

-      {

-         // because for tests we don't usually trust the server certificate

-         // we need here to tell the client to ignore certificate validation errors

-         SslOptions sslConfig = new SslOptions(null, true);

-

-         MakeBrokerConnection(sslConfig);

-      }

-

-      private static void MakeBrokerConnection(SslOptions options)

-      {

-         IConnectionInfo connectionInfo = new QpidConnectionInfo();

-         connectionInfo.VirtualHost = "test";

-         connectionInfo.AddBrokerInfo(new AmqBrokerInfo("amqp", "localhost", 8672, options));

-

-         using ( IConnection connection = new AMQConnection(connectionInfo) )

-         {

-            Console.WriteLine("connection = " + connection);

-         }

-      }

-   }

-}

diff --git a/qpid/dotnet/Qpid.Client.Tests/default.build b/qpid/dotnet/Qpid.Client.Tests/default.build
deleted file mode 100644
index e7fb81dae5..0000000000
--- a/qpid/dotnet/Qpid.Client.Tests/default.build
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0"?>
-<project name="Apache.Qpid.Client" default="test">
-
-   <target name="build">
-        <csc target="library" 
-			define="${build.defines}" 
-			warnaserror="false" debug="${build.debug}" 
-         output="${build.dir}/${project::get-name()}.Tests.dll">
-			
-            <sources>
-                <include name="**/*.cs" />
-            </sources>
-            <references>
-               <include name="${build.dir}/log4net.dll" />
-               <include name="${build.dir}/nunit.framework.dll" />
-               <include name="${build.dir}/${project::get-name()}.dll" />
-               <include name="${build.dir}/Apache.Qpid.Common.dll" />
-               <include name="${build.dir}/Apache.Qpid.Messaging.dll" />
-               <include name="${build.dir}/Apache.Qpid.Sasl.dll" />
-            </references>
-        </csc>
-         <copy 
-            tofile="${build.dir}/${project::get-name()}.Tests.dll.config" 
-            file="App.config"
-         />
-         <copy 
-            todir="${build.dir}" 
-            file="log4net.config"
-         />
-    </target>
-    <target name="test" depends="build">
-         <nunit2>
-            <formatter type="${nant.formatter}" usefile="false" />
-            <test>
-               <assemblies>
-                  <include name="${build.dir}/${project::get-name()}.tests.dll"/>
-               </assemblies>
-               <categories>
-                  <exclude name="Failover"/>
-                  <exclude name="SSL" if="${framework::get-target-framework() == 'mono-2.0'}"/>
-               </categories>
-            </test>
-         </nunit2>
-    </target>
-</project>
-
diff --git a/qpid/dotnet/Qpid.Client.Tests/failover/FailoverTest.cs b/qpid/dotnet/Qpid.Client.Tests/failover/FailoverTest.cs
deleted file mode 100644
index 1f1e2f726c..0000000000
--- a/qpid/dotnet/Qpid.Client.Tests/failover/FailoverTest.cs
+++ /dev/null
@@ -1,257 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using System;
-using System.Threading;
-using log4net;
-using NUnit.Framework;
-using Apache.Qpid.Client.Qms;
-using Apache.Qpid.Messaging;
-
-namespace Apache.Qpid.Client.Tests.failover
-{
-    [TestFixture, Category("Failover")]
-    public class FailoverTest : IConnectionListener
-    {
-        private static readonly ILog _logger = LogManager.GetLogger(typeof(FailoverTest));
-
-        private IConnection _connection;
-        private IChannel _channel;
-        private IMessagePublisher _publisher;
-        private int _count;
-
-        private IMessageConsumer _consumerOfResponse;
-
-        void DoFailoverTest(IConnectionInfo info)
-        {
-            DoFailoverTest(new AMQConnection(info));
-        }
-
-        void DoFailoverTest(IConnection connection)
-        {
-            AMQConnection amqConnection = (AMQConnection)connection;
-            amqConnection.ConnectionListener = this;
-            //Console.WriteLine("connection.url = " + amqConnection.ToURL());
-            _connection = connection;
-            _connection.ExceptionListener = new ExceptionListenerDelegate(OnConnectionException);
-            _channel = _connection.CreateChannel(false, AcknowledgeMode.NoAcknowledge);
-
-            string exchangeName = ExchangeNameDefaults.TOPIC;
-            string routingKey = "topic1";
-
-            string queueName = DeclareAndBindTemporaryQueue(exchangeName, routingKey);
-            
-            new MsgListener(_connection.CreateChannel(false, AcknowledgeMode.NoAcknowledge), queueName);
-
-            IChannel channel = _channel;
-
-            string tempQueueName = channel.GenerateUniqueName();
-            channel.DeclareQueue(tempQueueName, false, true, true);
-            _consumerOfResponse = channel.CreateConsumerBuilder(tempQueueName).Create();
-            _consumerOfResponse.OnMessage = new MessageReceivedDelegate(OnMessage);
-
-            _connection.Start();
-
-            IMessage msg = _channel.CreateTextMessage("Init");
-            // FIXME: Leaving ReplyToExchangeName as default (i.e. the default exchange)
-            // FIXME: but the implementation might not like this as it defaults to null rather than "".
-            msg.ReplyToRoutingKey = tempQueueName;
-//            msg.ReplyTo = new ReplyToDestination("" /* i.e. the default exchange */, tempQueueName);
-            _logger.Info(String.Format("sending msg.Text={0}", ((ITextMessage)msg).Text));
-
-//            _publisher = _channel.CreatePublisher(exchangeName, exchangeClass, routingKey);
-            _publisher = _channel.CreatePublisherBuilder()
-                .WithRoutingKey(routingKey)
-                .WithExchangeName(exchangeName)
-                .Create();
-            _publisher.Send(msg);
-        }
-
-        public string DeclareAndBindTemporaryQueue(string exchangeName, string routingKey)
-        {
-            string queueName = _channel.GenerateUniqueName();
-
-            // Queue.Declare
-            _channel.DeclareQueue(queueName, false, true, true);
-
-            // Queue.Bind
-            _channel.Bind(queueName, exchangeName, routingKey);
-            return queueName;
-        }
-
-        private void OnConnectionException(Exception e)
-        {
-            _logger.Error("Connection exception occurred", e);
-        }
-
-        public void OnMessage(IMessage message)
-        {
-            try
-            {
-                _logger.Info("received message on temp queue msg.Text=" + ((ITextMessage)message).Text);
-                Thread.Sleep(1000);
-                _publisher.Send(_channel.CreateTextMessage("Message" + (++_count)));
-            }
-            catch (QpidException e)
-            {
-                error(e);
-            }
-        }
-
-        private void error(Exception e)
-        {
-            _logger.Error("exception received", e);
-            stop();
-        }
-
-        private void stop()
-        {
-            _logger.Info("Stopping...");
-            try
-            {
-                _connection.Dispose();
-            }
-            catch (QpidException e)
-            {
-                _logger.Error("Failed to shutdown", e);
-            }
-        }
-
-        public void BytesSent(long count)
-        {
-        }
-
-        public void BytesReceived(long count)
-        {
-        }
-
-        public bool PreFailover(bool redirect)
-        {
-            _logger.Info("preFailover(" + redirect + ") called");
-            return true;
-        }
-
-        public bool PreResubscribe()
-        {
-            _logger.Info("preResubscribe() called");
-            return true;
-        }
-
-        public void FailoverComplete()
-        {
-            _logger.Info("failoverComplete() called");
-        }
-
-        private class MsgListener
-        {
-            private IChannel _session;
-            private IMessagePublisher _publisher;
-
-            internal MsgListener(IChannel session, string queueName)
-            {
-                _session = session;
-                _session.CreateConsumerBuilder(queueName).Create().OnMessage = 
-                    new MessageReceivedDelegate(OnMessage);
-            }
-
-            public void OnMessage(IMessage message)
-            {
-                try
-                {
-                    _logger.Info("Received: msg.Text = " + ((ITextMessage) message).Text);
-                    if(_publisher == null)
-                    {
-                        _publisher = init(message);
-                    }
-                    reply(message);
-                }
-                catch (QpidException e)
-                {
-//                   Error(e);
-                    _logger.Error("yikes", e); // XXX
-                }
-            }
-
-            private void reply(IMessage message)
-            {
-                string msg = ((ITextMessage) message).Text;
-                _logger.Info("sending reply - " + msg);
-                _publisher.Send(_session.CreateTextMessage(msg));
-            }
-
-            private IMessagePublisher init(IMessage message)
-            {
-                _logger.Info(string.Format("creating reply producer with dest = '{0}:{1}'", 
-                                           message.ReplyToExchangeName, message.ReplyToRoutingKey));
-
-                string exchangeName = message.ReplyToExchangeName;
-                string routingKey = message.ReplyToRoutingKey;
-
-                //return _channel.CreatePublisher(exchangeName, exchangeClass, routingKey);
-                return _session.CreatePublisherBuilder()
-                    .WithExchangeName(exchangeName)
-                    .WithRoutingKey(routingKey)
-                    .Create();
-            }
-        }
-
-        [Test]
-        public void TestFail()
-        {
-            Assert.Fail("Tests in this class do not pass, but hang forever, so commented out until can be fixed.");
-        }
-
-        /*[Test]
-        public void TestWithBasicInfo()
-        {
-            Console.WriteLine("TestWithBasicInfo");
-            try
-            {
-                QpidConnectionInfo connectionInfo = new QpidConnectionInfo();
-                connectionInfo.AddBrokerInfo(new AmqBrokerInfo("amqp", "localhost", 5672, false));
-                connectionInfo.AddBrokerInfo(new AmqBrokerInfo("amqp", "localhost", 5673, false));               
-                DoFailoverTest(connectionInfo);
-                while (true)
-                {
-                    Thread.Sleep(5000);
-                }
-            }
-            catch (Exception e)
-            {
-                _logger.Error("Exception caught", e);
-            }
-        }*/
-
-//        [Test]
-//        public void TestWithUrl()
-//        {
-//            String clientId = "failover" + DateTime.Now.Ticks;
-//            String defaultUrl = "amqp://guest:guest@" + clientId + "/test" +
-//                                "?brokerlist='tcp://localhost:5672;tcp://localhost:5673'&failover='roundrobin'";
-//
-//            _logger.Info("url = [" + defaultUrl + "]");
-//
-//            //            _logger.Info("connection url = [" + new AMQConnectionURL(defaultUrl) + "]");
-//
-//            String broker = defaultUrl;
-//            //new FailoverTest(broker);
-//        }
-    }
-}
diff --git a/qpid/dotnet/Qpid.Client.Tests/failover/FailoverTxTest.cs b/qpid/dotnet/Qpid.Client.Tests/failover/FailoverTxTest.cs
deleted file mode 100644
index a110891cfc..0000000000
--- a/qpid/dotnet/Qpid.Client.Tests/failover/FailoverTxTest.cs
+++ /dev/null
@@ -1,253 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using System;
-using System.Runtime.InteropServices;
-using System.Threading;
-using log4net;
-using NUnit.Framework;
-using Apache.Qpid.Client.Qms;
-using Apache.Qpid.Messaging;
-
-namespace Apache.Qpid.Client.Tests.failover
-{
-    [TestFixture, Category("Failover")]
-    public class FailoverTxTest : IConnectionListener
-    {
-        private static readonly ILog _log = LogManager.GetLogger(typeof(FailoverTxTest));
-
-        const int NUM_ITERATIONS = 10;
-        const int NUM_COMMITED_MESSAGES = 10;
-        const int NUM_ROLLEDBACK_MESSAGES = 3;
-        const int SLEEP_MILLIS = 50;
-
-        // AutoAcknowledge, ClientAcknowledge, DupsOkAcknowledge, NoAcknowledge, PreAcknowledge
-        AcknowledgeMode _acknowledgeMode = AcknowledgeMode.DupsOkAcknowledge;
-        const bool _noWait = true; // use Receive or ReceiveNoWait
-        AMQConnection _connection;
-
-        public void OnMessage(IMessage message)
-        {
-            try
-            {
-                _log.Info("Received: " + ((ITextMessage) message).Text);
-                if (_acknowledgeMode == AcknowledgeMode.ClientAcknowledge)
-                {
-                    _log.Info("client acknowledging");
-                    message.Acknowledge();
-                }
-            }
-            catch (QpidException e)
-            {
-               Error(e);
-            }
-        }
-
-        class NoWaitConsumer
-        {
-            FailoverTxTest _failoverTxTest;
-            IMessageConsumer _consumer;
-            private bool _noWait;
-
-            internal NoWaitConsumer(FailoverTxTest failoverTxTest, IMessageConsumer channel, bool noWait)
-            {
-                _failoverTxTest = failoverTxTest;
-                _consumer = channel;
-                _noWait = noWait;
-            }
-
-            internal void Run()
-            {
-                int messages = 0;
-                while (messages < NUM_COMMITED_MESSAGES)
-                {
-                    IMessage msg;
-                    if (_noWait) msg = _consumer.ReceiveNoWait();
-                    else msg = _consumer.Receive();
-                    if (msg != null)
-                    {
-                        _log.Info("NoWait received message");
-                        ++messages;
-                        _failoverTxTest.OnMessage(msg);
-                    }
-                    else
-                    {
-                        Thread.Sleep(1);
-                    }
-
-                }
-
-            }
-        }
-
-        void DoFailoverTxTest(IConnectionInfo connectionInfo)
-        {
-            _connection = new AMQConnection(connectionInfo);
-            _connection.ConnectionListener = this;
-            _log.Info("connection = " + _connection);
-            _log.Info("connectionInfo = " + connectionInfo);
-            _log.Info("connection.AsUrl = " + _connection.toURL());
-
-            _log.Info("AcknowledgeMode is " + _acknowledgeMode);
-            IChannel receivingChannel = _connection.CreateChannel(false, _acknowledgeMode);
-
-            string queueName = receivingChannel.GenerateUniqueName();
-
-            // Queue.Declare
-            receivingChannel.DeclareQueue(queueName, false, true, true);
-
-            // No need to call Queue.Bind as automatically bound to default direct exchange.
-            receivingChannel.Bind(queueName, "amq.direct", queueName);
-
-            IMessageConsumer consumer = receivingChannel.CreateConsumerBuilder(queueName)
-                .WithPrefetchLow(30)
-                .WithPrefetchHigh(60).Create();
-            bool useThread = false;
-            if (useThread)
-            {
-                NoWaitConsumer noWaitConsumer = new NoWaitConsumer(this, consumer, _noWait);
-                new Thread(new ThreadStart(noWaitConsumer.Run)).Start();
-            }
-            else
-            {
-                consumer.OnMessage = new MessageReceivedDelegate(OnMessage);
-            }
-
-            _connection.Start();
-
-            PublishInTx(queueName);
-
-            Thread.Sleep(2000); // Wait a while for last messages.
-
-            _connection.Close();
-            _log.Info("FailoverTxText complete");
-        }
-
-        private void PublishInTx(string routingKey)
-        {
-            _log.Info("sendInTx");
-            bool transacted = true;
-            IChannel publishingChannel = _connection.CreateChannel(transacted, AcknowledgeMode.NoAcknowledge);
-            IMessagePublisher publisher = publishingChannel.CreatePublisherBuilder()
-                .WithRoutingKey(routingKey)
-                .Create();
-
-            for (int i = 1; i <= NUM_ITERATIONS; ++i)
-            {
-                for (int j = 1; j <= NUM_ROLLEDBACK_MESSAGES; ++j)
-                {
-                    ITextMessage msg = publishingChannel.CreateTextMessage("Tx=" + i + " rolledBackMsg=" + j);
-                    _log.Info("sending message = " + msg.Text);
-                    publisher.Send(msg);
-                    Thread.Sleep(SLEEP_MILLIS);
-                }
-                if (transacted) publishingChannel.Rollback();
-
-                for (int j = 1; j <= NUM_COMMITED_MESSAGES; ++j)
-                {
-                    ITextMessage msg = publishingChannel.CreateTextMessage("Tx=" + i + " commitedMsg=" + j);
-                    _log.Info("sending message = " + msg.Text);
-                    publisher.Send(msg);
-                    Thread.Sleep(SLEEP_MILLIS);
-                }
-                if (transacted) publishingChannel.Commit();
-            }
-        }
-
-        private void Error(Exception e)
-        {
-            _log.Fatal("Exception received. About to stop.", e);
-            Stop();
-        }
-
-        private void Stop()
-        {
-            _log.Info("Stopping...");
-            try
-            {
-                _connection.Close();
-            }
-            catch (QpidException e)
-            {
-                _log.Info("Failed to shutdown: ", e);
-            }
-        }
-
-        public void BytesSent(long count)
-        {
-        }
-
-        public void BytesReceived(long count)
-        {
-        }
-
-        public bool PreFailover(bool redirect)
-        {
-            _log.Info("preFailover(" + redirect + ") called");
-            return true;
-        }
-
-        public bool PreResubscribe()
-        {
-            _log.Info("preResubscribe() called");
-            return true;
-        }
-
-        public void FailoverComplete()
-        {
-            _log.Info("failoverComplete() called");
-        }
-
-        [Test]
-        public void TestFail()
-        {
-            Assert.Fail("Tests in this class do not pass, but hang forever, so commented out until can be fixed.");
-        }
-
-        /*[Test]
-        public void TestWithBasicInfo()
-        {
-            Console.WriteLine("TestWithBasicInfo");
-            Console.WriteLine(".NET Framework version: " + RuntimeEnvironment.GetSystemVersion());
-            QpidConnectionInfo connectionInfo = new QpidConnectionInfo();
-
-            connectionInfo.AddBrokerInfo(new AmqBrokerInfo("amqp", "localhost", 5672, false));
-            connectionInfo.AddBrokerInfo(new AmqBrokerInfo("amqp", "localhost", 5673, false));
-
-            DoFailoverTxTest(connectionInfo);
-        }*/
-
-        /*[Test]
-        public void runTestWithUrl()
-        {
-            String clientId = "failover" + DateTime.Now.Ticks;
-            string defaultUrl = "amqp://guest:guest@" + clientId + "/test" +
-                    "?brokerlist='tcp://localhost:5672;tcp://localhost:5673'&failover='roundrobin'";
-
-            _log.Info("url = [" + defaultUrl + "]");
-
-            IConnectionInfo connectionInfo = QpidConnectionInfo.FromUrl(defaultUrl);
-
-            _log.Info("connection url = [" + connectionInfo + "]");
-
-            DoFailoverTxTest(connectionInfo);
-        }*/
-    }
-}
diff --git a/qpid/dotnet/Qpid.Client.Tests/interop/InteropClientTestCase.cs b/qpid/dotnet/Qpid.Client.Tests/interop/InteropClientTestCase.cs
deleted file mode 100644
index a667265ba4..0000000000
--- a/qpid/dotnet/Qpid.Client.Tests/interop/InteropClientTestCase.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-using System;

-using System.Text;

-using Apache.Qpid.Messaging;

-

-namespace Apache.Qpid.Client.Tests.interop

-{

-    /// <summary> Defines the possible test case roles that an interop test case can take on. </summary>

-    public enum Roles { SENDER, RECEIVER };

-

-    /// <summary>

-    /// InteropClientTestCase provides an interface that classes implementing test cases from the interop testing spec

-    /// (http://cwiki.apache.org/confluence/display/qpid/Interop+Testing+Specification) should implement.

-    /// 

-    /// <p><table id="crc"><caption>CRC Card</caption>

-    /// <tr><th> Responsibilities

-    /// <tr><td> Supply the name of the test case that this implements.

-    /// <tr><td> Accept/Reject invites based on test parameters.

-    /// <tr><td> Adapt to assigned roles.

-    /// <tr><td> Perform test case actions.

-    /// <tr><td> Generate test reports.

-    /// </table>

-    /// </summary>

-    interface InteropClientTestCase

-    {

-        /// <summary>

-        /// Should provide the name of the test case that this class implements. The exact names are defined in the

-        /// interop testing spec.

-        /// </summary>

-        ///

-        /// <returns> The name of the test case that this implements. </returns>

-        string GetName();

-

-        /// <summary>

-        /// Determines whether the test invite that matched this test case is acceptable.

-        /// </summary>

-        ///

-        /// <param name="inviteMessage"> The invitation to accept or reject. </param>

-        ///

-        /// <returns> <tt>true</tt> to accept the invitation, <tt>false</tt> to reject it. </returns>

-        ///

-        /// @throws JMSException Any JMSException resulting from reading the message are allowed to fall through.

-        bool AcceptInvite(IMessage inviteMessage);

-

-        /// <summary>

-        /// Assigns the role to be played by this test case. The test parameters are fully specified in the

-        /// assignment message. When this method return the test case will be ready to execute.

-        /// </summary>

-        ///

-        /// <param name="role">              The role to be played; sender or receiver. </param>

-        /// <param name="assignRoleMessage"> The role assingment message, contains the full test parameters. </param>

-        void AssignRole(Roles role, IMessage assignRoleMessage);

-

-        /// <summary>

-        /// Performs the test case actions.

-        /// </summary>

-        void Start();

-

-        /// <summary>

-        /// Gets a report on the actions performed by the test case in its assigned role.

-        /// </summary>

-        ///

-        /// <param name="session"> The session to create the report message in. </param>

-        ///

-        /// <returns> The report message. </returns>

-        IMessage GetReport(IChannel channel);

-    }

-}

diff --git a/qpid/dotnet/Qpid.Client.Tests/interop/TestCases/TestCase1DummyRun.cs b/qpid/dotnet/Qpid.Client.Tests/interop/TestCases/TestCase1DummyRun.cs
deleted file mode 100644
index 7ff686e1cb..0000000000
--- a/qpid/dotnet/Qpid.Client.Tests/interop/TestCases/TestCase1DummyRun.cs
+++ /dev/null
@@ -1,69 +0,0 @@
-using System;

-using System.Text;

-using log4net;

-using Apache.Qpid.Messaging;

-

-namespace Apache.Qpid.Client.Tests.interop.TestCases

-{

-    /// <summary>

-    /// Implements tet case 1, dummy run. This test case sends no test messages, it exists to confirm that the test harness

-    /// is interacting with the coordinator correctly.

-    ///

-    /// <p><table id="crc"><caption>CRC Card</caption>

-    /// <tr><th> Responsibilities <th> Collaborations

-    /// <tr><td> Supply the name of the test case that this implements.

-    /// <tr><td> Accept/Reject invites based on test parameters.

-    /// <tr><td> Adapt to assigned roles.

-    /// <tr><td> Perform test case actions.

-    /// <tr><td> Generate test reports.

-    /// </table>

-    /// </summary>

-    public class TestCase1DummyRun : InteropClientTestCase

-    {

-        private static ILog log = LogManager.GetLogger(typeof(TestCase1DummyRun));

-

-        public String GetName()

-        {

-            log.Debug("public String getName(): called");

-

-            return "TC1_DummyRun";

-        }

-

-        public bool AcceptInvite(IMessage inviteMessage)

-        {

-            log.Debug("public boolean acceptInvite(Message inviteMessage): called");

-

-            // Test parameters don't matter, accept all invites.

-            return true;

-        }

-

-        public void AssignRole(Roles role, IMessage assignRoleMessage)

-        {

-            log.Debug("public void assignRole(Roles role, Message assignRoleMessage): called");

-

-            // Do nothing, both roles are the same.

-        }

-

-        public void Start()

-        {

-            log.Debug("public void start(): called");

-

-            // Do nothing.

-        }

-

-        public IMessage GetReport(IChannel channel)

-        {

-            log.Debug("public Message getReport(Session session): called");

-

-            // Generate a dummy report, the coordinator expects a report but doesn't care what it is.

-            return channel.CreateTextMessage("Dummy Run, Ok.");

-        }

-

-        public void OnMessage(IMessage message)

-        {

-            log.Debug("public void onMessage(Message message = " + message + "): called");

-

-            // Ignore any messages.

-        }

-    }

-}

diff --git a/qpid/dotnet/Qpid.Client.Tests/interop/TestCases/TestCase2BasicP2P.cs b/qpid/dotnet/Qpid.Client.Tests/interop/TestCases/TestCase2BasicP2P.cs
deleted file mode 100644
index bc4501dea4..0000000000
--- a/qpid/dotnet/Qpid.Client.Tests/interop/TestCases/TestCase2BasicP2P.cs
+++ /dev/null
@@ -1,185 +0,0 @@
-using System;

-using System.Text;

-using log4net;

-using Apache.Qpid.Messaging;

-

-namespace Apache.Qpid.Client.Tests.interop.TestCases

-{

-    /// <summary>

-    /// Implements test case 2, basic P2P. Sends/receives a specified number of messages to a specified route on the

-    /// default direct exchange. Produces reports on the actual number of messages sent/received.

-    ///

-    /// <p><table id="crc"><caption>CRC Card</caption>

-    /// <tr><th> Responsibilities <th> Collaborations

-    /// <tr><td> Supply the name of the test case that this implements.

-    /// <tr><td> Accept/Reject invites based on test parameters.

-    /// <tr><td> Adapt to assigned roles.

-    /// <tr><td> Send required number of test messages.

-    /// <tr><td> Generate test reports.

-    /// </table>

-    /// </summary>

-    public class TestCase2BasicP2P : InteropClientTestCase

-    {

-        /// <summary> Used for debugging. </summary>

-        private static ILog log = LogManager.GetLogger(typeof(TestCase2BasicP2P));

-

-        /// <summary> Holds the count of test messages received. </summary>

-        private int messageCount;

-

-        /// <summary> The role to be played by the test. </summary>

-        private Roles role;

-

-        /// <summary> The number of test messages to send. </summary>

-        private int numMessages;

-

-        /// <summary> The routing key to send them to on the default direct exchange. </summary>

-        private string sendDestination;

-

-        /// <summary> The connection to send the test messages on. </summary>

-        private IConnection connection;

-

-        /// <summary> The session to send the test messages on. </summary>

-        private IChannel channel;

-

-        /// <summary> The producer to send the test messages with. </summary>

-        private IMessagePublisher publisher;

-

-        /// <summary>

-        /// Should provide the name of the test case that this class implements. The exact names are defined in the

-        /// interop testing spec.

-        /// </summary>

-        ///

-        /// <returns> The name of the test case that this implements. </returns>

-        public String GetName()

-        {

-            log.Debug("public String GetName(): called");

-    

-            return "TC2_BasicP2P";

-        }

-

-        /// <summary>

-        /// Determines whether the test invite that matched this test case is acceptable.

-        /// </summary>

-        /// 

-        /// <param name="inviteMessage"> The invitation to accept or reject. </param>

-        ///

-        /// <returns> <tt>true</tt> to accept the invitation, <tt>false</tt> to reject it. </returns>

-        public bool AcceptInvite(IMessage inviteMessage) 

-        {

-            log.Debug("public boolean AcceptInvite(Message inviteMessage = " + inviteMessage + "): called");

-

-            // All invites are acceptable.

-            return true;

-        }

-

-        /// <summary>

-        /// Assigns the role to be played by this test case. The test parameters are fully specified in the

-        /// assignment message. When this method return the test case will be ready to execute.

-        /// </summary>

-        ///

-        /// <param name="role">              The role to be played; sender or receiver. </param>

-        /// <param name="assignRoleMessage"> The role assingment message, contains the full test parameters. </param>

-        public void AssignRole(Roles role, IMessage assignRoleMessage) 

-        {

-            log.Debug("public void AssignRole(Roles role = " + role + ", Message assignRoleMessage = " + assignRoleMessage

-                + "): called");

-    

-            // Reset the message count for a new test.

-            messageCount = 0;

-

-            // Take note of the role to be played.

-            this.role = role;

-

-            // Create a new connection to pass the test messages on.

-            connection =

-                TestClient.CreateConnection(TestClient.brokerUrl, TestClient.virtualHost);

-            channel = connection.CreateChannel(false, AcknowledgeMode.AutoAcknowledge);

-

-            // Extract and retain the test parameters.

-            numMessages = assignRoleMessage.Headers.GetInt("P2P_NUM_MESSAGES");

-            string queueAndKeyName = assignRoleMessage.Headers.GetString("P2P_QUEUE_AND_KEY_NAME");

-            channel.DeclareQueue(queueAndKeyName, false, true, true);

-            channel.Bind(queueAndKeyName, ExchangeNameDefaults.DIRECT, queueAndKeyName);

-            sendDestination = queueAndKeyName;

-

-            log.Debug("numMessages = " + numMessages);

-            log.Debug("sendDestination = " + sendDestination);

-            log.Debug("role = " + role);

-

-            switch (role)

-            {

-            // Check if the sender role is being assigned, and set up a message producer if so.

-            case Roles.SENDER:

-                publisher = channel.CreatePublisherBuilder()

-                .WithExchangeName(ExchangeNameDefaults.DIRECT)

-                .WithRoutingKey(sendDestination)

-                .Create();

-                break;

-

-            // Otherwise the receiver role is being assigned, so set this up to listen for messages.

-            case Roles.RECEIVER:

-                IMessageConsumer consumer = channel.CreateConsumerBuilder(sendDestination).Create();

-                consumer.OnMessage += new MessageReceivedDelegate(OnMessage);

-

-                break;

-            }

-

-            connection.Start();

-        }

-

-        /// <summary> Performs the test case actions. </summary>

-        public void Start()

-        {

-            log.Debug("public void start(): called");

-

-            // Check that the sender role is being performed.

-            if (role == Roles.SENDER)

-            {

-                IMessage testMessage = channel.CreateTextMessage("test");

-

-                for (int i = 0; i < numMessages; i++)

-                {

-                    publisher.Send(testMessage);

-

-                    // Increment the message count.

-                    messageCount++;

-                }

-            }

-        }

-

-        /// <summary>

-        /// Gets a report on the actions performed by the test case in its assigned role.

-        /// </summary>

-        ///

-        /// <param name="session"> The session to create the report message in. </param>

-        ///

-        /// <returns> The report message. </returns>

-        public IMessage GetReport(IChannel channel)

-        {

-            log.Debug("public Message GetReport(IChannel channel): called");

-

-            // Close the test connection.

-            connection.Stop();

-

-            // Generate a report message containing the count of the number of messages passed.

-            IMessage report = channel.CreateMessage();

-            report.Headers.SetString("CONTROL_TYPE", "REPORT");

-            report.Headers.SetInt("MESSAGE_COUNT", messageCount);

-

-            return report;

-        }

-

-        /// <summary>

-        /// Counts incoming test messages.

-        /// </summary>

-        ///

-        /// <param name="message"> The incoming test message. </param>

-        public void OnMessage(IMessage message)

-        {

-            log.Debug("public void OnMessage(IMessage message = " + message + "): called");

-

-            // Increment the message count.

-            messageCount++;

-        }

-    }

-}

diff --git a/qpid/dotnet/Qpid.Client.Tests/interop/TestCases/TestCase3BasicPubSub.cs b/qpid/dotnet/Qpid.Client.Tests/interop/TestCases/TestCase3BasicPubSub.cs
deleted file mode 100644
index 4e3dd6e53e..0000000000
--- a/qpid/dotnet/Qpid.Client.Tests/interop/TestCases/TestCase3BasicPubSub.cs
+++ /dev/null
@@ -1,214 +0,0 @@
-using System;

-using System.Text;

-using log4net;

-using Apache.Qpid.Messaging;

-

-namespace Apache.Qpid.Client.Tests.interop.TestCases

-{

-    /// <summary>

-    /// Implements test case 3, basic pub/sub. Sends/received a specified number of messages to a specified route on the

-    /// default topic exchange, using the specified number of receiver connections. Produces reports on the actual number of

-    /// messages sent/received.

-    ///

-    /// <p><table id="crc"><caption>CRC Card</caption>

-    /// <tr><th> Responsibilities <th> Collaborations

-    /// <tr><td> Supply the name of the test case that this implements.

-    /// <tr><td> Accept/Reject invites based on test parameters.

-    /// <tr><td> Adapt to assigned roles.

-    /// <tr><td> Send required number of test messages using pub/sub.

-    /// <tr><td> Generate test reports.

-    /// </table>

-    /// </summary>

-    public class TestCase3BasicPubSub : InteropClientTestCase

-    {

-        /// <summary> Used for debugging. </summary>

-        private static ILog log = LogManager.GetLogger(typeof(TestCase3BasicPubSub));

-    

-        /// <summary> Holds the count of test messages received. </summary>

-        private int messageCount;

-

-        /// <summary> The role to be played by the test. </summary>

-        private Roles role;

-

-        /// <summary> The number of test messages to send. </summary>

-        private int numMessages;

-

-        /// <summary> The number of receiver connection to use. </summary>

-        private int numReceivers;

-

-        /// <summary> The routing key to send them to on the default direct exchange. </summary>

-        private string sendDestination;

-

-        /// <summary> The connections to send/receive the test messages on. </summary>

-        private IConnection[] connection;

-

-        /// <summary> The sessions to send/receive the test messages on. </summary>

-        private IChannel[] channel;

-

-        /// <summary> The producer to send the test messages with. </summary>

-        IMessagePublisher publisher;

-

-        /// <summary>

-        /// Should provide the name of the test case that this class implements. The exact names are defined in the

-        /// interop testing spec.

-        /// </summary>

-        ///

-        /// <returns> The name of the test case that this implements. </returns>

-        public String GetName()

-        {

-            log.Debug("public String GetName(): called");

-    

-            return "TC3_BasicPubSub";

-        }

-    

-        /// <summary>

-        /// Determines whether the test invite that matched this test case is acceptable.

-        /// </summary>

-        ///

-        /// <param name="inviteMessage"> The invitation to accept or reject. </param>

-        ///

-        /// <returns> <tt>true</tt> to accept the invitation, <tt>false</tt> to reject it. </returns>

-        public bool AcceptInvite(IMessage inviteMessage) 

-        {

-            log.Debug("public boolean AcceptInvite(IMessage inviteMessage = " + inviteMessage + "): called");

-    

-            // All invites are acceptable.

-            return true;

-        }

-    

-        /// <summary>

-        /// Assigns the role to be played by this test case. The test parameters are fully specified in the

-        /// assignment message. When this method return the test case will be ready to execute.

-        /// </summary>

-        ///

-        /// <param name="role">              The role to be played; sender or receiver. </param>

-        /// <param name="assignRoleMessage"> The role assingment message, contains the full test parameters. </param>

-        public void AssignRole(Roles role, IMessage assignRoleMessage) 

-        {

-            log.Debug("public void assignRole(Roles role = " + role + ", IMessage assignRoleMessage = " + assignRoleMessage

-                + "): called");

-    

-            // Reset the message count for a new test.

-            messageCount = 0;

-    

-            // Take note of the role to be played.

-            this.role = role;

-    

-            // Extract and retain the test parameters.

-            numMessages = assignRoleMessage.Headers.GetInt("PUBSUB_NUM_MESSAGES");

-            numReceivers = assignRoleMessage.Headers.GetInt("PUBSUB_NUM_RECEIVERS");

-            string sendKey = assignRoleMessage.Headers.GetString("PUBSUB_KEY");

-            sendDestination = sendKey;

-    

-            log.Debug("numMessages = " + numMessages);

-            log.Debug("numReceivers = " + numReceivers);

-            log.Debug("sendKey = " + sendKey);

-            log.Debug("role = " + role);

-    

-            switch (role)

-            {

-            // Check if the sender role is being assigned, and set up a single message producer if so.

-            case Roles.SENDER:

-                // Create a new connection to pass the test messages on.

-                connection = new IConnection[1];

-                channel = new IChannel[1];

-    

-                connection[0] =

-                    TestClient.CreateConnection(TestClient.brokerUrl, TestClient.virtualHost);

-                channel[0] = connection[0].CreateChannel(false, AcknowledgeMode.AutoAcknowledge);

-    

-                // Extract and retain the test parameters.

-                publisher = channel[0].CreatePublisherBuilder()

-                    .WithExchangeName(ExchangeNameDefaults.TOPIC)

-                    .WithRoutingKey(sendDestination)

-                    .Create();

-                break;

-    

-            // Otherwise the receiver role is being assigned, so set this up to listen for messages on the required number

-            // of receiver connections.

-            case Roles.RECEIVER:

-                // Create the required number of receiver connections.

-                connection = new IConnection[numReceivers];

-                channel = new IChannel[numReceivers];

-    

-                for (int i = 0; i < numReceivers; i++)

-                {

-                    connection[i] =

-                        TestClient.CreateConnection(TestClient.brokerUrl, TestClient.virtualHost);

-                    channel[i] = connection[i].CreateChannel(false, AcknowledgeMode.AutoAcknowledge);

-

-                    IMessageConsumer consumer = channel[i].CreateConsumerBuilder(sendDestination).Create();

-                    consumer.OnMessage += new MessageReceivedDelegate(OnMessage);

-                }

-    

-                break;

-            }

-    

-            // Start all the connection dispatcher threads running.

-            foreach (IConnection con in connection)

-            {

-                con.Start();

-            }

-        }

-    

-        /// <summary>

-        /// Performs the test case actions.

-        /// </summary>

-        public void Start() 

-        {

-            log.Debug("public void Start(): called");

-    

-            // Check that the sender role is being performed.

-            if (role == Roles.SENDER)

-            {

-                IMessage testMessage = channel[0].CreateTextMessage("test");

-    

-                for (int i = 0; i < numMessages; i++)

-                {

-                    publisher.Send(testMessage);

-    

-                    // Increment the message count.

-                    messageCount++;

-                }

-            }

-        }

-    

-        /// <summary>

-        /// Gets a report on the actions performed by the test case in its assigned role.

-        /// </summary>

-        ///

-        /// <param name="session"> The session to create the report message in. </param>

-        ///

-        /// <returns> The report message. </returns>

-        public IMessage GetReport(IChannel channel) 

-        {

-            log.Debug("public IMessage getReport(IChannel channel): called");

-    

-            // Close the test connections.

-            foreach (IConnection con in connection)

-            {

-                con.Stop();

-            }

-    

-            // Generate a report message containing the count of the number of messages passed.

-            IMessage report = channel.CreateMessage();

-            report.Headers.SetString("CONTROL_TYPE", "REPORT");

-            report.Headers.SetInt("MESSAGE_COUNT", messageCount);

-    

-            return report;

-        }

-    

-        /// <summary>

-        /// Counts incoming test messages.

-        /// </summary>

-        ///

-        /// <param name="message"> The incoming test message. </param>

-        public void OnMessage(IMessage message)

-        {

-            log.Debug("public void onMessage(IMessage message = " + message + "): called");

-    

-            // Increment the message count.

-            messageCount++;

-        }

-    }

-}

diff --git a/qpid/dotnet/Qpid.Client.Tests/interop/TestClient.cs b/qpid/dotnet/Qpid.Client.Tests/interop/TestClient.cs
deleted file mode 100644
index b15f7fbda9..0000000000
--- a/qpid/dotnet/Qpid.Client.Tests/interop/TestClient.cs
+++ /dev/null
@@ -1,340 +0,0 @@
-using System;

-using System.Collections;

-using System.Text;

-using Apache.Qpid.Messaging;

-using Apache.Qpid.Client.Qms;

-using log4net;

-using Apache.Qpid.Client.Tests.interop.TestCases;

-

-namespace Apache.Qpid.Client.Tests.interop

-{

-    /// <summary>

-    /// Implements a test client as described in the interop testing spec

-    /// (http://cwiki.apache.org/confluence/display/qpid/Interop+Testing+Specification). A test client is an agent that

-    /// reacts to control message sequences send by the test coordinator.

-    ///

-    /// <p/><table><caption>Messages Handled by TestClient</caption>

-    /// <tr><th> Message               <th> Action

-    /// <tr><td> Invite(compulsory)    <td> Reply with Enlist.

-    /// <tr><td> Invite(test case)     <td> Reply with Enlist if test case available.

-    /// <tr><td> AssignRole(test case) <td> Reply with Accept Role if matches an enlisted test. Keep test parameters.

-    /// <tr><td> Start                 <td> Send test messages defined by test parameters. Send report on messages sent.

-    /// <tr><td> Status Request        <td> Send report on messages received.

-    /// </table>

-    ///

-    /// <p><table id="crc"><caption>CRC Card</caption>

-    /// <tr><th> Responsibilities <th> Collaborations

-    /// <tr><td> Handle all incoming control messages. <td> {@link InteropClientTestCase}

-    /// <tr><td> Configure and look up test cases by name. <td> {@link InteropClientTestCase}

-    /// </table>

-    /// </summary>

-    class TestClient

-    {

-        private static ILog log = LogManager.GetLogger(typeof(TestClient));

-

-        /// <summary> Defines the default broker for the tests, localhost, default port. </summary>

-        public static string DEFAULT_BROKER_URL = "amqp://guest:guest@clientid/?brokerlist='tcp://localhost:5672'";

-

-        /// <summary> Defines the default virtual host to use for the tests, none. </summary>

-        public static string DEFAULT_VIRTUAL_HOST = "";

-

-        /// <summary> Defines the default identifying name of this test client. </summary>

-        public static string DEFAULT_CLIENT_NAME = ".net";

-

-        /// <summary> Holds the URL of the broker to run the tests on. </summary>

-        public static string brokerUrl;

-

-        /// <summary> Holds the virtual host to run the tests on. If <tt>null</tt>, then the default virtual host is used. </summary>

-        public static string virtualHost;

-

-        /// <summary> The clients identifying name to print in test results and to distinguish from other clients. </summary>

-        private string clientName;

-

-        /// <summary> Holds all the test cases. </summary>

-        private IDictionary testCases = new Hashtable();

-

-        InteropClientTestCase currentTestCase;

-

-        private MessagePublisherBuilder publisherBuilder;

-

-        private IChannel channel;

-

-

-        /// <summary>

-        /// Creates a new interop test client, listenting to the specified broker and virtual host, with the specified

-        /// client identifying name.

-        /// </summary>

-        ///

-        /// <param name="brokerUrl"> The url of the broker to connect to. </param>

-        /// <param name="virtualHost"> The virtual host to conect to. </param>

-        /// <param name="clientName">  The client name to use. </param>

-        public TestClient(string brokerUrl, string virtualHost, string clientName)

-        {

-            log.Debug("public TestClient(string brokerUrl = " + brokerUrl + ", string virtualHost = " + virtualHost

-                + ", string clientName = " + clientName + "): called");

-

-            // Retain the connection parameters.

-            TestClient.brokerUrl = brokerUrl;

-            TestClient.virtualHost = virtualHost;

-            this.clientName = clientName;

-        }

-

-    

-        /// <summary>

-        /// The entry point for the interop test coordinator. This client accepts the following command line arguments:

-        /// </summary>

-        /// 

-        /// <p/><table>

-        /// <tr><td> -b         <td> The broker URL.       <td> Optional.

-        /// <tr><td> -h         <td> The virtual host.     <td> Optional.

-        /// <tr><td> -n         <td> The test client name. <td> Optional.

-        /// <tr><td> name=value <td> Trailing argument define name/value pairs. Added to system properties. <td> Optional.

-        /// </table>

-        ///

-        /// <param name="args"> The command line arguments. </param>

-        public static void Main(string[] args)

-        {

-            // Extract the command line options (Not exactly Posix but it will do for now...).

-            string brokerUrl = DEFAULT_BROKER_URL;

-            string virtualHost = DEFAULT_VIRTUAL_HOST;

-            string clientName = DEFAULT_CLIENT_NAME;

-

-            foreach (string nextArg in args)

-            {

-                if (nextArg.StartsWith("-b"))

-                {

-                    brokerUrl = nextArg.Substring(2);

-                }

-                else if (nextArg.StartsWith("-h"))

-                {

-                    virtualHost = nextArg.Substring(2);

-                }

-                else if (nextArg.StartsWith("-n"))

-                {

-                    clientName = nextArg.Substring(2);

-                }

-            }

-

-            // Create a test client and start it running.

-            TestClient client = new TestClient(brokerUrl, virtualHost, clientName);

-

-            try

-            {

-                client.Start();

-            }

-            catch (Exception e)

-            {

-                log.Error("The test client was unable to start.", e);

-                System.Environment.Exit(1);

-            }

-        }

-

-        /// <summary>

-        /// Starts the interop test client running. This causes it to start listening for incoming test invites.

-        /// </summary>

-        private void Start()

-        {

-            log.Debug("private void Start(): called");

-

-            // Use a class path scanner to find all the interop test case implementations.

-            ArrayList testCaseClasses = new ArrayList();

-

-            // ClasspathScanner.getMatches(InteropClientTestCase.class, "^TestCase.*", true);

-            // Hard code the test classes till the classpath scanner is fixed.

-            testCaseClasses.Add(typeof(TestCase1DummyRun));

-            testCaseClasses.Add(typeof(TestCase2BasicP2P));

-            testCaseClasses.Add(typeof(TestCase3BasicPubSub));

-

-            // Create all the test case implementations and index them by the test names.

-            foreach (Type testClass in testCaseClasses)

-            {

-                InteropClientTestCase testCase = (InteropClientTestCase)Activator.CreateInstance(testClass);

-                testCases.Add(testCase.GetName(), testCase);

-            }

-

-            // Open a connection to communicate with the coordinator on.

-            IConnection connection = CreateConnection(brokerUrl, virtualHost);

-

-            channel = connection.CreateChannel(false, AcknowledgeMode.AutoAcknowledge);

-

-            // Set this up to listen for control messages.

-            string responseQueueName = channel.GenerateUniqueName();

-            channel.DeclareQueue(responseQueueName, false, true, true);

-

-            channel.Bind(responseQueueName, ExchangeNameDefaults.DIRECT, "iop.control." + clientName);

-            channel.Bind(responseQueueName, ExchangeNameDefaults.DIRECT, "iop.control");

-

-            IMessageConsumer consumer = channel.CreateConsumerBuilder(responseQueueName)

-                .Create();

-            consumer.OnMessage += new MessageReceivedDelegate(OnMessage);

-

-            // Create a publisher to send replies with.

-            publisherBuilder = channel.CreatePublisherBuilder()

-                .WithExchangeName(ExchangeNameDefaults.DIRECT);

-                

-

-            // Start listening for incoming control messages.

-            connection.Start();

-            Console.WriteLine("Test client " + clientName + " ready to receive test control messages...");

-        }

-

-        /// <summary>

-        /// Establishes an AMQ connection. This is a simple convenience method for code that does not anticipate handling connection failures. 

-        /// All exceptions that indicate that the connection has failed, are allowed to fall through.

-        /// </summary>

-        ///

-        /// <param name="brokerUrl">   The broker url to connect to, <tt>null</tt> to use the default from the properties. </param>

-        /// <param name="virtualHost"> The virtual host to connectio to, <tt>null</tt> to use the default. </param>

-        ///

-        /// <returns> A JMS conneciton. </returns>

-        public static IConnection CreateConnection(string brokerUrl, string virtualHost)

-        {

-            log.Debug("public static Connection createConnection(string brokerUrl = " + brokerUrl + ", string virtualHost = " 

-                + virtualHost + "): called");

-

-            // Create a connection to the broker.

-            IConnectionInfo connectionInfo = QpidConnectionInfo.FromUrl(brokerUrl);

-            connectionInfo.VirtualHost = virtualHost;

-            IConnection connection = new AMQConnection(connectionInfo);

-

-            return connection;

-        }

-        

-        /// <summary>

-        /// Handles all incoming control messages.

-        /// </summary>

-        ///

-        /// <param name="message"> The incoming message. </param>

-        public void OnMessage(IMessage message)

-        {

-            log.Debug("public void OnMessage(IMessage message = " + message + "): called");

-

-            try

-            {

-                string controlType = message.Headers.GetString("CONTROL_TYPE");

-                string testName = message.Headers.GetString("TEST_NAME");

-

-                // Check if the message is a test invite.

-                if ("INVITE" == controlType)

-                {

-                    string testCaseName = message.Headers.GetString("TEST_NAME");

-

-                    // Flag used to indicate that an enlist should be sent. Only enlist to compulsory invites or invites

-                    // for which test cases exist.

-                    bool enlist = false;

-

-                    if (testCaseName != null)

-                    {

-                        log.Debug("Got an invite to test: " + testCaseName);

-

-                        // Check if the requested test case is available.

-                        InteropClientTestCase testCase = (InteropClientTestCase)testCases[testCaseName];

-    

-                        if (testCase != null)

-                        {

-                            // Make the requested test case the current test case.

-                            currentTestCase = testCase;

-                            enlist = true;

-                        }

-                    }

-                    else

-                    {

-                        log.Debug("Got a compulsory invite.");

-

-                        enlist = true;

-                    }

-

-                    if (enlist)

-                    {

-                        // Reply with the client name in an Enlist message.

-                        IMessage enlistMessage = channel.CreateMessage();

-                        enlistMessage.Headers.SetString("CONTROL_TYPE", "ENLIST");

-                        enlistMessage.Headers.SetString("CLIENT_NAME", clientName);

-                        enlistMessage.Headers.SetString("CLIENT_PRIVATE_CONTROL_KEY", "iop.control." + clientName);

-                        enlistMessage.CorrelationId = message.CorrelationId;

-

-                        Send(enlistMessage, message.ReplyToRoutingKey);

-                    }

-                }

-                else if ("ASSIGN_ROLE" == controlType)

-                {

-                    // Assign the role to the current test case.

-                    string roleName = message.Headers.GetString("ROLE");

-    

-                    log.Debug("Got a role assignment to role: " + roleName);

-    

-                    Roles role;

-

-                    if (roleName == "SENDER")

-                    {

-                        role = Roles.SENDER;

-                    }

-                    else

-                    {

-                        role = Roles.RECEIVER;

-                    }

-    

-                    currentTestCase.AssignRole(role, message);

-

-                    // Reply by accepting the role in an Accept Role message.

-                    IMessage acceptRoleMessage = channel.CreateMessage();

-                    acceptRoleMessage.Headers.SetString("CONTROL_TYPE", "ACCEPT_ROLE");

-                    acceptRoleMessage.CorrelationId = message.CorrelationId;

-

-                    Send(acceptRoleMessage, message.ReplyToRoutingKey);

-                }

-                else if ("START" == controlType || "STATUS_REQUEST" == controlType)

-                {

-                    if ("START" == controlType)

-                    {

-                        log.Debug("Got a start notification.");

-

-                        // Start the current test case.

-                        currentTestCase.Start();

-                    }

-                    else

-                    {

-                        log.Debug("Got a status request.");

-                    }

-

-                    // Generate the report from the test case and reply with it as a Report message.

-                    IMessage reportMessage = currentTestCase.GetReport(channel);

-                    reportMessage.Headers.SetString("CONTROL_TYPE", "REPORT");

-                    reportMessage.CorrelationId = message.CorrelationId;

-

-                    Send(reportMessage, message.ReplyToRoutingKey);

-                }

-                else if ("TERMINATE" == controlType)

-                {

-                    Console.WriteLine("Received termination instruction from coordinator.");

-

-                    // Is a cleaner shutdown needed?

-                    System.Environment.Exit(1);

-                }

-                else

-                {

-                    // Log a warning about this but otherwise ignore it.

-                    log.Warn("Got an unknown control message, controlType = " + controlType + ", message = " + message);

-                }

-            }

-            catch (QpidException e)

-            {

-                // Log a warning about this, but otherwise ignore it.

-                log.Warn("A QpidException occurred whilst handling a message.");

-                log.Debug("Got QpidException whilst handling message: " + message, e);

-            }

-        }

-

-        /// <summary>

-        /// Send the specified message using the specified routing key on the direct exchange.

-        /// </summary>

-        /// 

-        /// <param name="message">    The message to send.</param>

-        /// <param name="routingKey"> The routing key to send the message with.</param>

-        public void Send(IMessage message, string routingKey)

-        {

-            IMessagePublisher publisher = publisherBuilder.WithRoutingKey(routingKey).Create();

-            publisher.Send(message);

-        }

-    }

-}

diff --git a/qpid/dotnet/Qpid.Client.Tests/interop/TopicListener.cs b/qpid/dotnet/Qpid.Client.Tests/interop/TopicListener.cs
deleted file mode 100644
index 13141d52b8..0000000000
--- a/qpid/dotnet/Qpid.Client.Tests/interop/TopicListener.cs
+++ /dev/null
@@ -1,211 +0,0 @@
-/*

- *

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- *

- */

-using System;

-using log4net;

-using Apache.Qpid.Messaging;

-using Apache.Qpid.Client.Qms;

-

-namespace Apache.Qpid.Client.Tests.interop

-{

-    public class TopicListener

-    {

-        private static ILog log = LogManager.GetLogger(typeof(TopicListener));

-

-        /// <summary> The default AMQ connection URL to use for tests. </summary>

-        const string DEFAULT_URI = "amqp://guest:guest@default/test?brokerlist='tcp://localhost:5672'";

-

-        /// <summary> Holds the routing key for the topic to receive test messages on. </summary>

-        public static string CONTROL_ROUTING_KEY = "topic_control";

-

-        /// <summary> Holds the routing key for the queue to send reports to. </summary>

-        public static string RESPONSE_ROUTING_KEY = "response";

-

-        /// <summary> Holds the connection to listen on. </summary>

-        private IConnection connection;

-

-        /// <summary> Holds the channel for all test messages.</summary>

-        private IChannel channel;

-

-        /// <summary> Holds the producer to send report messages on. </summary>

-        private IMessagePublisher publisher;

-

-        /// <summary> Holds a flag to indicate that a timer has begun on the first message. Reset when report is sent. </summary> */

-        private bool init;

-    

-        /// <summary> Holds the count of messages received by this listener. </summary> */

-        private int count;

-

-        /// <summary> Creates a topic listener using the specified broker URL. </summary>

-        /// 

-        /// <param name="connectionUri">The broker URL to listen on.</param>

-        TopicListener(string connectionUri)

-        {

-            log.Debug("TopicListener(string connectionUri = " + connectionUri + "): called");

-

-            // Create a connection to the broker.

-            IConnectionInfo connectionInfo = QpidConnectionInfo.FromUrl(connectionUri);

-            connection = new AMQConnection(connectionInfo);

-

-            // Establish a session on the broker.

-            channel = connection.CreateChannel(false, AcknowledgeMode.AutoAcknowledge, 1);

-            

-            // Set up a queue to listen for test messages on.

-            string topicQueueName = channel.GenerateUniqueName();

-            channel.DeclareQueue(topicQueueName, false, true, true);

-

-            // Set this listener up to listen for incoming messages on the test topic queue.

-            channel.Bind(topicQueueName, ExchangeNameDefaults.TOPIC, CONTROL_ROUTING_KEY);

-            IMessageConsumer consumer = channel.CreateConsumerBuilder(topicQueueName)

-                .Create();

-            consumer.OnMessage += new MessageReceivedDelegate(OnMessage);

-

-            // Set up this listener with a producer to send the reports on.

-            publisher = channel.CreatePublisherBuilder()

-                .WithExchangeName(ExchangeNameDefaults.DIRECT)

-                .WithRoutingKey(RESPONSE_ROUTING_KEY)

-                .Create();

-

-            connection.Start();

-            Console.WriteLine("Waiting for messages...");

-        }

-

-        public static void Main(String[] argv)

-        {

-            // Create an instance of this listener with the command line parameters.

-            new TopicListener(DEFAULT_URI);

-        }

-

-        /// <summary> 

-        /// Handles all message received by this listener. Test messages are counted, report messages result in a report being sent and

-        /// shutdown messages result in this listener being terminated.

-        /// </summary>

-        /// 

-        /// <param name="message">The received message.</param>

-        public void OnMessage(IMessage message)

-        {

-            log.Debug("public void onMessage(Message message = " + message + "): called");

-

-            // Take the start time of the first message if this is the first message.

-            if (!init)

-            {

-                count = 0;

-                init = true;

-            }

-

-            // Check if the message is a control message telling this listener to shut down.

-            if (IsShutdown(message))

-            {

-                log.Debug("Got a shutdown message.");

-                Shutdown();

-            }

-            // Check if the message is a report request message asking this listener to respond with the message count.

-            else if (IsReport(message))

-            {

-                log.Debug("Got a report request message.");

-

-                // Send the message count report.

-                SendReport();

-

-                // Reset the initialization flag so that the next message is considered to be the first.

-                init = false;

-            }

-            // Otherwise it is an ordinary test message, so increment the message count.

-            else

-            {

-                count++;

-            }

-        }

-        

-        /// <summary> Checks a message to see if it is a shutdown control message. </summary>

-        /// 

-        /// <param name="m">The message to check.</param>

-        /// 

-        /// <returns><tt>true</tt> if it is a shutdown control message, <tt>false</tt> otherwise.</returns>

-        private bool IsShutdown(IMessage m) 

-        {

-            bool result = CheckTextField(m, "TYPE", "TERMINATION_REQUEST");

-

-            //log.Debug("isShutdown = " + result);

-

-            return result;

-        }

-

-        /// <summary> Checks a message to see if it is a report request control message. </summary>

-        /// 

-        /// <param name="m">The message to check.</param>

-        /// 

-        /// <returns><tt>true</tt> if it is a report request control message, <tt>false</tt> otherwise.</returns>

-        private bool IsReport(IMessage m) 

-        {

-            bool result = CheckTextField(m, "TYPE", "REPORT_REQUEST");

-

-            //log.Debug("isReport = " + result);

-

-            return result;

-        }

-

-        /// <summary> Checks whether or not a text field on a message has the specified value. </summary>

-        /// 

-        /// <param name="e">The message to check.</param>

-        /// <param name="e">The name of the field to check.</param>

-        /// <param name="e">The expected value of the field to compare with.</param>

-        /// 

-        /// <returns> <tt>true</tt>If the specified field has the specified value, <tt>fals</tt> otherwise. </returns>

-        private static bool CheckTextField(IMessage m, string fieldName, string value)

-        {

-            /*log.Debug("private static boolean checkTextField(Message m = " + m + ", String fieldName = " + fieldName

-                      + ", String value = " + value + "): called");*/

-

-            string comp = m.Headers.GetString(fieldName);

-

-            return (comp != null) && comp == value;

-        }

-

-        /// <summary> Stops the message consumer and closes the connection. </summary>

-        private void Shutdown()

-        {

-            connection.Stop();

-            channel.Dispose();

-            connection.Dispose();

-        }

-

-        /// <summary> Sends the report message to the response location. </summary>

-        private void SendReport()

-        {

-            string report = "Received " + count + ".";

-

-            IMessage reportMessage = channel.CreateTextMessage(report);

-

-            reportMessage.Headers.SetBoolean("BOOLEAN", false);

-            //reportMessage.Headers.SetByte("BYTE", 5);

-            reportMessage.Headers.SetDouble("DOUBLE", 3.141);

-            reportMessage.Headers.SetFloat("FLOAT", 1.0f);

-            reportMessage.Headers.SetInt("INT", 1);

-            reportMessage.Headers.SetLong("LONG", 1);

-            reportMessage.Headers.SetString("STRING", "hello");

-            reportMessage.Headers.SetShort("SHORT", 2);

-

-            publisher.Send(reportMessage);

-

-            Console.WriteLine("Sent report: " + report);

-        }

-    }

-}

diff --git a/qpid/dotnet/Qpid.Client.Tests/interop/TopicPublisher.cs b/qpid/dotnet/Qpid.Client.Tests/interop/TopicPublisher.cs
deleted file mode 100644
index ef5d39f0bc..0000000000
--- a/qpid/dotnet/Qpid.Client.Tests/interop/TopicPublisher.cs
+++ /dev/null
@@ -1,188 +0,0 @@
-using System;

-using System.Threading;

-using log4net;

-using Apache.Qpid.Messaging;

-using Apache.Qpid.Client.Qms;

-

-namespace Apache.Qpid.Client.Tests.interop

-{

-    public class TopicPublisher

-    {

-        private static ILog log = LogManager.GetLogger(typeof(TopicPublisher));

-

-        /// <summary> The default AMQ connection URL to use for tests. </summary>

-        const string DEFAULT_URI = "amqp://guest:guest@default/test?brokerlist='tcp://localhost:5672'";

-

-        /// <summary> Holds the default test timeout for broker communications before tests give up. </summary>

-        const int TIMEOUT = 10000;

-

-        /// <summary> Holds the routing key for the topic to receive test messages on. </summary>

-        const string CONTROL_ROUTING_KEY = "topic_control";

-

-        /// <summary> Holds the routing key for the queue to send reports to. </summary>

-        const string RESPONSE_ROUTING_KEY = "response";

-

-        /// <summary> Holds the number of messages to send in each test run. </summary>

-        private int numMessages;

-

-        /// <summary> Holds the number of subscribers listening to the messsages. </summary>

-        private int numSubscribers;

-

-        /// <summary> A monitor used to wait for all reports to arrive back from consumers on. </summary>

-        private AutoResetEvent allReportsReceivedEvt = new AutoResetEvent(false);

-

-        /// <summary> Holds the connection to listen on. </summary>

-        private IConnection connection;

-

-        /// <summary> Holds the channel for all test messages.</summary>

-        private IChannel channel;

-

-        /// <summary> Holds the producer to send test messages on. </summary>

-        private IMessagePublisher publisher;

-

-        /// <summary>

-        /// Creates a topic publisher that will send the specifed number of messages and expect the specifed number of report back from test

-        /// subscribers.

-        /// </summary>

-        /// 

-        /// <param name="connectionUri">The broker URL.</param>

-        /// <param name="numMessages">The number of messages to send in each test.</param>

-        /// <param name="numSubscribers">The number of subscribes that are expected to reply with a report.</param>

-        TopicPublisher(string connectionUri, int numMessages, int numSubscribers)

-        {

-            log.Debug("TopicPublisher(string connectionUri = " + connectionUri + ", int numMessages = "+ numMessages + 

-                      ", int numSubscribers = " + numSubscribers + "): called");

-

-            // Create a connection to the broker.

-            IConnectionInfo connectionInfo = QpidConnectionInfo.FromUrl(connectionUri);

-            connection = new AMQConnection(connectionInfo);

-

-            // Establish a session on the broker.

-            channel = connection.CreateChannel(false, AcknowledgeMode.AutoAcknowledge, 1);

-

-            // Set up a queue to listen for reports on.

-            string responseQueueName = channel.GenerateUniqueName();

-            channel.DeclareQueue(responseQueueName, false, true, true);

-            

-            // Set this listener up to listen for reports on the response queue.

-            channel.Bind(responseQueueName, ExchangeNameDefaults.DIRECT, RESPONSE_ROUTING_KEY);

-            //channel.Bind(responseQueueName, "<<default>>", RESPONSE_ROUTING_KEY);

-            IMessageConsumer consumer = channel.CreateConsumerBuilder(responseQueueName)               

-                .Create();

-            consumer.OnMessage += new MessageReceivedDelegate(OnMessage);

-

-            // Set up this listener with a producer to send the test messages and report requests on.

-            publisher = channel.CreatePublisherBuilder()

-                .WithExchangeName(ExchangeNameDefaults.TOPIC)

-                .WithRoutingKey(CONTROL_ROUTING_KEY)

-                .Create();

-

-            // Keep the test parameters.

-            this.numMessages = numMessages;

-            this.numSubscribers = numSubscribers;

-

-            connection.Start();

-            Console.WriteLine("Sending messages and waiting for reports...");

-        }

-

-        /// <summary>

-        /// Start a test subscriber. The broker URL must be specified as the first command line argument.

-        /// </summary>

-        /// 

-        /// <param name="argv">The command line arguments, broker URL first.</param>

-        public static void Main(String[] argv)

-        {

-            // Create an instance of this publisher with the command line parameters.

-            TopicPublisher publisher = new TopicPublisher(DEFAULT_URI, 1, 1);

-

-            // Publish the test messages.

-            publisher.DoTest();

-        }

-

-        /// <summary>

-        /// Sends the test messages and waits for all subscribers to reply with a report.

-        /// </summary>

-        public void DoTest()

-        {

-            log.Debug("public void DoTest(): called");

-

-            // Create a test message to send.

-            IMessage testMessage = channel.CreateTextMessage("test");

-

-            // Send the desired number of test messages.

-            for (int i = 0; i < numMessages; i++)

-            {

-                publisher.Send(testMessage);

-            }

-

-            log.Debug("Sent " + numMessages + " test messages.");

-

-            // Send the report request.

-            IMessage reportRequestMessage = channel.CreateTextMessage("Report request message.");

-            reportRequestMessage.Headers["TYPE"] = "REPORT_REQUEST";

-            

-            reportRequestMessage.Headers.SetBoolean("BOOLEAN", false);

-            //reportRequestMessage.Headers.SetByte("BYTE", 5);

-            reportRequestMessage.Headers.SetDouble("DOUBLE", 3.141);

-            reportRequestMessage.Headers.SetFloat("FLOAT", 1.0f);

-            reportRequestMessage.Headers.SetInt("INT", 1);

-            reportRequestMessage.Headers.SetLong("LONG", 1);

-            reportRequestMessage.Headers.SetString("STRING", "hello");

-            reportRequestMessage.Headers.SetShort("SHORT", 2);

-

-            publisher.Send(reportRequestMessage);

-

-            log.Debug("Sent the report request message, waiting for all replies...");

-

-            // Wait until all the reports come in.

-            allReportsReceivedEvt.WaitOne(TIMEOUT, true);

-

-            // Check if all reports were really received or if the timeout occurred.

-            if (numSubscribers == 0)

-            {

-                log.Debug("Got all reports.");

-            }

-            else

-            {

-                log.Debug("Waiting for reports timed out, still waiting for " + numSubscribers + ".");

-            }

-

-            // Send the termination request.

-            IMessage terminationRequestMessage = channel.CreateTextMessage("Termination request message.");

-            terminationRequestMessage.Headers["TYPE"] =  "TERMINATION_REQUEST";

-            publisher.Send(terminationRequestMessage);

-

-            log.Debug("Sent the termination request message.");

-

-            // Close all message producers and consumers and the connection to the broker.

-            Shutdown();

-        }

-

-        /// <summary>

-        /// Handles all report messages from subscribers. This decrements the count of subscribers that are still to reply, until this becomes

-        /// zero, at which time waiting threads are notified of this event.

-        /// </summary>

-        /// 

-        /// <param name="message">The received report message.</param>

-        public void OnMessage(IMessage message)

-        {

-            log.Debug("public void OnMessage(IMessage message = " + message + "): called");

-

-            // Decrement the count of expected messages and release the wait monitor when this becomes zero.

-            if (--numSubscribers == 0)

-            {

-                log.Debug("Got reports from all subscribers.");

-                allReportsReceivedEvt.Set();

-            }

-        }

-

-        /// <summary> Stops the message consumers and closes the connection. </summary>

-        private void Shutdown()

-        {

-            connection.Stop();

-            publisher.Dispose();

-            channel.Dispose();

-            connection.Dispose();

-        }

-    }

-}

diff --git a/qpid/dotnet/Qpid.Client.Tests/lib/nunit/nunit-licence.txt b/qpid/dotnet/Qpid.Client.Tests/lib/nunit/nunit-licence.txt
deleted file mode 100644
index b2316295d3..0000000000
--- a/qpid/dotnet/Qpid.Client.Tests/lib/nunit/nunit-licence.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-Copyright © 2002-2004 James W. Newkirk, Michael C. Two, Alexei A. Vorontsov, 
-                      Charlie Poole
-Copyright © 2000-2004 Philip A. Craig
-
-This software is provided 'as-is', without any express or implied warranty. In
-no event will the authors be held liable for any damages arising from the use
-of this software.
-
-Permission is granted to anyone to use this software for any purpose, including
-commercial applications, and to alter it and redistribute it freely, subject to
-the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not claim
-   that you wrote the original software. If you use this software in a product, an
-   acknowledgment (see the following) in the product documentation is required.
-
-   Portions Copyright © 2002 James W. Newkirk, Michael C. Two, Alexei A. Vorontsov
-   or Copyright © 2000-2002 Philip A. Craig
-
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-
-3. This notice may not be removed or altered from any source distribution.
diff --git a/qpid/dotnet/Qpid.Client.Tests/lib/nunit/nunit.framework.dll b/qpid/dotnet/Qpid.Client.Tests/lib/nunit/nunit.framework.dll
deleted file mode 100644
index 53666e74c9..0000000000
--- a/qpid/dotnet/Qpid.Client.Tests/lib/nunit/nunit.framework.dll
+++ /dev/null
diff --git a/qpid/dotnet/Qpid.Client.Tests/log4net.config b/qpid/dotnet/Qpid.Client.Tests/log4net.config
deleted file mode 100644
index 4346e0eaeb..0000000000
--- a/qpid/dotnet/Qpid.Client.Tests/log4net.config
+++ /dev/null
@@ -1,62 +0,0 @@
-<log4net>
-  <appender name="console" type="log4net.Appender.ConsoleAppender" >
-    <layout type="log4net.Layout.PatternLayout">
-      <conversionPattern value="%d [%t] %-5p %c:%M(%L) - %m%n" />
-    </layout>
-    <threshold value="info"/>
-  </appender>
-
-  <appender name="filelog" type="log4net.Appender.FileAppender">
-    <file value="qpid_client.log"/>
-    <appendToFile value="false"/>
-    <layout type="log4net.Layout.PatternLayout">
-      <conversionPattern value="%d [%t] %-5p %c:%M(%L) - %m%n" />
-    </layout>
-  </appender>
-
-  <appender name="protocolLog" type="log4net.Appender.FileAppender">
-    <file value="protocol.log"/>
-    <appendToFile value="false"/>
-    <layout type="log4net.Layout.PatternLayout">
-      <conversionPattern value="%date - %message%newline"/>
-    </layout>
-  </appender>
-
-  <appender name="ioLog" type="log4net.Appender.FileAppender">
-    <file value="io.log"/>
-    <appendToFile value="false"/>
-    <layout type="log4net.Layout.PatternLayout">
-      <conversionPattern value="%date - %message%newline"/>
-    </layout>
-    <threshold value="info"/>
-  </appender>
-
-  <appender name="UdpAppender" type="log4net.Appender.UdpAppender">
-    <remoteAddress value="127.0.0.1" />
-    <remotePort value="4445" />
-    <layout type="log4net.Layout.XmlLayoutSchemaLog4j">
-      <locationInfo value="true" />
-    </layout>
-    <threshold value="debug"/>
-  </appender>
-
-  <logger name="Qpid.Client.ProtocolChannel.Tracing" additivity="false">
-    <level value="info"/>
-    <appender-ref ref="protocolLog"/>
-  </logger>
-
-  <logger name="Qpid.Client.ByteChannel.Tracing" additivity="false">
-    <level value="info" />
-    <appender-ref ref="ioLog"/>
-  </logger>
-   <logger name="Qpid.Framing.FieldTable" additivity="false">
-      <level value="debug" />
-      <appender-ref ref="console"/>
-   </logger>
-
-   <root>
-    <appender-ref ref="console"/>
-    <appender-ref ref="UdpAppender"/>
-	  <appender-ref ref="filelog"/>
-  </root>
-</log4net>
\ No newline at end of file
diff --git a/qpid/dotnet/Qpid.Client.Tests/requestreply1/ServiceProvidingClient.cs b/qpid/dotnet/Qpid.Client.Tests/requestreply1/ServiceProvidingClient.cs
deleted file mode 100644
index cbc93ae2fe..0000000000
--- a/qpid/dotnet/Qpid.Client.Tests/requestreply1/ServiceProvidingClient.cs
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using System;
-using System.Threading;
-using log4net;
-using NUnit.Framework;
-using Apache.Qpid.Messaging;
-
-namespace Apache.Qpid.Client.Tests
-{
-    [TestFixture]
-    public class ServiceProvidingClient : BaseMessagingTestFixture
-    {
-        private static ILog _logger = LogManager.GetLogger(typeof(ServiceProvidingClient));
-
-        private int _messageCount;
-
-        private string _replyToExchangeName;
-        private string _replyToRoutingKey;
-        const int PACK = 100;
-
-        private IMessagePublisher _destinationPublisher;
-        private IMessageConsumer _consumer;
-
-        private string _serviceName = "ServiceQ1";
-
-        private string _selector = null;
-
-        [SetUp]
-        public override void Init()
-        {            
-            base.Init();
-
-            _logger.Info("Starting...");
-            _logger.Info("Service (queue) name is '" + _serviceName + "'...");
-
-            _connection.ExceptionListener = new ExceptionListenerDelegate(OnConnectionException);
-
-            _logger.Info("Message selector is <" + _selector + ">...");
-            
-            _channel.DeclareQueue(_serviceName, false, false, false);
-
-            _consumer = _channel.CreateConsumerBuilder(_serviceName)
-                .WithPrefetchLow(100)
-                .WithPrefetchHigh(500)
-                .WithNoLocal(true)
-                .Create();
-            _consumer.OnMessage = new MessageReceivedDelegate(OnMessage);
-        }
-
-        public override void Shutdown()
-        {
-           _consumer.Dispose();
-           base.Shutdown();
-        }
-
-        private void OnConnectionException(Exception e)
-        {
-            _logger.Info("Connection exception occurred", e);
-            // XXX: Test still doesn't shutdown when broker terminates. Is there no heartbeat?
-        }
-
-        [Test]
-        public void Test()
-        {
-            _connection.Start();
-            _logger.Info("Waiting...");
-
-            ServiceRequestingClient client = new ServiceRequestingClient();
-            client.Init();
-            client.SendMessages();
-        }
-
-        private void OnMessage(IMessage message)
-        {
-//            _logger.Info("Got message '" + message + "'");
-
-            ITextMessage tm = (ITextMessage)message;
-
-            try
-            {
-                string replyToExchangeName = tm.ReplyToExchangeName;
-                string replyToRoutingKey = tm.ReplyToRoutingKey;
-
-                _replyToExchangeName = replyToExchangeName;
-                _replyToRoutingKey = replyToRoutingKey;
-                _logger.Debug("About to create a producer");
-
-//                Console.WriteLine("ReplyTo.ExchangeName = " + _replyToExchangeName);
-//                Console.WriteLine("ReplyTo.RoutingKey = " + _replyToRoutingKey);
-
-                _destinationPublisher = _channel.CreatePublisherBuilder()
-                    .WithExchangeName(_replyToExchangeName)
-                    .WithRoutingKey(_replyToRoutingKey)
-                    .WithDeliveryMode(DeliveryMode.NonPersistent)
-                    .Create();
-                _destinationPublisher.DisableMessageTimestamp = true;
-                _logger.Debug("After create a producer");
-            }
-            catch (QpidException e)
-            {
-                _logger.Error("Error creating destination", e);
-                throw e;
-            }
-            _messageCount++;
-            if (_messageCount % PACK == 0)
-            {
-                _logger.Info("Received message total: " + _messageCount);
-                _logger.Info(string.Format("Sending response to '{0}:{1}'", 
-                                           _replyToExchangeName, _replyToRoutingKey));
-            }
-
-            try
-            {
-               String payload = "This is a response: sing together: 'Mahnah mahnah...'" + tm.Text;
-               ITextMessage msg = _channel.CreateTextMessage(payload);
-               if ( tm.Headers.Contains("timeSent") )
-               {
-                  msg.Headers["timeSent"] = tm.Headers["timeSent"];
-               }
-               _destinationPublisher.Send(msg);
-            } catch ( QpidException e )
-            {
-               _logger.Error("Error sending message: " + e, e);
-               throw e;
-            } finally
-            {
-               _destinationPublisher.Dispose();
-            }
-        }               
-    }
-}
diff --git a/qpid/dotnet/Qpid.Client.Tests/requestreply1/ServiceRequestingClient.cs b/qpid/dotnet/Qpid.Client.Tests/requestreply1/ServiceRequestingClient.cs
deleted file mode 100644
index f35fb2dac9..0000000000
--- a/qpid/dotnet/Qpid.Client.Tests/requestreply1/ServiceRequestingClient.cs
+++ /dev/null
@@ -1,182 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using System;
-using System.Threading;
-using log4net;
-using NUnit.Framework;
-using Apache.Qpid.Messaging;
-
-namespace Apache.Qpid.Client.Tests
-{
-    public class ServiceRequestingClient : BaseMessagingTestFixture
-    {
-        private const int MESSAGE_SIZE = 1024;
-        private static string MESSAGE_DATA = new string('x', MESSAGE_SIZE);
-
-        private const int PACK = 100;
-        private const int NUM_MESSAGES = PACK*10; // increase when in standalone
-
-        private static ILog _log = LogManager.GetLogger(typeof(ServiceRequestingClient));
-
-        ManualResetEvent _finishedEvent = new ManualResetEvent(false);
-        
-        private int _expectedMessageCount = NUM_MESSAGES;
-
-        private long _startTime = 0;        
-        
-        private string _commandQueueName = "ServiceQ1";
-        
-        private IMessagePublisher _publisher;
-
-        Avergager averager = new Avergager();
-        
-        private void InitialiseProducer()
-        {
-            try
-            {
-                _publisher = _channel.CreatePublisherBuilder()
-                    .WithRoutingKey(_commandQueueName)
-                    .WithDeliveryMode(DeliveryMode.NonPersistent)
-                    .Create();
-                _publisher.DisableMessageTimestamp = true; // XXX: need a "with" for this in builder?
-            }
-            catch (QpidException e)
-            {
-                _log.Error("Error: " + e, e);
-            }
-        }
-        
-        [Test]
-        public void SendMessages()
-        {
-            InitialiseProducer();
-
-            string replyQueueName = _channel.GenerateUniqueName();
-            
-            _channel.DeclareQueue(replyQueueName, false, true, true);
-
-            IMessageConsumer messageConsumer = _channel.CreateConsumerBuilder(replyQueueName)
-                .WithPrefetchLow(100)
-                .WithPrefetchHigh(200)
-                .WithNoLocal(true)
-                .WithExclusive(true).Create();
- 
-            _startTime = DateTime.Now.Ticks;
-
-            messageConsumer.OnMessage = new MessageReceivedDelegate(OnMessage);
-            _connection.Start();
-            for (int i = 0; i < _expectedMessageCount; i++)
-            {
-                ITextMessage msg;
-                try
-                {
-                    msg = _channel.CreateTextMessage(MESSAGE_DATA + i);
-                }
-                catch (Exception e)
-                {
-                    _log.Error("Error creating message: " + e, e);
-                    break;
-                }
-                msg.ReplyToRoutingKey = replyQueueName;
-
-                // Added timestamp.
-                long timeNow = DateTime.Now.Ticks;
-                string timeSentString = String.Format("{0:G}", timeNow);
-                msg.Headers.SetLong("timeSent", timeNow);
-                
-                 _publisher.Send(msg);
-            }
-
-            // Assert that the test finishes within a reasonable amount of time.
-            const int waitSeconds = 40;
-            const int waitMilliseconds = waitSeconds * 1000;
-            _log.Info("Finished sending " + _expectedMessageCount + " messages");
-            _log.Info(String.Format("Waiting {0} seconds to receive last message...", waitSeconds));
-            Assert.IsTrue(_finishedEvent.WaitOne(waitMilliseconds, false), 
-                          String.Format("Expected to finish in {0} seconds", waitSeconds));
-        }
-
-        public void OnMessage(IMessage m)
-        {
-            if (_log.IsDebugEnabled)
-            {
-                _log.Debug("Message received: " + m);
-            }
-
-            if (!m.Headers.Contains("timeSent"))
-            {
-                throw new Exception("Set timeSent!");
-            }
-
-            long sentAt = m.Headers.GetLong("timeSent");
-            long now = DateTime.Now.Ticks;
-            long latencyTicks = now - sentAt;
-            long latencyMilliseconds = latencyTicks / TimeSpan.TicksPerMillisecond;
-
-            averager.Add(latencyMilliseconds);
-
-            if (averager.Num % PACK == 0)
-            {
-                _log.Info("Ticks per millisecond = " + TimeSpan.TicksPerMillisecond);
-                _log.Info(String.Format("Average latency (ms) = {0}", averager));
-                _log.Info("Received message count: " + averager.Num);
-            }
-
-            if (averager.Num == _expectedMessageCount)
-            {
-                _log.Info(String.Format("Final average latency (ms) = {0}", averager));
-
-                double timeTakenSeconds = (DateTime.Now.Ticks - _startTime) * 1.0 / (TimeSpan.TicksPerMillisecond * 1000);
-                _log.Info("Total time taken to receive " + _expectedMessageCount + " messages was " +
-                          timeTakenSeconds + "s, equivalent to " +
-                          (_expectedMessageCount/timeTakenSeconds) + " messages per second");
-
-                _finishedEvent.Set(); // Notify main thread to quit.
-            }
-        }
-    }
-    
-    class Avergager
-    {
-        long num = 0;
-        long sum = 0;
-
-        long min = long.MaxValue;
-        long max = long.MinValue;
-        
-        public void Add(long item)
-        {
-            ++num;
-            sum += item;
-            if (item < min) min = item;
-            if (item > max) max = item;
-        }
-        
-        public long Average { get { return sum/num; }}
-
-        public long Num { get { return num;  } }
-        
-        public override string ToString()
-        {
-            return String.Format("average={0} min={1} max={2}", Average, min, max);
-        }
-    }
-}
diff --git a/qpid/dotnet/Qpid.Client.Tests/undeliverable/UndeliverableTest.cs b/qpid/dotnet/Qpid.Client.Tests/undeliverable/UndeliverableTest.cs
deleted file mode 100644
index bcf57e586e..0000000000
--- a/qpid/dotnet/Qpid.Client.Tests/undeliverable/UndeliverableTest.cs
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using System;
-using System.Threading;
-using log4net;
-using NUnit.Framework;
-using Apache.Qpid.Messaging;
-
-namespace Apache.Qpid.Client.Tests
-{
-   /// <summary>
-   /// Tests that when sending undeliverable messages with the 
-   /// mandatory flag set, an exception is raised on the connection
-   /// as the message is bounced back by the broker
-   /// </summary>
-   [TestFixture]
-   public class UndeliverableTest : BaseMessagingTestFixture
-   {
-      private static ILog _logger = LogManager.GetLogger(typeof(UndeliverableTest));
-      private ManualResetEvent _event;
-      public const int TIMEOUT = 1000;
-      private Exception _lastException;
-
-      [SetUp]
-      public override void Init()
-      {
-         base.Init();
-         _event = new ManualResetEvent(false);
-         _lastException = null;
-
-         try
-         {
-            _connection.ExceptionListener = new ExceptionListenerDelegate(OnException);
-         } catch ( QpidException e )
-         {
-            _logger.Error("Could not add ExceptionListener", e);
-         }
-      }
-
-      public void OnException(Exception e)
-      {
-         // Here we dig out the AMQUndelivered exception (if present) in order to log the returned message.
-
-         _lastException = e;
-         _logger.Error("OnException handler received connection-level exception", e);
-         if ( e is QpidException )
-         {
-            QpidException qe = (QpidException)e;
-            if ( qe.InnerException is AMQUndeliveredException )
-            {
-               AMQUndeliveredException ue = (AMQUndeliveredException)qe.InnerException;
-               _logger.Error("inner exception is AMQUndeliveredException", ue);
-               _logger.Error(string.Format("Returned message = {0}", ue.GetUndeliveredMessage()));
-            }
-         }
-         _event.Set();
-      }
-
-      [Test]
-      public void SendUndeliverableMessageOnDefaultExchange()
-      {
-         SendOne("default exchange", null);
-      }
-      [Test]
-      public void SendUndeliverableMessageOnDirectExchange()
-      {
-         SendOne("direct exchange", ExchangeNameDefaults.DIRECT);
-      }
-      [Test]
-      public void SendUndeliverableMessageOnTopicExchange()
-      {
-         SendOne("topic exchange", ExchangeNameDefaults.TOPIC);
-      }
-      [Test]
-      public void SendUndeliverableMessageOnHeadersExchange()
-      {
-         SendOne("headers exchange", ExchangeNameDefaults.HEADERS);
-      }
-
-      private void SendOne(string exchangeNameFriendly, string exchangeName)
-      {
-         _logger.Info("Sending undeliverable message to " + exchangeNameFriendly);
-
-         // Send a test message to a non-existant queue 
-         // on the specified exchange. See if message is returned!
-         MessagePublisherBuilder builder = _channel.CreatePublisherBuilder()
-             .WithRoutingKey("Non-existant route key!")
-             .WithMandatory(true); // necessary so that the server bounces the message back
-         if ( exchangeName != null )
-         {
-            builder.WithExchangeName(exchangeName);
-         }
-         IMessagePublisher publisher = builder.Create();
-         publisher.Send(_channel.CreateTextMessage("Hiya!"));
-
-         // check we received an exception on the connection
-         // and that it is of the right type
-         _event.WaitOne(TIMEOUT, true);
-
-         Type expectedException = typeof(AMQUndeliveredException);
-         Exception ex = _lastException;
-         Assert.IsNotNull(ex, "No exception was thrown by the test. Expected " + expectedException);
-
-         if ( ex.InnerException != null )
-            ex = ex.InnerException;
-
-         Assert.IsInstanceOfType(expectedException, ex);
-      }
-   }
-}
diff --git a/qpid/dotnet/Qpid.Client.Tests/url/ConnectionUrlTest.cs b/qpid/dotnet/Qpid.Client.Tests/url/ConnectionUrlTest.cs
deleted file mode 100644
index 3c9f8dd4e2..0000000000
--- a/qpid/dotnet/Qpid.Client.Tests/url/ConnectionUrlTest.cs
+++ /dev/null
@@ -1,446 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using System;
-using System.Net;
-using NUnit.Framework;
-using Apache.Qpid.Client.Qms;
-
-namespace Apache.Qpid.Client.Tests.url
-{
-    [TestFixture]
-    public class connectionUrlTests
-    {
-        [Test]
-        public void FailoverURL()
-        {
-            //String url = "amqp://ritchiem:bob@/temp?brokerlist='tcp://localhost:5672;tcp://fancyserver:3000/',failover='roundrobin'";
-            String url = "amqp://ritchiem:bob@default/temp?brokerlist='tcp://localhost:5672;tcp://fancyserver:3000/',failover='roundrobin'";
-
-            IConnectionInfo connectionurl = QpidConnectionInfo.FromUrl(url);
-
-            Assert.AreEqual("roundrobin", connectionurl.FailoverMethod);
-            Assert.IsTrue(connectionurl.Username.Equals("ritchiem"));
-            Assert.IsTrue(connectionurl.Password.Equals("bob"));
-            Assert.IsTrue(connectionurl.VirtualHost.Equals("/temp"));
-
-            Assert.IsTrue(connectionurl.BrokerCount == 2);
-
-            IBrokerInfo service = connectionurl.GetBrokerInfo(0);
-
-            Assert.IsTrue(service.Transport.Equals("tcp"));
-            Assert.IsTrue(service.Host.Equals("localhost"));
-            Assert.IsTrue(service.Port == 5672);
-
-            service = connectionurl.GetBrokerInfo(1);
-
-            Assert.IsTrue(service.Transport.Equals("tcp"));
-            Assert.IsTrue(service.Host.Equals("fancyserver"));
-            Assert.IsTrue(service.Port == 3000);
-
-        }
-
-        [Test]
-        public void SingleTransportUsernamePasswordURL()
-        {
-            String url = "amqp://ritchiem:bob@default/temp?brokerlist='tcp://localhost:5672'";
-
-            IConnectionInfo connectionurl = QpidConnectionInfo.FromUrl(url);
-
-            Assert.IsTrue(connectionurl.FailoverMethod == null);
-            Assert.IsTrue(connectionurl.Username.Equals("ritchiem"));
-            Assert.IsTrue(connectionurl.Password.Equals("bob"));
-            Assert.IsTrue(connectionurl.VirtualHost.Equals("/temp"));
-
-            Assert.IsTrue(connectionurl.BrokerCount == 1);
-
-            IBrokerInfo service = connectionurl.GetBrokerInfo(0);
-
-            Assert.IsTrue(service.Transport.Equals("tcp"));
-            Assert.IsTrue(service.Host.Equals("localhost"));
-            Assert.IsTrue(service.Port == 5672);
-        }
-
-        [Test]
-        public void SingleTransportUsernameBlankPasswordURL()
-        {
-            String url = "amqp://ritchiem:@default/temp?brokerlist='tcp://localhost:5672'";
-
-            IConnectionInfo connectionurl = QpidConnectionInfo.FromUrl(url);
-
-            Assert.IsTrue(connectionurl.FailoverMethod == null);
-            Assert.IsTrue(connectionurl.Username.Equals("ritchiem"));
-            Assert.IsTrue(connectionurl.Password.Equals(""));
-            Assert.IsTrue(connectionurl.VirtualHost.Equals("/temp"));
-
-            Assert.IsTrue(connectionurl.BrokerCount == 1);
-
-            IBrokerInfo service = connectionurl.GetBrokerInfo(0);
-
-            Assert.IsTrue(service.Transport.Equals("tcp"));
-            Assert.IsTrue(service.Host.Equals("localhost"));
-            Assert.IsTrue(service.Port == 5672);
-        }
-
-        [Test]
-        public void FailedURLNullPassword()
-        {
-            String url = "amqp://ritchiem@default/temp?brokerlist='tcp://localhost:5672'";
-
-            try
-            {
-                QpidConnectionInfo.FromUrl(url);
-                Assert.Fail("URL has null password");
-            }
-            catch (UrlSyntaxException e)
-            {
-                Assert.AreEqual("Null password in user information not allowed.", e.Message);
-                Assert.IsTrue(e.GetIndex() == 7);
-            }
-        }
-
-        [Test]
-        public void SingleTransportURL()
-        {
-            String url = "amqp://guest:guest@default/test?brokerlist='tcp://localhost:5672'";
-
-            IConnectionInfo connectionurl = QpidConnectionInfo.FromUrl(url);
-
-
-            Assert.IsTrue(connectionurl.FailoverMethod == null);
-            Assert.IsTrue(connectionurl.Username.Equals("guest"));
-            Assert.IsTrue(connectionurl.Password.Equals("guest"));
-            Assert.IsTrue(connectionurl.VirtualHost.Equals("/test"));
-
-
-            Assert.IsTrue(connectionurl.BrokerCount == 1);
-
-
-            IBrokerInfo service = connectionurl.GetBrokerInfo(0);
-
-            Assert.IsTrue(service.Transport.Equals("tcp"));
-            Assert.IsTrue(service.Host.Equals("localhost"));
-            Assert.IsTrue(service.Port == 5672);
-        }
-
-        [Test]
-        public void SingleTransportWithClientURLURL()
-        {
-            String url = "amqp://guest:guest@clientname/temp?brokerlist='tcp://localhost:5672'";
-
-            IConnectionInfo connectionurl = QpidConnectionInfo.FromUrl(url);
-
-
-            Assert.IsTrue(connectionurl.FailoverMethod == null);
-            Assert.IsTrue(connectionurl.Username.Equals("guest"));
-            Assert.IsTrue(connectionurl.Password.Equals("guest"));
-            Assert.IsTrue(connectionurl.VirtualHost.Equals("/temp"));
-            Assert.IsTrue(connectionurl.ClientName.Equals("clientname"));
-
-
-            Assert.IsTrue(connectionurl.BrokerCount == 1);
-
-
-            IBrokerInfo service = connectionurl.GetBrokerInfo(0);
-
-            Assert.IsTrue(service.Transport.Equals("tcp"));
-            Assert.IsTrue(service.Host.Equals("localhost"));
-            Assert.IsTrue(service.Port == 5672);
-        }
-
-        [Test]
-        public void SingleTransport1OptionURL()
-        {
-            String url = "amqp://guest:guest@default/temp?brokerlist='tcp://localhost:5672',routingkey='jim'";
-
-            IConnectionInfo connectionurl = QpidConnectionInfo.FromUrl(url);
-
-            Assert.IsTrue(connectionurl.FailoverMethod == null);
-            Assert.IsTrue(connectionurl.Username.Equals("guest"));
-            Assert.IsTrue(connectionurl.Password.Equals("guest"));
-            Assert.IsTrue(connectionurl.VirtualHost.Equals("/temp"));
-
-
-            Assert.IsTrue(connectionurl.BrokerCount == 1);
-
-            IBrokerInfo service = connectionurl.GetBrokerInfo(0);
-
-            Assert.IsTrue(service.Transport.Equals("tcp"));
-
-            Assert.IsTrue(service.Host.Equals("localhost"));
-            Assert.IsTrue(service.Port == 5672);
-            Assert.IsTrue(connectionurl.GetOption("routingkey").Equals("jim"));
-        }
-
-        [Test]
-        public void SingleTransportDefaultedBroker()
-        {
-            String url = "amqp://guest:guest@default/temp?brokerlist='localhost:'";
-
-            IConnectionInfo connectionurl = QpidConnectionInfo.FromUrl(url);
-
-            Assert.IsTrue(connectionurl.FailoverMethod == null);
-            Assert.IsTrue(connectionurl.Username.Equals("guest"));
-            Assert.IsTrue(connectionurl.Password.Equals("guest"));
-            Assert.IsTrue(connectionurl.VirtualHost.Equals("/temp"));
-
-
-            Assert.IsTrue(connectionurl.BrokerCount == 1);
-
-            IBrokerInfo service = connectionurl.GetBrokerInfo(0);
-
-            Assert.IsTrue(service.Transport.Equals("tcp"));
-
-            Assert.IsTrue(service.Host.Equals("localhost"));
-            Assert.IsTrue(service.Port == 5672);
-        }
-
-        [Test]
-        public void SingleTransportMultiOptionURL()
-        {
-            String url = "amqp://guest:guest@default/temp?brokerlist='tcp://localhost:5672',routingkey='jim',timeout='200',immediatedelivery='true'";
-
-            IConnectionInfo connectionurl = QpidConnectionInfo.FromUrl(url);
-
-            Assert.IsTrue(connectionurl.FailoverMethod == null);
-            Assert.IsTrue(connectionurl.Username.Equals("guest"));
-            Assert.IsTrue(connectionurl.Password.Equals("guest"));
-            Assert.IsTrue(connectionurl.VirtualHost.Equals("/temp"));
-
-            Assert.IsTrue(connectionurl.BrokerCount == 1);
-
-            IBrokerInfo service = connectionurl.GetBrokerInfo(0);
-
-            Assert.IsTrue(service.Transport.Equals("tcp"));
-
-            Assert.IsTrue(service.Host.Equals("localhost"));
-            Assert.IsTrue(service.Port == 5672);
-
-            Assert.IsTrue(connectionurl.GetOption("routingkey").Equals("jim"));
-            Assert.IsTrue(connectionurl.GetOption("timeout").Equals("200"));
-            Assert.IsTrue(connectionurl.GetOption("immediatedelivery").Equals("true"));
-        }
-
-        [Test]
-        public void SinglevmURL()
-        {
-            String url = "amqp://guest:guest@default/messages?brokerlist='vm://default:2'";
-
-            IConnectionInfo connectionurl = QpidConnectionInfo.FromUrl(url);
-
-            Assert.IsTrue(connectionurl.FailoverMethod == null);
-            Assert.IsTrue(connectionurl.Username.Equals("guest"));
-            Assert.IsTrue(connectionurl.Password.Equals("guest"));
-            Assert.IsTrue(connectionurl.VirtualHost.Equals("/messages"));
-
-            Assert.IsTrue(connectionurl.BrokerCount == 1);
-
-            IBrokerInfo service = connectionurl.GetBrokerInfo(0);
-
-            Assert.IsTrue(service.Transport.Equals("vm"));
-            Assert.AreEqual("localhost", service.Host);
-            Assert.AreEqual(2, service.Port);
-        }
-
-        [Test]
-        public void FailoverVMURL()
-        {
-            String url = "amqp://ritchiem:bob@default/temp?brokerlist='vm://default:2;vm://default:3',failover='roundrobin'";
-
-            IConnectionInfo connectionurl = QpidConnectionInfo.FromUrl(url);
-
-            Assert.IsTrue(connectionurl.FailoverMethod.Equals("roundrobin"));
-            Assert.IsTrue(connectionurl.Username.Equals("ritchiem"));
-            Assert.IsTrue(connectionurl.Password.Equals("bob"));
-            Assert.IsTrue(connectionurl.VirtualHost.Equals("/temp"));
-
-            Assert.AreEqual(2, connectionurl.BrokerCount);
-
-            IBrokerInfo service = connectionurl.GetBrokerInfo(0);
-
-            Assert.IsTrue(service.Transport.Equals("vm"));
-            Assert.AreEqual("localhost", service.Host);
-            Assert.IsTrue(service.Port == 2);
-
-            service = connectionurl.GetBrokerInfo(1);
-            Assert.IsTrue(service.Transport.Equals("vm"));
-            Assert.AreEqual("localhost", service.Host);
-            Assert.IsTrue(service.Port == 3);
-        }
-
-        [Test]
-        public void NoVirtualHostURL()
-        {
-            String url = "amqp://user@default?brokerlist='tcp://localhost:5672'";
-
-            try
-            {
-                QpidConnectionInfo.FromUrl(url);
-                Assert.Fail("URL has no virtual host should not parse");
-            }
-            catch (UrlSyntaxException)
-            {
-                // This should occur.
-            }
-        }
-
-        [Test]
-        public void NoClientID()
-        {
-            String url = "amqp://user:@default/test?brokerlist='tcp://localhost:5672'";
-
-            IConnectionInfo connectionurl = QpidConnectionInfo.FromUrl(url);
-
-            Assert.IsTrue(connectionurl.Username.Equals("user"));
-            Assert.IsTrue(connectionurl.Password.Equals(""));
-            Assert.IsTrue(connectionurl.VirtualHost.Equals("/test"));
-            Assert.IsTrue(connectionurl.ClientName.StartsWith(Dns.GetHostName()));
-
-            Assert.IsTrue(connectionurl.BrokerCount == 1);
-        }
-
-        [Test]
-        public void WrongOptionSeparatorInOptions()
-        {
-            String url = "amqp://guest:guest@default/test?brokerlist='tcp://localhost:5672;tcp://localhost:5673'+failover='roundrobin'";
-            try
-            {
-                QpidConnectionInfo.FromUrl(url);
-                Assert.Fail("URL Should not parse");
-            }
-            catch (UrlSyntaxException urise)
-            {
-                Assert.IsTrue(urise.Message.Equals("Unterminated option. Possible illegal option separator:'+'"));
-            }
-
-        }
-
-        [Test]
-        public void NoUserDetailsProvidedWithClientID()
-
-        {
-            String url = "amqp://clientID/test?brokerlist='tcp://localhost:5672;tcp://localhost:5673'";
-            try
-            {
-                QpidConnectionInfo.FromUrl(url);
-                Assert.Fail("URL Should not parse");
-            }
-            catch (UrlSyntaxException urise)
-            {
-                Assert.IsTrue(urise.Message.StartsWith("User information not found on url"));
-            }
-
-        }
-
-        [Test]
-        public void NoUserDetailsProvidedNOClientID()
-
-        {
-            String url = "amqp:///test@default?brokerlist='tcp://localhost:5672;tcp://localhost:5673'";
-            try
-            {
-                QpidConnectionInfo.FromUrl(url);
-                Assert.Fail("URL Should not parse");
-            }
-            catch (UrlSyntaxException urise)
-            {
-
-                Assert.IsTrue(urise.Message.StartsWith("User information not found on url"));
-            }
-
-        }
-
-        [Test]
-        public void CheckVirtualHostFormat()
-        {
-            String url = "amqp://guest:guest@default/t.-_+!=:?brokerlist='tcp://localhost:5672'";
-
-            IConnectionInfo connection = QpidConnectionInfo.FromUrl(url);
-            Assert.IsTrue(connection.VirtualHost.Equals("/t.-_+!=:"));
-        }
-
-        [Test]
-        public void CheckDefaultPort()
-        {
-            String url = "amqp://guest:guest@default/test=:?brokerlist='tcp://localhost'";
-
-            IConnectionInfo connection = QpidConnectionInfo.FromUrl(url);
-
-            IBrokerInfo broker = connection.GetBrokerInfo(0);
-            Assert.IsTrue(broker.Port == BrokerInfoConstants.DEFAULT_PORT);
-
-        }
-
-        [Test]
-        public void CheckMissingFinalQuote()
-        {
-            String url = "amqp://guest:guest@id/test" + "?brokerlist='tcp://localhost:5672";
-
-            try
-            {
-                QpidConnectionInfo.FromUrl(url);
-            }
-            catch (UrlSyntaxException e)
-            {
-//                Assert.AreEqual("Unterminated option at index 32: brokerlist='tcp://localhost:5672",
-//                    e.Message);
-                Assert.AreEqual("Unterminated option", e.Message);
-            }
-        }
-
-        [Test]
-        public void ValidateQpidConnectionInfoFromToString()
-        {
-            String url = "amqp://ritchiem:bob@default/temp?brokerlist='tcp://localhost:5672;tcp://fancyserver:3000/',failover='roundrobin'";
-
-            IConnectionInfo connectionInfo = QpidConnectionInfo.FromUrl(url);
-            IConnectionInfo connectionInfo1 = QpidConnectionInfo.FromUrl(connectionInfo.ToString());
-
-            Console.WriteLine(connectionInfo.ToString());
-            Console.WriteLine(connectionInfo1.ToString());
-
-            Assert.AreEqual(connectionInfo.Username, connectionInfo1.Username);
-            Assert.AreEqual(connectionInfo.Password, connectionInfo1.Password);
-            Assert.AreEqual(connectionInfo.VirtualHost, connectionInfo1.VirtualHost);
-
-            Assert.IsTrue((connectionInfo1.GetAllBrokerInfos().Count == 2));
-            Assert.IsTrue(connectionInfo.GetBrokerInfo(0).Equals(connectionInfo1.GetBrokerInfo(0)));
-            Assert.IsTrue(connectionInfo.GetBrokerInfo(1).Equals(connectionInfo1.GetBrokerInfo(1)));
-
-        }
-
-        [Test]
-        public void EnsureVirtualHostStartsWithSlash()
-        {
-           IConnectionInfo connection = new QpidConnectionInfo();
-           connection.VirtualHost = "test";
-           Assert.AreEqual("/test", connection.VirtualHost);
-
-           connection.VirtualHost = "/mytest";
-           Assert.AreEqual("/mytest", connection.VirtualHost);
-
-           connection.VirtualHost = "";
-           Assert.AreEqual("/", connection.VirtualHost);
-
-           connection.VirtualHost = null;
-           Assert.AreEqual("/", connection.VirtualHost);
-        }
-    }
-}
diff --git a/qpid/dotnet/Qpid.Client.Transport.Socket.Blocking/BlockingSocketProcessor.cs b/qpid/dotnet/Qpid.Client.Transport.Socket.Blocking/BlockingSocketProcessor.cs
deleted file mode 100644
index badaa48111..0000000000
--- a/qpid/dotnet/Qpid.Client.Transport.Socket.Blocking/BlockingSocketProcessor.cs
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using System;
-using System.Net;
-using System.Net.Sockets;
-using log4net;
-using Apache.Qpid.Buffer;
-using Apache.Qpid.Client.Protocol;
-
-namespace Apache.Qpid.Client.Transport.Socket.Blocking
-{
-    class BlockingSocketProcessor : IConnectionCloser
-    {
-        private static readonly ILog _log = LogManager.GetLogger(typeof(BlockingSocketProcessor));
-
-        string _host;
-        int _port;
-        System.Net.Sockets.Socket _socket;
-        private NetworkStream _networkStream;
-        IByteChannel _byteChannel;
-        IProtocolListener _protocolListener;
-
-        public BlockingSocketProcessor(string host, int port, IProtocolListener protocolListener)
-        {
-            _host = host;
-            _port = port;
-            _protocolListener = protocolListener;
-            _byteChannel = new ByteChannel(this);
-        }
-
-        /// <summary>
-        ///  Synchronous blocking connect.
-        /// </summary>
-        public void Connect()
-        {
-            _socket = new System.Net.Sockets.Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
-
-            IPHostEntry ipHostInfo = Dns.Resolve(_host); // Note: don't fix this warning. We do this for .NET 1.1 compatibility.
-            IPAddress ipAddress = ipHostInfo.AddressList[0];
-
-            IPEndPoint ipe = new IPEndPoint(ipAddress, _port);
-
-            _socket.Connect(ipe);            
-            _networkStream = new NetworkStream(_socket, true);
-        }
-        
-        public string getLocalEndPoint()
-        {
-            return _socket.LocalEndPoint.ToString();
-        }
-
-        public void Write(ByteBuffer byteBuffer)
-        {            
-            try
-            {
-                _networkStream.Write(byteBuffer.array(), byteBuffer.position(), byteBuffer.limit()); // FIXME
-            }
-            catch (Exception e)
-            {
-                _log.Error("Write caused exception", e);
-                _protocolListener.OnException(e);
-            }
-        }
-
-        public ByteBuffer Read()
-        {
-            const int bufferSize = 4 * 1024; // TODO: Prevent constant allocation of buffers.
-            byte[] bytes = new byte[bufferSize];
-            
-            int numOctets = _networkStream.Read(bytes, 0, bytes.Length);
-
-            ByteBuffer byteBuffer = ByteBuffer.wrap(bytes);
-            byteBuffer.limit(numOctets);
-            
-            byteBuffer.flip();
-
-            return byteBuffer;
-        }
-
-        public void Disconnect()
-        {
-            _networkStream.Flush();
-            _networkStream.Close();
-            _socket.Close();
-        }
-
-        public void Close()
-        {
-            Disconnect();
-        }
-
-        public IByteChannel ByteChannel
-        {
-            get { return _byteChannel; }
-        }
-    }
-}
-
-
diff --git a/qpid/dotnet/Qpid.Client.Transport.Socket.Blocking/BlockingSocketTransport.cs b/qpid/dotnet/Qpid.Client.Transport.Socket.Blocking/BlockingSocketTransport.cs
deleted file mode 100644
index 17f911fb6d..0000000000
--- a/qpid/dotnet/Qpid.Client.Transport.Socket.Blocking/BlockingSocketTransport.cs
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using System;
-using System.Collections;
-using System.Threading;
-using log4net;
-using Apache.Qpid.Client.Protocol;
-using Apache.Qpid.Framing;
-
-namespace Qpid.Client.Transport.Socket.Blocking
-{
-    public class BlockingSocketTransport : ITransport
-    {
-//        static readonly ILog _log = LogManager.GetLogger(typeof(BlockingSocketTransport));
-
-        // Configuration variables.
-        string _host;
-        int _port;
-        IProtocolListener _protocolListener;
-
-        // Runtime variables.
-        private BlockingSocketProcessor _socketProcessor;
-        private AmqpChannel _amqpChannel;
-        
-        private ReaderRunner _readerRunner;
-        private Thread _readerThread;       
-
-        public BlockingSocketTransport(string host, int port, AMQConnection connection)
-        {
-            _host = host;
-            _port = port;
-            _protocolListener = connection.ProtocolListener;
-        }
-        
-        public void Open()
-        {
-            _socketProcessor = new BlockingSocketProcessor(_host, _port, _protocolListener);
-            _socketProcessor.Connect();
-            _amqpChannel = new AmqpChannel(_socketProcessor.ByteChannel);
-            _readerRunner = new ReaderRunner(this);
-            _readerThread = new Thread(new ThreadStart(_readerRunner.Run));  
-            _readerThread.Start();
-        }
-
-        public string getLocalEndPoint()
-        {
-            return _socketProcessor.getLocalEndPoint();
-        }
-
-        public void Close()
-        {
-            StopReaderThread();
-            _socketProcessor.Disconnect();
-        }
-
-        public IProtocolChannel ProtocolChannel { get { return _amqpChannel;  } }
-        public IProtocolWriter ProtocolWriter { get { return _amqpChannel; } }
-
-        public void StopReaderThread()
-        {
-            _readerRunner.Stop();
-        }
-
-        class ReaderRunner
-        {
-            BlockingSocketTransport _transport;
-            bool _running = true;
-
-            public ReaderRunner(BlockingSocketTransport transport)
-            {
-                _transport = transport;
-            }
-
-            public void Run()
-            {
-                try
-                {
-                    while (_running)
-                    {
-                        Queue frames = _transport.ProtocolChannel.Read();
-
-                        foreach (IDataBlock dataBlock in frames)
-                        {
-                            _transport._protocolListener.OnMessage(dataBlock);
-                        }
-                    }
-                }
-                catch (Exception e)
-                {
-                    _transport._protocolListener.OnException(e);
-                }
-            }
-
-            public void Stop()
-            {
-                // TODO: Check if this is thread safe. running is not volitile....
-                _running = false;
-            }
-        }
-    }
-}
-
-
diff --git a/qpid/dotnet/Qpid.Client.Transport.Socket.Blocking/ByteChannel.cs b/qpid/dotnet/Qpid.Client.Transport.Socket.Blocking/ByteChannel.cs
deleted file mode 100644
index 19da2fceb9..0000000000
--- a/qpid/dotnet/Qpid.Client.Transport.Socket.Blocking/ByteChannel.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using System;
-using log4net;
-using Apache.Qpid.Buffer;
-
-namespace Apache.Qpid.Client.Transport.Socket.Blocking
-{
-    class ByteChannel : IByteChannel
-    {
-        // Warning: don't use this log for regular logging.
-        private static readonly ILog _ioTraceLog = LogManager.GetLogger("Qpid.Client.ByteChannel.Tracing");
-
-        BlockingSocketProcessor processor;
-        
-        public ByteChannel(BlockingSocketProcessor processor)
-        {
-            this.processor = processor;
-        }
-
-        public ByteBuffer Read()
-        {
-            ByteBuffer result = processor.Read();
-
-            // TODO: Move into decorator.
-            if (_ioTraceLog.IsDebugEnabled)
-            {
-                _ioTraceLog.Debug(String.Format("READ {0}", result));
-            }
-            
-            return result;
-        }
-
-        public void Write(ByteBuffer buffer)
-        {
-            // TODO: Move into decorator.
-            if (_ioTraceLog.IsDebugEnabled)
-            {
-                _ioTraceLog.Debug(String.Format("WRITE {0}", buffer));
-            }
-            
-            processor.Write(buffer);
-        }
-    }
-}
diff --git a/qpid/dotnet/Qpid.Client.Transport.Socket.Blocking/Properties/AssemblyInfo.cs b/qpid/dotnet/Qpid.Client.Transport.Socket.Blocking/Properties/AssemblyInfo.cs
deleted file mode 100644
index 00f366b5a9..0000000000
--- a/qpid/dotnet/Qpid.Client.Transport.Socket.Blocking/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using System.Reflection;
-using System.Runtime.InteropServices;
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("Apache.Qpid.Transport.Blocking")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Apache Qpid")]
-[assembly: AssemblyProduct("Apache.Qpid.Transport.Blocking")]
-[assembly: AssemblyCopyright("Copyright (c) 2006 The Apache Software Foundation")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("ca23e89c-f5b9-4f7a-929a-4fae00ef055b")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Revision and Build Numbers 
-// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/qpid/dotnet/Qpid.Client.Transport.Socket.Blocking/Qpid.Client.Transport.Socket.Blocking.csproj b/qpid/dotnet/Qpid.Client.Transport.Socket.Blocking/Qpid.Client.Transport.Socket.Blocking.csproj
deleted file mode 100644
index a12b6695e2..0000000000
--- a/qpid/dotnet/Qpid.Client.Transport.Socket.Blocking/Qpid.Client.Transport.Socket.Blocking.csproj
+++ /dev/null
@@ -1,71 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <PropertyGroup>

-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ProductVersion>8.0.50727</ProductVersion>

-    <SchemaVersion>2.0</SchemaVersion>

-    <ProjectGuid>{52AC4940-2077-4104-A753-29A9C8C16957}</ProjectGuid>

-    <OutputType>Library</OutputType>

-    <AppDesignerFolder>Properties</AppDesignerFolder>

-    <RootNamespace>Apache.Qpid.Client.Transport.Socket.Blocking</RootNamespace>

-    <AssemblyName>Apache.Qpid.Client.Transport.Socket.Blocking</AssemblyName>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

-    <DebugSymbols>true</DebugSymbols>

-    <DebugType>full</DebugType>

-    <Optimize>false</Optimize>

-    <OutputPath>bin\Debug\</OutputPath>

-    <DefineConstants>DEBUG;TRACE</DefineConstants>

-    <ErrorReport>prompt</ErrorReport>

-    <WarningLevel>4</WarningLevel>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

-    <DebugType>pdbonly</DebugType>

-    <Optimize>true</Optimize>

-    <OutputPath>bin\Release\</OutputPath>

-    <DefineConstants>TRACE</DefineConstants>

-    <ErrorReport>prompt</ErrorReport>

-    <WarningLevel>4</WarningLevel>

-  </PropertyGroup>

-  <ItemGroup>

-    <Reference Include="log4net, Version=1.2.0.30714, Culture=neutral, PublicKeyToken=500ffcafb14f92df">

-      <SpecificVersion>False</SpecificVersion>

-      <HintPath>..\Qpid.Common\lib\log4net\log4net.dll</HintPath>

-    </Reference>

-    <Reference Include="System" />

-    <Reference Include="System.Data" />

-    <Reference Include="System.Xml" />

-  </ItemGroup>

-  <ItemGroup>

-    <Compile Include="BlockingSocketProcessor.cs" />

-    <Compile Include="BlockingSocketTransport.cs" />

-    <Compile Include="ByteChannel.cs" />

-    <Compile Include="Properties\AssemblyInfo.cs" />

-  </ItemGroup>

-  <ItemGroup>

-    <ProjectReference Include="..\Qpid.Buffer\Qpid.Buffer.csproj">

-      <Project>{44384DF2-B0A4-4580-BDBC-EE4BAA87D995}</Project>

-      <Name>Qpid.Buffer</Name>

-    </ProjectReference>

-    <ProjectReference Include="..\Qpid.Client\Qpid.Client.csproj">

-      <Project>{68987C05-3768-452C-A6FC-6BA1D372852F}</Project>

-      <Name>Qpid.Client</Name>

-    </ProjectReference>

-    <ProjectReference Include="..\Qpid.Common\Qpid.Common.csproj">

-      <Project>{77064C42-24D2-4CEB-9EA2-0EF481A43205}</Project>

-      <Name>Qpid.Common</Name>

-    </ProjectReference>

-    <ProjectReference Include="..\Qpid.Messaging\Qpid.Messaging.csproj">

-      <Project>{6688F826-C58E-4C1B-AA1F-22AFAB4B7D07}</Project>

-      <Name>Qpid.Messaging</Name>

-    </ProjectReference>

-  </ItemGroup>

-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

-       Other similar extension points exist, see Microsoft.Common.targets.

-  <Target Name="BeforeBuild">

-  </Target>

-  <Target Name="AfterBuild">

-  </Target>

-  -->

-</Project>

diff --git a/qpid/dotnet/Qpid.Client.Transport.Socket.Blocking/Qpid.Client.Transport.Socket.Blocking.mdp b/qpid/dotnet/Qpid.Client.Transport.Socket.Blocking/Qpid.Client.Transport.Socket.Blocking.mdp
deleted file mode 100644
index 8f95000a4a..0000000000
--- a/qpid/dotnet/Qpid.Client.Transport.Socket.Blocking/Qpid.Client.Transport.Socket.Blocking.mdp
+++ /dev/null
@@ -1,30 +0,0 @@
-<Project name="Qpid.Client.Transport.Socket.Blocking" fileversion="2.0" language="C#" clr-version="Net_1_1" ctype="DotNetProject">
-  <Configurations active="Debug">
-    <Configuration name="Debug" ctype="DotNetProjectConfiguration">
-      <Output directory="./bin/Debug" assembly="Qpid.Client.Transport.Socket.Blocking" />
-      <Build debugmode="True" target="Library" />
-      <Execution runwithwarnings="True" consolepause="False" runtime="MsNet" clr-version="Net_1_1" />
-      <CodeGeneration compiler="Csc" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
-    </Configuration>
-    <Configuration name="Release" ctype="DotNetProjectConfiguration">
-      <Output directory="./bin/Release" assembly="Qpid.Client.Transport.Socket.Blocking" />
-      <Build debugmode="False" target="Library" />
-      <Execution runwithwarnings="True" consolepause="False" runtime="MsNet" clr-version="Net_1_1" />
-      <CodeGeneration compiler="Csc" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
-    </Configuration>
-  </Configurations>
-  <DeployTargets />
-  <Contents>
-    <File name="./Properties/AssemblyInfo.cs" subtype="Code" buildaction="Compile" />
-    <File name="./BlockingSocketProcessor.cs" subtype="Code" buildaction="Compile" />
-    <File name="./BlockingSocketTransport.cs" subtype="Code" buildaction="Compile" />
-    <File name="./ByteChannel.cs" subtype="Code" buildaction="Compile" />
-  </Contents>
-  <References>
-    <ProjectReference type="Gac" localcopy="True" refto="System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-    <ProjectReference type="Assembly" localcopy="True" refto="../Qpid.Common/lib/log4net/log4net.dll" />
-    <ProjectReference type="Project" localcopy="True" refto="Qpid.Buffer" />
-    <ProjectReference type="Project" localcopy="True" refto="Qpid.Client" />
-    <ProjectReference type="Project" localcopy="True" refto="Qpid.Common" />
-  </References>
-</Project>
\ No newline at end of file
diff --git a/qpid/dotnet/Qpid.Client/Client/AMQAuthenticationException.cs b/qpid/dotnet/Qpid.Client/Client/AMQAuthenticationException.cs
deleted file mode 100644
index 6382eaaf39..0000000000
--- a/qpid/dotnet/Qpid.Client/Client/AMQAuthenticationException.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-/*

- *

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- *

- */

-using System;

-using System.Runtime.Serialization;

-

-namespace Apache.Qpid.Client

-{

-    [Serializable]

-    public class AMQAuthenticationException : AMQException

-    {

-        public AMQAuthenticationException(int error, String message) 

-           : base(error, message)

-        {

-        }

-

-        protected AMQAuthenticationException(SerializationInfo info, StreamingContext ctxt)

-           : base(info, ctxt)

-        {

-        }

-    }

-}

diff --git a/qpid/dotnet/Qpid.Client/Client/AMQConnection.cs b/qpid/dotnet/Qpid.Client/Client/AMQConnection.cs
deleted file mode 100644
index d74cf6b5e4..0000000000
--- a/qpid/dotnet/Qpid.Client/Client/AMQConnection.cs
+++ /dev/null
@@ -1,889 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using System;
-using System.Collections;
-using System.IO;
-using System.Reflection;
-using System.Threading;
-using log4net;
-using Apache.Qpid.Client.Failover;
-using Apache.Qpid.Client.Protocol;
-using Apache.Qpid.Client.Qms;
-using Apache.Qpid.Client.State;
-using Apache.Qpid.Client.Transport;
-using Apache.Qpid.Client.Transport.Socket.Blocking;
-using Apache.Qpid.Collections;
-using Apache.Qpid.Framing;
-using Apache.Qpid.Messaging;
-
-namespace Apache.Qpid.Client
-{
-    public class AMQConnection : Closeable, IConnection
-    {
-        private static readonly ILog _log = LogManager.GetLogger(typeof(AMQConnection));
-        
-        IConnectionInfo _connectionInfo;
-        private int _nextChannelId = 0;
-
-        // _Connected should be refactored with a suitable wait object.
-        private bool _connected;
-
-        Thread _heartBeatThread;
-        HeartBeatThread _heartBeatRunner;
-
-        // The last error code that occured on the connection. Used to return the correct exception to the client
-        private AMQException _lastAMQException = null;
-
-        /**
-         * This is the "root" mutex that must be held when doing anything that could be impacted by failover.
-         * This must be held by any child objects of this connection such as the session, producers and consumers.
-         */
-        private readonly Object _failoverMutex = new Object();
-        public object FailoverMutex
-        {
-            get { return _failoverMutex; }
-        }
-
-        /**
-         * Policy dictating how to failover
-         */
-        private FailoverPolicy _failoverPolicy;
-
-        internal bool IsFailoverAllowed
-        {
-            get { return _failoverPolicy.FailoverAllowed(); }
-        }
-
-        /// <summary>
-        /// A channel is roughly analogous to a session. The server can negotiate the maximum number of channels
-        /// per session and we must prevent the client from opening too many. Zero means unlimited.
-        /// </summary>
-        private ushort _maximumChannelCount;
-
-        /// <summary>
-        /// The maximum size of frame supported by the server
-        /// </summary>
-        private uint _maximumFrameSize;
-
-        private AMQStateManager _stateManager;
-
-        private AMQProtocolSession _protocolSession;
-        public AMQProtocolSession ProtocolSession { get { return _protocolSession;  } }
-
-        /// <summary>
-        /// Maps from session id (Integer) to AmqChannel instance
-        /// </summary>
-        private readonly IDictionary _sessions = new LinkedHashtable();
-
-        private ExceptionListenerDelegate _exceptionListener;
-
-        private IConnectionListener _connectionListener;
-
-        private ITransport _transport;
-        public ITransport Transport { get { return _transport; } }
-        
-        /// <summary>
-        /// Whether this connection is started, i.e. whether messages are flowing to consumers. It has no meaning for
-        /// message publication.
-        /// </summary>
-        private bool _started;
-
-        private AMQProtocolListener _protocolListener;
-        public AMQProtocolListener ProtocolListener { get { return _protocolListener;  } }
-
-        public IProtocolWriter ProtocolWriter
-        {
-            get { return _transport.ProtocolWriter; }
-        }
-
-        ProtocolWriter _protocolWriter;
-
-        public ProtocolWriter ConvenientProtocolWriter
-        {
-            get { return _protocolWriter; }
-        }
-
-        public AMQConnection(IConnectionInfo connectionInfo)
-        {
-            if (connectionInfo == null)
-            {
-                throw new ArgumentException("ConnectionInfo must be specified");
-            }
-            _log.Debug("ConnectionInfo: " + connectionInfo);
-            _connectionInfo = connectionInfo;
-            _log.Debug("password = " + _connectionInfo.Password);
-            _failoverPolicy = new FailoverPolicy(connectionInfo);
-
-            // We are not currently connected.
-            _connected = false;
-
-            Exception lastException = null;
-            do
-            {
-                try
-                {
-                    IBrokerInfo brokerInfo = _failoverPolicy.GetNextBrokerInfo();
-                    _log.Debug("Connecting to " + brokerInfo);
-                    MakeBrokerConnection(brokerInfo);
-                    break;
-                }
-                catch (Exception e)
-                {
-                    lastException = e;
-                    _log.Error("Unable to connect to broker " + _failoverPolicy.GetCurrentBrokerInfo(), e);
-                    // XXX: Should perhaps break out of the do/while here if not a SocketException...
-                }
-            } while (_failoverPolicy.FailoverAllowed());
-
-            _log.Debug("Are we connected:" + _connected);
-            
-            if (!_failoverPolicy.FailoverAllowed())
-            {
-                if ( lastException is AMQException )
-                   throw lastException;
-                else
-                   throw new AMQConnectionException("Unable to connect", lastException);
-            }
-
-            // TODO: this needs to be redone so that we are not spinning.
-            // A suitable object should be set that is then waited on
-            // and only notified when a connection is made or when
-            // the AMQConnection gets closed.
-            while (!_connected && !Closed)
-            {
-                _log.Debug("Sleeping.");
-                Thread.Sleep(100);
-            }
-            if (!_failoverPolicy.FailoverAllowed() || _failoverPolicy.GetCurrentBrokerInfo() == null)
-            {
-                if (_lastAMQException != null)
-                {
-                    throw _lastAMQException;
-                }
-            }
-        }
-
-        /*private ITransport LoadTransportFromAssembly(string host, int port, String assemblyName, String transportType)
-        {
-            //Assembly assembly = Assembly.LoadFrom(assemblyName);
-            Assembly assembly = Assembly.Load(assemblyName);
-
-            foreach (Type type in assembly.GetTypes())
-            {
-                _log.Debug(String.Format("type = {0}", type));
-            }
-
-            Type transport = assembly.GetType(transportType);
-
-            if (transport == null)
-            {
-                throw new ArgumentException(
-                    String.Format("Type is not found in assembly. Type={0} Assembly={1}", transportType, assemblyName));
-                
-            }
-
-            _log.Debug("transport = " + transport);
-            _log.Debug("ctors = " + transport.GetConstructors());
-
-            ConstructorInfo info = transport.GetConstructors()[0];
-            ITransport result = (ITransport)info.Invoke(new object[] { host, port, this });
-
-            _log.Debug("transport = " + result);
-
-            return result;
-        }*/
-
-        public void Disconnect()
-        {
-            _transport.Close();
-        }
-
-        #region IConnection Members
-
-        public string ClientID
-        {
-            get
-            {
-                CheckNotClosed();
-                return _connectionInfo.ClientName;
-            }
-            set
-            {
-                CheckNotClosed();
-                _connectionInfo.ClientName = value;
-            }
-        }
-
-        public override void Close()
-        {
-            lock (FailoverMutex)
-            {
-                // atomically set to closed and check the _previous value was NOT CLOSED
-                if (Interlocked.Exchange(ref _closed, CLOSED) == NOT_CLOSED)
-                {
-                    try
-                    {
-                        CloseAllSessions(null);
-                        CloseConnection();
-                    }
-                    catch (AMQException e)
-                    {
-                        throw new QpidException("Error closing connection: " + e);
-                    }
-                }
-            }
-        }
-
-        private void CloseConnection()
-        {
-            _stateManager.ChangeState(AMQState.CONNECTION_CLOSING);
-
-            AMQFrame frame = ConnectionCloseBody.CreateAMQFrame(
-                0, 200, "Qpid.NET client is closing the connection.", 0, 0);
-
-            ProtocolWriter.Write(frame);
-
-            _log.Debug("Blocking for connection close ok frame");
-
-            _stateManager.AttainState(AMQState.CONNECTION_CLOSED);
-            Disconnect();
-        }
-
-        class CreateChannelFailoverSupport : FailoverSupport
-        {
-            private static readonly ILog _log = LogManager.GetLogger(typeof(CreateChannelFailoverSupport));
-
-            private bool _transacted;
-            private AcknowledgeMode _acknowledgeMode;
-            int _prefetchHigh;
-            int _prefetchLow;
-            AMQConnection _connection;
-            
-            public CreateChannelFailoverSupport(AMQConnection connection, bool transacted, AcknowledgeMode acknowledgeMode, int prefetchHigh, int prefetchLow)
-            {
-                _connection = connection;
-                _transacted = transacted;
-                _acknowledgeMode = acknowledgeMode;
-                _prefetchHigh = prefetchHigh;
-                _prefetchLow = prefetchLow;
-            }
-
-            protected override object operation()
-            {
-                ushort channelId = _connection.NextChannelId();
-
-                if (_log.IsDebugEnabled)
-                {
-                    _log.Debug("Write channel open frame for channel id " + channelId);
-                }
-
-                // We must create the channel and register it before actually sending the frame to the server to
-                // open it, so that there is no window where we could receive data on the channel and not be set
-                // up to handle it appropriately.
-                AmqChannel channel = new AmqChannel(_connection, 
-                        channelId, _transacted, _acknowledgeMode, _prefetchHigh, _prefetchLow);
-                _connection.ProtocolSession.AddSessionByChannel(channelId, channel);
-                _connection.RegisterSession(channelId, channel);
-
-                bool success = false;
-                try
-                {
-                    _connection.CreateChannelOverWire(channelId, _prefetchHigh, _prefetchLow, _transacted);
-                    success = true;
-                }
-                catch (AMQException e)
-                {
-                    throw new QpidException("Error creating channel: " + e, e);
-                }
-                finally
-                {
-                    if (!success) {
-                        _connection.ProtocolSession.RemoveSessionByChannel(channelId);
-                        _connection.DeregisterSession(channelId);
-                    }
-                }
-
-                if (_connection._started)
-                {
-                    channel.Start();
-                }
-                return channel;
-            }
-        }
-        
-        internal ushort NextChannelId()
-        {
-            return (ushort) Interlocked.Increment(ref _nextChannelId);
-        }
-        
-        public IChannel CreateChannel(bool transacted, AcknowledgeMode acknowledgeMode)
-        {
-            return CreateChannel(transacted, acknowledgeMode, AmqChannel.DEFAULT_PREFETCH_HIGH_MARK);
-        }
-
-        public IChannel CreateChannel(bool transacted, AcknowledgeMode acknowledgeMode, int prefetch)
-        {
-           return CreateChannel(transacted, acknowledgeMode, prefetch, prefetch);
-        }
-   
-        public IChannel CreateChannel(bool transacted, AcknowledgeMode acknowledgeMode, int prefetchHigh, int prefetchLow)
-        {
-            CheckNotClosed();
-            if (ChannelLimitReached())
-            {
-                throw new ChannelLimitReachedException(_maximumChannelCount);
-            }
-            else
-            {
-                CreateChannelFailoverSupport operation =
-                    new CreateChannelFailoverSupport(this, transacted, acknowledgeMode, prefetchHigh, prefetchLow);
-                return (IChannel)operation.execute(this);
-            }
-        }
-
-        public void CloseSession(AmqChannel channel)
-        {
-            // FIXME: Don't we need FailoverSupport here (as we have SyncWrite).
-            _protocolSession.CloseSession(channel);
-            
-            AMQFrame frame = ChannelCloseBody.CreateAMQFrame(
-                channel.ChannelId, 200, "JMS client closing channel", 0, 0);
-            
-            _log.Debug("Blocking for channel close frame for channel " + channel.ChannelId);
-            _protocolWriter.SyncWrite(frame, typeof(ChannelCloseOkBody));
-            _log.Debug("Received channel close frame");
-            // When control resumes at this point, a reply will have been received that
-            // indicates the broker has closed the channel successfully
-        }
-
-        public ExceptionListenerDelegate ExceptionListener
-        {
-            get
-            {
-                CheckNotClosed();
-                return _exceptionListener;
-            }
-            set
-            {
-                CheckNotClosed();
-                _exceptionListener = value;
-            }
-        }
-
-        /// <summary>
-        /// Start the connection, i.e. start flowing messages. Note that this method must be called only from a single thread
-        /// and is not thread safe (which is legal according to the JMS specification).
-        /// @throws JMSException
-        /// </summary>
-        public void Start()
-        {
-            CheckNotClosed();
-
-            if (!_started)
-            {
-                foreach (DictionaryEntry lde in _sessions)
-                {                   
-                    AmqChannel s = (AmqChannel)lde.Value;
-                    s.Start();
-                }
-                _started = true;
-            }
-        }
-
-        public void Stop()
-        {
-            CheckNotClosed();
-
-            if (_started)
-            {
-                foreach (DictionaryEntry lde in _sessions)
-                {
-                    AmqChannel s = (AmqChannel) lde.Value;
-                    s.Stop();
-                }
-                _started = false;
-            }
-        }
-
-        public IConnectionListener ConnectionListener
-        {
-            get { return _connectionListener; }
-            set { _connectionListener = value; }
-        }
-
-        #endregion
-
-        #region IDisposable Members
-
-        public void Dispose()
-        {
-            Close();
-        }
-
-        #endregion
-
-        private bool ChannelLimitReached()
-        {
-            return _maximumChannelCount != 0 && _sessions.Count == _maximumChannelCount;
-        }
-
-        /// <summary>
-        /// Close all the sessions, either due to normal connection closure or due to an error occurring.
-        /// @param cause if not null, the error that is causing this shutdown
-        /// </summary>
-        private void CloseAllSessions(Exception cause)
-        {
-            _log.Debug("Closing all session in connection " + this);
-            ICollection sessions = new ArrayList(_sessions.Values);
-            foreach (AmqChannel channel in sessions)
-            {
-                _log.Debug("Closing channel " + channel);
-                if (cause != null)
-                {
-                    channel.ClosedWithException(cause);
-                }
-                else
-                {
-                    try
-                    {
-                        channel.Close();
-                    }
-                    catch (QpidException e)
-                    {
-                        _log.Error("Error closing channel: " + e);
-                    }
-                }
-            }
-            _log.Debug("Done closing all sessions in connection " + this);
-        }
-
-        public int MaximumChannelCount
-        {
-            get
-            {
-                CheckNotClosed();
-                return _maximumChannelCount;
-            }
-        }
-        
-        internal void SetMaximumChannelCount(ushort maximumChannelCount)
-        {
-            CheckNotClosed();
-            _maximumChannelCount = maximumChannelCount;
-        }
-
-        public uint MaximumFrameSize
-        {
-            get
-            {
-                return _maximumFrameSize;
-            }
-
-            set
-            {
-                _maximumFrameSize = value;
-            }
-        }
-
-        public IDictionary Sessions
-        {
-            get
-            {
-                return _sessions;
-            }
-        }
-
-        public string Host
-        {
-            get
-            {
-                return _failoverPolicy.GetCurrentBrokerInfo().Host;
-            }
-        }
-
-        public int Port
-        {
-            get
-            {
-                return _failoverPolicy.GetCurrentBrokerInfo().Port;
-            }
-        }
-
-        public string Username
-        {
-            get
-            {
-                return _connectionInfo.Username;
-            }
-        }
-
-        public string Password
-        {
-            get
-            {
-                return _connectionInfo.Password;
-            }
-        }
-
-        public string VirtualHost
-        {
-            get
-            {
-                return _connectionInfo.VirtualHost;
-            }
-        }
-
-        /// <summary>
-        /// Invoked by the AMQProtocolSession when a protocol session exception has occurred.
-        /// This method sends the exception to a JMS exception listener, if configured, and
-        /// propagates the exception to sessions, which in turn will propagate to consumers.
-        /// This allows synchronous consumers to have exceptions thrown to them.
-        /// </summary>
-        /// <param name="cause">the exception</param>        
-        public void ExceptionReceived(Exception cause)
-        {
-            if (_exceptionListener != null)
-            {
-                // Listener expects one of these...
-                QpidException xe;
-
-                if (cause is QpidException)
-                {
-                    xe = (QpidException) cause;
-                }
-                else
-                {
-                    xe = new QpidException("Exception thrown against " + ToString() + ": " + cause, cause);                    
-                }
-                // in the case of an IOException, MINA has closed the protocol session so we set _closed to true
-                // so that any generic client code that tries to close the connection will not mess up this error
-                // handling sequence
-                if (cause is IOException)
-                {
-                    Interlocked.Exchange(ref _closed, CLOSED);
-                }
-#if __MonoCS__
-                _exceptionListener(xe);
-#else
-                _exceptionListener.Invoke(xe);
-#endif
-            }
-            else
-            {
-                _log.Error("Connection exception: " + cause);
-            }
-
-            // An undelivered is not fatal to the connections usability.
-            if (!(cause is AMQUndeliveredException))
-            {
-                Interlocked.Exchange(ref _closed, CLOSED);
-                CloseAllSessions(cause);
-            }
-            else
-            {
-                ;
-            }
-        }
-
-        internal void RegisterSession(int channelId, AmqChannel channel)
-        {
-            _sessions[channelId] = channel;
-        }
-
-        internal void DeregisterSession(int channelId)
-        {
-            _sessions.Remove(channelId);
-        }
-
-        /**
-         * Fire the preFailover event to the registered connection listener (if any)
-         *
-         * @param redirect true if this is the result of a redirect request rather than a connection error
-         * @return true if no listener or listener does not veto change
-         */
-        public bool FirePreFailover(bool redirect)
-        {
-            bool proceed = true;
-            if (_connectionListener != null)
-            {
-                proceed = _connectionListener.PreFailover(redirect);
-            }
-            return proceed;
-        }
-
-        /**
-         * Fire the preResubscribe event to the registered connection listener (if any). If the listener
-         * vetoes resubscription then all the sessions are closed.
-         *
-         * @return true if no listener or listener does not veto resubscription.
-         * @throws JMSException
-         */
-        public bool FirePreResubscribe()
-        {
-            if (_connectionListener != null)
-            {
-                bool resubscribe = _connectionListener.PreResubscribe();
-                if (!resubscribe)
-                {
-                    MarkAllSessionsClosed();
-                }
-                return resubscribe;
-            }
-            else
-            {
-                return true;
-            }
-        }
-
-        /**
-         * Marks all sessions and their children as closed without sending any protocol messages. Useful when
-         * you need to mark objects "visible" in userland as closed after failover or other significant event that
-         * impacts the connection.
-         * <p/>
-         * The caller must hold the failover mutex before calling this method.
-         */
-        private void MarkAllSessionsClosed()
-        {
-            //LinkedList sessionCopy = new LinkedList(_sessions.values());
-            ArrayList sessionCopy = new ArrayList(_sessions.Values);
-            foreach (AmqChannel session in sessionCopy)
-            {
-                session.MarkClosed();
-            }
-            _sessions.Clear();
-        }
-
-        /**
-         * Fires a failover complete event to the registered connection listener (if any).
-         */
-        public void FireFailoverComplete()
-        {
-            if (_connectionListener != null)
-            {
-                _connectionListener.FailoverComplete();
-            }
-        }
-
-        public bool AttemptReconnection(String host, int port, SslOptions sslConfig)
-        {
-            IBrokerInfo bd = new AmqBrokerInfo("amqp", host, port, sslConfig);
-
-            _failoverPolicy.setBroker(bd);
-
-            try
-            {
-                MakeBrokerConnection(bd);
-                return true;
-            }
-            catch (Exception e)
-            {
-                _log.Debug("Unable to connect to broker at " + bd, e);
-                AttemptReconnection();
-            }
-            return false;
-        }
-
-        private void MakeBrokerConnection(IBrokerInfo brokerDetail)
-        {
-            try
-            {
-                _stateManager = new AMQStateManager();
-                _protocolListener = new AMQProtocolListener(this, _stateManager);
-                _protocolListener.AddFrameListener(_stateManager);
-
-                /*
-                // Currently there is only one transport option - BlockingSocket.
-                String assemblyName = "Apache.Qpid.Client.Transport.Socket.Blocking.dll";
-                String transportType = "Apache.Qpid.Client.Transport.Socket.Blocking.BlockingSocketTransport";
-
-                // Load the transport assembly dynamically.
-                _transport = LoadTransportFromAssembly(brokerDetail.getHost(), brokerDetail.getPort(), assemblyName, transportType);
-                */
-
-                _transport = new BlockingSocketTransport();
-                
-                // Connect.
-                _transport.Connect(brokerDetail, this);                
-                _protocolWriter = new ProtocolWriter(_transport.ProtocolWriter, _protocolListener);
-                _protocolSession = new AMQProtocolSession(_transport.ProtocolWriter, _transport, this);
-                _protocolListener.ProtocolSession = _protocolSession;
-
-                // Now start the connection "handshake".
-                _transport.ProtocolWriter.Write(new ProtocolInitiation());
-
-                // Blocks until the connection has been opened.
-                _stateManager.AttainState(AMQState.CONNECTION_OPEN);
-
-                _failoverPolicy.attainedConnection();
-
-                // XXX: Again this should be changed to a suitable notify.
-                _connected = true;
-            }
-            catch (AMQException e)
-            {
-                _lastAMQException = e;
-                throw; // rethrow
-            }
-        }
-
-        public bool AttemptReconnection()
-        {
-            while (_failoverPolicy.FailoverAllowed())
-            {
-                try
-                {
-                    MakeBrokerConnection(_failoverPolicy.GetNextBrokerInfo());
-                    return true;
-                }
-                catch (Exception e)
-                {
-                    if (!(e is AMQException))
-                    {
-                        _log.Debug("Unable to connect to broker at " + _failoverPolicy.GetCurrentBrokerInfo(), e);
-                    }
-                    else
-                    {
-                        _log.Debug(e.Message + ":Unable to connect to broker at " + _failoverPolicy.GetCurrentBrokerInfo());
-                    }
-                }
-            }
-
-            // Connection unsuccessful.
-            return false;
-        }
-
-        /**
-         * For all channels, and for all consumers in those sessions, resubscribe. This is called during failover handling.
-         * The caller must hold the failover mutex before calling this method.
-         */
-        public void ResubscribeChannels()
-        {
-            ArrayList channels = new ArrayList(_sessions.Values);
-            _log.Debug(String.Format("Resubscribing sessions = {0} sessions.size={1}", channels, channels.Count));
-            foreach (AmqChannel channel in channels)
-            {
-                _protocolSession.AddSessionByChannel(channel.ChannelId, channel);
-                ReopenChannel(
-                   channel.ChannelId, 
-                   channel.DefaultPrefetchHigh, 
-                   channel.DefaultPrefetchLow, 
-                   channel.Transacted
-                   );
-                channel.ReplayOnFailOver();
-            }
-        }
-
-        private void ReopenChannel(ushort channelId, int prefetchHigh, int prefetchLow, bool transacted)
-        {
-            _log.Debug(string.Format("Reopening channel id={0} prefetchHigh={1} prefetchLow={2} transacted={3}",
-                channelId, prefetchHigh, prefetchLow, transacted));
-            try
-            {
-                CreateChannelOverWire(channelId, prefetchHigh, prefetchLow, transacted);
-            }
-            catch (AMQException e)
-            {
-                _protocolSession.RemoveSessionByChannel(channelId);
-                DeregisterSession(channelId);
-                throw new AMQException("Error reopening channel " + channelId + " after failover: " + e);
-            }
-        }
-
-        void CreateChannelOverWire(ushort channelId, int prefetchHigh, int prefetchLow, bool transacted)
-        {
-            _protocolWriter.SyncWrite(ChannelOpenBody.CreateAMQFrame(channelId, null), typeof (ChannelOpenOkBody));
-            
-            // Don't use the BasicQos frame if connecting to OpenAMQ (at it is not support). We 
-            // know this when we connection using AMQP 0.7
-            if (ProtocolInitiation.CURRENT_PROTOCOL_VERSION_MAJOR != 7)
-            {
-                // Basic.Qos frame appears to not be supported by OpenAMQ 1.0d.
-                _protocolWriter.SyncWrite(
-                    BasicQosBody.CreateAMQFrame(
-                    channelId, (uint)prefetchHigh, 0, false),
-                    typeof (BasicQosOkBody));                
-            }
-            
-            if (transacted)
-            {
-                if (_log.IsDebugEnabled)
-                {
-                    _log.Debug("Issuing TxSelect for " + channelId);
-                }
-                _protocolWriter.SyncWrite(TxSelectBody.CreateAMQFrame(channelId), typeof(TxSelectOkBody));
-            }
-        }
-
-        public String toURL()
-        {
-            return _connectionInfo.AsUrl();
-        }
-
-        class HeartBeatThread
-        {
-            int _heartbeatMillis;
-            IProtocolWriter _protocolWriter;
-            bool _run = true;
-            
-            public HeartBeatThread(IProtocolWriter protocolWriter, int heartbeatMillis)
-            {
-                _protocolWriter = protocolWriter;
-                _heartbeatMillis = heartbeatMillis;
-            }
-            
-            public void Run()
-            {
-                while (_run)
-                {
-                    Thread.Sleep(_heartbeatMillis);
-                    if (!_run) break;
-                    _log.Debug("Sending heartbeat");
-                    // TODO: Can we optimise this so that heartbeats are only written when we haven't sent anything recently to the broker?
-                    _protocolWriter.Write(HeartbeatBody.FRAME);
-                }
-                _log.Debug("Heatbeat thread stopped");
-            }
-            
-            public void Stop()
-            {
-                _run = false;
-            }
-        }
-        
-        public void StartHeartBeatThread(int heartbeatSeconds)
-        {
-            _log.Debug("Starting new heartbeat thread");
-            _heartBeatRunner = new HeartBeatThread(ProtocolWriter, heartbeatSeconds * 1000);
-            _heartBeatThread = new Thread(new ThreadStart(_heartBeatRunner.Run));
-            _heartBeatThread.Name = "HeartBeat";
-            _heartBeatThread.Start();
-        }
-
-        public void StopHeartBeatThread()
-        {
-            if (_heartBeatRunner != null)
-            {
-                _log.Debug("Stopping old heartbeat thread");
-                _heartBeatRunner.Stop();
-            }
-        }
-    }
-}
diff --git a/qpid/dotnet/Qpid.Client/Client/AMQConnectionException.cs b/qpid/dotnet/Qpid.Client/Client/AMQConnectionException.cs
deleted file mode 100644
index c8a48814bb..0000000000
--- a/qpid/dotnet/Qpid.Client/Client/AMQConnectionException.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using System;
-using System.Runtime.Serialization;
-
-namespace Apache.Qpid.Client
-{
-    [Serializable]
-    public class AMQConnectionException : AMQException
-    {
-        public AMQConnectionException(String message, Exception e) : base(message, e)
-        {
-        }
-
-        protected AMQConnectionException(SerializationInfo info, StreamingContext ctxt)
-           : base(info, ctxt)
-        {
-        }
-    }
-}
diff --git a/qpid/dotnet/Qpid.Client/Client/AMQDestination.cs b/qpid/dotnet/Qpid.Client/Client/AMQDestination.cs
deleted file mode 100644
index 07ce3c2354..0000000000
--- a/qpid/dotnet/Qpid.Client/Client/AMQDestination.cs
+++ /dev/null
@@ -1,234 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using System;
-
-namespace Apache.Qpid.Client
-{
-    public abstract class AMQDestination
-    {
-        protected readonly string _exchangeName;
-        protected readonly string _exchangeClass;
-        protected readonly string _destinationName;
-        protected readonly bool _isExclusive;
-        protected readonly bool _isAutoDelete;
-        protected bool _isDurable;
-
-        public bool IsDurable
-        {
-           
-            get { return _isDurable; }
-        }
-
-        protected string _queueName;
-
-        protected AMQDestination(String exchangeName, String exchangeClass, String destinationName, bool isExclusive,
-                                 bool isAutoDelete, String queueName)
-        {
-            // XXX: This is ugly - OnlyRequired because of ReplyToDestination.
-//            if (destinationName == null)
-//            {
-//                throw new ArgumentNullException("destinationName");
-//            }
-
-            // XXX: This is ugly - OnlyRequired because of SendingDestinationAdapter.
-//            if (exchangeName == null)
-//            {
-//                throw new ArgumentNullException("exchangeName");
-//            }
-
-            // XXX: This is ugly - OnlyRequired because of SendingDestinationAdapter.
-//            if (exchangeClass == null)
-//            {
-//                throw new ArgumentNullException("exchangeClass");
-//            }
-
-            _exchangeName = exchangeName;
-            _exchangeClass = exchangeClass;
-            _destinationName = destinationName;
-            _isExclusive = isExclusive;
-            _isAutoDelete = isAutoDelete;
-            _queueName = queueName;
-        }
-
-        public string Name
-        {
-            get
-            {
-                return _destinationName;
-            }
-        }
-
-        public abstract string RoutingKey
-        {
-            get;
-        }
-
-        public abstract string EncodedName
-        {
-            get;
-        }
-
-        public bool AutoDelete
-        {
-            get
-            {
-                return _isAutoDelete;
-            }
-        }
-
-        public string QueueName
-        {
-            get
-            {
-                return _queueName;
-            }
-            set
-            {
-                _queueName = value;
-            }
-        }
-
-        public string ExchangeName
-        {
-            get
-            {
-                return _exchangeName;
-            }
-        }
-
-        public string ExchangeClass
-        {
-            get
-            {
-                return _exchangeClass;
-            }
-        }
-
-        public bool IsExclusive
-        {
-            get
-            {
-                return _isExclusive;
-            }
-        }
-
-        public bool IsAutoDelete
-        {
-            get
-            {
-                return _isAutoDelete;
-            }
-        }
-
-        public override string ToString()
-        {
-            return "Destination: " + _destinationName + ", " +
-                   "Queue Name: " + _queueName + ", Exchange: " + _exchangeName +
-                   ", Exchange class: " + _exchangeClass + ", Exclusive: " + _isExclusive +
-                   ", AutoDelete: " + _isAutoDelete; // +", Routing  Key: " + RoutingKey;
-        }
-
-        public override bool Equals(object o)
-        {
-            if (this == o)
-            {
-                return true;
-            }
-            if (o == null || GetType() != o.GetType())
-            {
-                return false;
-            }
-
-            AMQDestination that = (AMQDestination) o;
-
-            if (!StringsNotEqualNullSafe(_destinationName, that._destinationName))
-            {
-                return false;
-            }
-            if (!StringsNotEqualNullSafe(_exchangeClass, that._exchangeClass))
-            {
-                return false;
-            }
-            if (!StringsNotEqualNullSafe(_exchangeName, that._exchangeName))
-            {
-                return false;
-            }
-            if (!StringsNotEqualNullSafe(_queueName, that._queueName))
-            {
-                return false;
-            }
-            if (_isExclusive != that._isExclusive)
-            {
-                return false;
-            }
-            if (_isAutoDelete != that._isAutoDelete)
-            {
-                return false;
-            }
-            return true;
-        }
-
-        private bool StringsNotEqualNullSafe(string one, string two)
-        {
-            if ((one == null && two != null) ||
-                (one != null && !one.Equals(two)))
-            {
-                return false;
-            }
-            else
-            {
-                return true;
-            }
-        }
- 
-        public override int GetHashCode()
-        {
-            int result;
-            if (_exchangeName == null)
-            {
-                result = "".GetHashCode();   
-            }
-            else
-            {
-                result = _exchangeName.GetHashCode();
-            }
-            if (_exchangeClass != null)
-            {
-                result = 29 * result + _exchangeClass.GetHashCode();                
-            }
-            if (_destinationName != null)
-            {
-                result = 29 * result + _destinationName.GetHashCode();                
-            }
-            if (_queueName != null)
-            {
-                result = 29 * result + _queueName.GetHashCode();
-            }
-            result = result * (_isExclusive ? 13 : 7);
-            result = result * (_isAutoDelete ? 13 : 7);
-            
-            Console.WriteLine("FIXME HashCode for " + this + " = " + result);
-            return result;
-        }
-
-        public abstract bool IsNameRequired { get; }
-    }
-}
diff --git a/qpid/dotnet/Qpid.Client/Client/AMQNoConsumersException.cs b/qpid/dotnet/Qpid.Client/Client/AMQNoConsumersException.cs
deleted file mode 100644
index 0d93176734..0000000000
--- a/qpid/dotnet/Qpid.Client/Client/AMQNoConsumersException.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-/*

- *

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- *

- */

-using System;

-using System.Runtime.Serialization;

-using Apache.Qpid.Common;

-using Apache.Qpid.Protocol;

-

-namespace Apache.Qpid.Client

-{

-   [Serializable]

-   public class AMQNoConsumersException : AMQUndeliveredException

-   {

-      public AMQNoConsumersException(string message)

-         : this(message, null)

-      {

-      }

-

-      public AMQNoConsumersException(string message, object bounced)

-         : base(AMQConstant.NO_CONSUMERS.Code, message, bounced)

-      {

-      }

-      protected AMQNoConsumersException(SerializationInfo info, StreamingContext ctxt)

-         : base(info, ctxt)

-      {

-      }

-   }

-}

diff --git a/qpid/dotnet/Qpid.Client/Client/AMQNoRouteException.cs b/qpid/dotnet/Qpid.Client/Client/AMQNoRouteException.cs
deleted file mode 100644
index bde3cdd989..0000000000
--- a/qpid/dotnet/Qpid.Client/Client/AMQNoRouteException.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-/*

- *

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- *

- */

-using System;

-using System.Runtime.Serialization;

-using Apache.Qpid.Common;

-using Apache.Qpid.Protocol;

-

-namespace Apache.Qpid.Client

-{

-   [Serializable]

-   public class AMQNoRouteException : AMQUndeliveredException

-   {

-      public AMQNoRouteException(string message)

-         : this(message, null)

-      {

-      }

-

-      public AMQNoRouteException(string message, object bounced)

-         : base(AMQConstant.NO_ROUTE.Code, message, bounced)

-      {

-      }

-

-      protected AMQNoRouteException(SerializationInfo info, StreamingContext ctxt)

-         : base(info, ctxt)

-      {

-      }

-   }

-}

diff --git a/qpid/dotnet/Qpid.Client/Client/AmqBrokerInfo.cs b/qpid/dotnet/Qpid.Client/Client/AmqBrokerInfo.cs
deleted file mode 100644
index 591c5b941f..0000000000
--- a/qpid/dotnet/Qpid.Client/Client/AmqBrokerInfo.cs
+++ /dev/null
@@ -1,322 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using System;
-using System.Collections;
-using System.Text;
-using Apache.Qpid.Client.Qms;
-
-namespace Apache.Qpid.Client
-{
-    public class AmqBrokerInfo : IBrokerInfo
-    {
-        public readonly string URL_FORMAT_EXAMPLE =
-            "<transport>://<hostname>[:<port Default=\""+BrokerInfoConstants.DEFAULT_PORT+"\">][?<option>='<value>'[,<option>='<value>']]";
-
-        public const long DEFAULT_CONNECT_TIMEOUT = 30000L;
-
-        private string _host = "localhost";
-        private int _port = 5672;
-        private string _transport = "amqp";
-        private Hashtable _options = new Hashtable();
-        private SslOptions _sslOptions;
-
-        public AmqBrokerInfo()
-        {
-        }
-
-        public AmqBrokerInfo(string url)
-        {
-            // URL should be of format tcp://host:port?option='value',option='value'
-            try
-            {
-                Uri connection = new Uri(url);
-
-                String transport = connection.Scheme;
-
-                // Handles some defaults to minimise changes to existing broker URLS e.g. localhost
-                if (transport != null)
-                {
-                    transport = transport.ToLower();
-                    //todo this list of valid transports should be enumerated somewhere
-                    if ((!(transport.Equals("vm") || transport.Equals("tcp"))))
-                    {
-                        if (transport.Equals("localhost"))
-                        {
-                            connection = new Uri(BrokerInfoConstants.DEFAULT_TRANSPORT + "://" + url);
-                            transport = connection.Scheme;
-                        }
-                        else
-                        {
-                            if (url[transport.Length] == ':' && url[transport.Length + 1] != '/')
-                            {
-                                //Then most likely we have a host:port value
-                                connection = new Uri(BrokerInfoConstants.DEFAULT_TRANSPORT + "://" + url);
-                                transport = connection.Scheme;
-                            }
-                            else
-                            {
-                                URLHelper.parseError(0, transport.Length, "Unknown transport", url);
-                            }
-                        }
-                    }
-                }
-                else
-                {
-                    //Default the transport
-                    connection = new Uri(BrokerInfoConstants.DEFAULT_TRANSPORT + "://" + url);
-                    transport = connection.Scheme;
-                }
-
-                if (transport == null)
-                {
-                    URLHelper.parseError(-1, "Unknown transport:'" + transport + "'" +
-                                             " In broker URL:'" + url + "' Format: " + URL_FORMAT_EXAMPLE, "");
-                }
-
-                Transport = transport;
-
-                String host = connection.Host;
-                if (!host.Equals("default")) Host = host;
-
-                int port = connection.Port;
-
-                if (port == -1)
-                {
-                    // Fix for when there is port data but it is not automatically parseable by getPort().
-                    String auth = connection.Authority;
-
-                    if (auth != null && auth.IndexOf(':') != -1)
-                    {
-                        int start = auth.IndexOf(":") + 1;
-                        int end = start;
-                        bool looking = true;
-                        bool found = false;
-                        //Walk the authority looking for a port value.
-                        while (looking)
-                        {
-                            try
-                            {
-                                end++;
-                                int.Parse(auth.Substring(start, end-start+1));
-
-                                if (end >= auth.Length)
-                                {
-                                    looking = false;
-                                    found = true;
-                                }
-                            }
-                            catch (FormatException)
-                            {
-                                looking = false;
-                            }
-
-                        }
-                        if (found)
-                        {
-                            Port = int.Parse(auth.Substring(start, end-start+1));
-                        }
-                        else
-                        {
-                            URLHelper.parseError(connection.ToString().IndexOf(connection.Authority) + end - 1,
-                                                 "Illegal character in port number", connection.ToString());
-                        }
-                    }
-                    else
-                    {
-                        Port = BrokerInfoConstants.DEFAULT_PORT;
-                    }
-                }
-                else
-                {
-                    Port = port;
-                }
-
-                String queryString = connection.Query;
-                if (queryString.Length > 0 && queryString[0] == '?')
-                {
-                    queryString = queryString.Substring(1);
-                }
-
-                URLHelper.parseOptions(_options, queryString);
-
-                //Fragment is #string (not used)
-            }
-            catch (UriFormatException uris)
-            {
-                throw uris;
-//                if (uris is UrlSyntaxException)
-//                {
-//                    throw uris;
-//                }
-//
-//                URLHelper.parseError(uris.getIndex(), uris.getReason(), uris.getInput());
-            }
-        }
-
-        public AmqBrokerInfo(string transport, string host, int port, bool useSSL) : this()
-        {
-            _transport = transport;
-            _host = host;
-            _port = port;
-
-            if (useSSL)
-            {
-                SetOption(BrokerInfoConstants.OPTIONS_SSL, "true");
-            }
-        }
-
-        public AmqBrokerInfo(string transport, string host, int port, SslOptions sslConfig)
-           : this()
-        {
-           _transport = transport;
-           _host = host;
-           _port = port;
-            
-           if ( sslConfig != null )
-           {
-              SetOption(BrokerInfoConstants.OPTIONS_SSL, "true");
-              _sslOptions = sslConfig;
-           }
-        }
-
-
-        public string Host
-        {
-            get { return _host; }
-            set { _host = value; }
-        }
-
-        public int Port
-        {
-            get { return _port; }
-            set { _port = value; }
-        }
-
-        public string Transport
-        {
-            get { return _transport; }
-            set { _transport = value; }
-        }
-
-        public SslOptions SslOptions
-        {
-            get { return _sslOptions; }
-        }
-
-        public string GetOption(string key)
-        {
-            return (string)_options[key];
-        }
-
-        public void SetOption(string key, string value)
-        {
-            _options[key] = value;
-        }
-
-        public long Timeout
-        {
-            get
-            {
-                if ( _options.ContainsKey(BrokerInfoConstants.OPTIONS_CONNECT_TIMEOUT) )
-                {
-                    try
-                    {
-                        return long.Parse(GetOption(BrokerInfoConstants.OPTIONS_CONNECT_TIMEOUT));
-                    } catch ( FormatException )
-                    {
-                        //Do nothing as we will use the default below.
-                    }
-                }
-                return BrokerInfoConstants.DEFAULT_CONNECT_TIMEOUT;
-            }
-            set
-            {
-                SetOption(BrokerInfoConstants.OPTIONS_CONNECT_TIMEOUT, value.ToString());
-            }
-        }
-
-        public override string ToString()
-        {
-            StringBuilder sb = new StringBuilder();
-
-            sb.Append(_transport);
-            sb.Append("://");
-
-            if (!(StringEqualsIgnoreCase(_transport, "vm")))
-            {
-                sb.Append(_host);
-            }
-
-            sb.Append(':');
-            sb.Append(_port);
-
-            sb.Append(URLHelper.printOptions(_options));
-
-            return sb.ToString();
-        }
-        
-		public override bool Equals(object obj)
-		{
-	        if (!(obj is IBrokerInfo))
-	        {
-	            return false;
-	        }
-	
-	        IBrokerInfo bd = (IBrokerInfo) obj;
-	        return StringEqualsIgnoreCase(_host, bd.Host) &&
-	        	_port == bd.Port &&
-                StringEqualsIgnoreCase(_transport, bd.Transport) &&
-                UseSSL == bd.UseSSL;
-        }
-    	
-		public override int GetHashCode()
-		{
-			return _host.ToLower().GetHashCode() ^ _port.GetHashCode();
-		}
-
-        // TODO: move to util class.
-        private bool StringEqualsIgnoreCase(string one, string two)
-        {
-            return one.ToLower().Equals(two.ToLower());
-        }
-
-        public bool UseSSL
-        {
-            get
-            {
-                // To be friendly to users we should be case insensitive.
-                // or simply force users to conform to OPTIONS_SSL
-                // todo make case insensitive by trying ssl Ssl sSl ssL SSl SsL sSL SSL
-
-                if ( _options.ContainsKey(BrokerInfoConstants.OPTIONS_SSL) )
-                {
-                    return StringEqualsIgnoreCase(GetOption(BrokerInfoConstants.OPTIONS_SSL), "true");
-                }
-
-                return false;
-            }
-            set
-            {
-                SetOption(BrokerInfoConstants.OPTIONS_SSL, value.ToString());
-            }
-        }
-    }
-}
diff --git a/qpid/dotnet/Qpid.Client/Client/AmqChannel.cs b/qpid/dotnet/Qpid.Client/Client/AmqChannel.cs
deleted file mode 100644
index 84f08729dd..0000000000
--- a/qpid/dotnet/Qpid.Client/Client/AmqChannel.cs
+++ /dev/null
@@ -1,1009 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using System;
-using System.Collections;
-using System.Text.RegularExpressions;
-using System.Threading;
-using log4net;
-using Apache.Qpid.Buffer;
-using Apache.Qpid.Client.Message;
-using Apache.Qpid.Client.Util;
-using Apache.Qpid.Collections;
-using Apache.Qpid.Framing;
-using Apache.Qpid.Messaging;
-using Apache.Qpid.Protocol;
-
-namespace Apache.Qpid.Client
-{
-    public class AmqChannel : Closeable, IChannel
-    {
-        private static readonly ILog _logger = LogManager.GetLogger(typeof(AmqChannel));
-
-        internal const int BASIC_CONTENT_TYPE = 60;
-
-        private static int _nextSessionNumber = 0;
-
-        private int _sessionNumber;
-        private bool _suspended;
-        private object _suspensionLock = new object();
-        
-        // Used in the consume method. We generate the consume tag on the client so that we can use the nowait feature.
-        private int _nextConsumerNumber = 1;
-
-        public const int DEFAULT_PREFETCH_HIGH_MARK = 5000;
-        public const int DEFAULT_PREFETCH_LOW_MARK = 2500;
-
-        private AMQConnection _connection;
-
-        private bool _transacted;
-
-        private AcknowledgeMode _acknowledgeMode;
-
-        private ushort _channelId;
-
-        private int _defaultPrefetchHighMark = DEFAULT_PREFETCH_HIGH_MARK;
-        private int _defaultPrefetchLowMark = DEFAULT_PREFETCH_LOW_MARK;
-
-        private FlowControlQueue _queue;
-
-        private Dispatcher _dispatcher;
-
-        private MessageFactoryRegistry _messageFactoryRegistry;
-
-        /// <summary>
-        /// Set of all producers created by this session
-        /// </summary>
-        private Hashtable _producers = Hashtable.Synchronized(new Hashtable());
-
-        /// <summary>
-        /// Maps from consumer tag to JMSMessageConsumer instance
-        /// </summary>
-        private Hashtable _consumers = Hashtable.Synchronized(new Hashtable());
-
-        private ArrayList _replayFrames = new ArrayList();
-
-        /// <summary>
-        /// The counter of the _next producer id. This id is generated by the session and used only to allow the
-        /// producer to identify itself to the session when deregistering itself.
-        ///
-        /// Access to this id does not require to be synchronized since according to the JMS specification only one
-        /// thread of control is allowed to create producers for any given session instance.
-        /// </summary>
-        private long _nextProducerId;
-
-        /// <summary>
-        /// Responsible for decoding a message fragment and passing it to the appropriate message consumer.
-        /// </summary>
-        private class Dispatcher
-        {
-            private int _stopped = 0;
-
-            private AmqChannel _containingChannel;
-            
-            public Dispatcher(AmqChannel containingChannel)
-            {
-                _containingChannel = containingChannel;
-            }
-            
-            /// <summary>
-            /// Runs the dispatcher. This is intended to be Run in a separate thread.
-            /// </summary>
-            public void RunDispatcher()
-            {
-                UnprocessedMessage message;
-
-                while (_stopped == 0 && (message = (UnprocessedMessage)_containingChannel._queue.Dequeue()) != null)
-                {
-                    //_queue.size()
-                    DispatchMessage(message);
-                }                
-
-                _logger.Debug("Dispatcher thread terminating for channel " + _containingChannel._channelId);
-            }
-
-            private void DispatchMessage(UnprocessedMessage message)
-            {
-                if (message.DeliverBody != null)
-                {
-                    BasicMessageConsumer consumer = (BasicMessageConsumer) _containingChannel._consumers[message.DeliverBody.ConsumerTag];
-
-                    if (consumer == null)
-                    {
-                        _logger.Warn("Received a message from queue " + message.DeliverBody.ConsumerTag + " without a f - ignoring...");
-                    }
-                    else
-                    {
-                        consumer.NotifyMessage(message, _containingChannel.ChannelId);
-                    }
-                }
-                else
-                {
-                    try
-                    {
-                        // Bounced message is processed here, away from the mina thread
-                        AbstractQmsMessage bouncedMessage = _containingChannel._messageFactoryRegistry.
-                            CreateMessage(0, false, message.ContentHeader, message.Bodies);
-
-                        int errorCode = message.BounceBody.ReplyCode;
-                        string reason = message.BounceBody.ReplyText;
-                        _logger.Debug("Message returned with error code " + errorCode + " (" + reason + ")");
-
-                        _containingChannel._connection.ExceptionReceived(new AMQUndeliveredException(errorCode, "Error: " + reason, bouncedMessage));
-                    }
-                    catch (Exception e)
-                    {
-                        _logger.Error("Caught exception trying to raise undelivered message exception (dump follows) - ignoring...", e);
-                    }
-                }
-            }
-
-            public void StopDispatcher()
-            {
-                Interlocked.Exchange(ref _stopped, 1);                
-            }
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AmqChannel"/> class.
-        /// </summary>
-        /// <param name="con">The connection.</param>
-        /// <param name="channelId">The channel id.</param>
-        /// <param name="transacted">if set to <c>true</c> [transacted].</param>
-        /// <param name="acknowledgeMode">The acknowledge mode.</param>
-        /// <param name="defaultPrefetchHigh">Default prefetch high value</param>
-        /// <param name="defaultPrefetchLow">Default prefetch low value</param>
-        internal AmqChannel(AMQConnection con, ushort channelId, bool transacted, AcknowledgeMode acknowledgeMode, int defaultPrefetchHigh, int defaultPrefetchLow)
-           : this()
-        {
-           _sessionNumber = Interlocked.Increment(ref _nextSessionNumber);
-           _connection = con;
-           _transacted = transacted;
-           if ( transacted )
-           {
-              _acknowledgeMode = AcknowledgeMode.SessionTransacted;
-           } else
-           {
-              _acknowledgeMode = acknowledgeMode;
-           }
-           _channelId = channelId;
-           _defaultPrefetchHighMark = defaultPrefetchHigh;
-           _defaultPrefetchLowMark = defaultPrefetchLow;
-
-           if ( _acknowledgeMode == AcknowledgeMode.NoAcknowledge )
-           {
-              _queue = new FlowControlQueue(
-                 _defaultPrefetchLowMark, _defaultPrefetchHighMark,
-                 new ThresholdMethod(OnPrefetchLowMark),
-                 new ThresholdMethod(OnPrefetchHighMark)
-              );
-           } else
-           {
-              // low and upper are the same
-              _queue = new FlowControlQueue(
-                 _defaultPrefetchHighMark, _defaultPrefetchHighMark,
-                 null, null
-                 );
-           }
-        }
-
-        private AmqChannel()
-        {
-           _messageFactoryRegistry = MessageFactoryRegistry.NewDefaultRegistry();
-        }
-
-        /// <summary>
-        /// Create a disconnected channel that will fault
-        /// for most things, but is useful for testing
-        /// </summary>
-        /// <returns>A new disconnected channel</returns>
-        public static IChannel CreateDisconnectedChannel()
-        {
-           return new AmqChannel();
-        }
-
-
-        public IBytesMessage CreateBytesMessage()
-        {
-            return (IBytesMessage)_messageFactoryRegistry.CreateMessage("application/octet-stream");
-        }
-
-        public IMessage CreateMessage()
-        {
-            // TODO: this is supposed to create a message consisting only of message headers
-            return (IBytesMessage)_messageFactoryRegistry.CreateMessage("application/octet-stream");
-        }
-        
-        public IMessage CreateMessage(string mimeType)
-        {
-           return _messageFactoryRegistry.CreateMessage(mimeType);
-        }
-
-        public ITextMessage CreateTextMessage()
-        {
-            return CreateTextMessage(String.Empty);
-        }
-
-        public ITextMessage CreateTextMessage(string text)
-        {
-            ITextMessage msg = (ITextMessage)_messageFactoryRegistry.CreateMessage("text/plain");
-            msg.Text = text;
-            return msg;
-        }
-
-        public bool Transacted
-        {
-            get
-            {
-                CheckNotClosed();
-                return _transacted;
-            }
-        }
-
-        public AcknowledgeMode AcknowledgeMode
-        {
-            get
-            {
-                CheckNotClosed();
-                return _acknowledgeMode;
-            }
-        }
-
-        public void Commit()
-        {
-            // FIXME: Fail over safety. Needs FailoverSupport?
-            CheckNotClosed();
-            CheckTransacted(); // throws IllegalOperationException if not a transacted session
-
-            try
-            {
-                // Acknowledge up to message last delivered (if any) for each consumer.
-                // Need to send ack for messages delivered to consumers so far.
-                foreach (BasicMessageConsumer consumer  in _consumers.Values)
-                {
-                    // Sends acknowledgement to server.
-                    consumer.AcknowledgeLastDelivered();
-                }
-
-                // Commits outstanding messages sent and outstanding acknowledgements.
-                _connection.ConvenientProtocolWriter.SyncWrite(TxCommitBody.CreateAMQFrame(_channelId), typeof(TxCommitOkBody));
-            }
-            catch (AMQException e)
-            {
-                throw new QpidException("Failed to commit", e);
-            }
-        }
-
-        public void Rollback()
-        {
-           lock ( _suspensionLock )
-           {
-              CheckTransacted(); // throws IllegalOperationException if not a transacted session
-
-              try
-              {
-                 bool suspended = IsSuspended;
-                 if ( !suspended )
-                    Suspend(true);
-                 
-                 // todo: rollback dispatcher when TX support is added
-                 //if ( _dispatcher != null )
-                 //   _dispatcher.Rollback();
-
-                 _connection.ConvenientProtocolWriter.SyncWrite(
-                         TxRollbackBody.CreateAMQFrame(_channelId), typeof(TxRollbackOkBody));
-
-                 if ( !suspended )
-                    Suspend(false);
-              } catch ( AMQException e )
-              {
-                 throw new QpidException("Failed to rollback", e);
-              }
-           }
-        }
-
-        public override void Close()
-        {
-            lock (_connection.FailoverMutex)
-            {
-                // We must close down all producers and consumers in an orderly fashion. This is the only method
-                // that can be called from a different thread of control from the one controlling the session
-
-                lock (_closingLock)
-                {
-                    SetClosed();
-
-                    // we pass null since this is not an error case
-                    CloseProducersAndConsumers(null);
-
-                    try
-                    {
-                        _connection.CloseSession(this);
-                    }
-                    catch (AMQException e)
-                    {
-                        throw new QpidException("Error closing session: " + e);
-                    }
-                    finally
-                    {
-                        _connection.DeregisterSession(_channelId);
-                    }
-                }
-            }
-        }
-
-        private void SetClosed()
-        {
-            Interlocked.Exchange(ref _closed, CLOSED);
-        }
-
-        /// <summary>
-        /// Close all producers or consumers. This is called either in the error case or when closing the session normally.
-        /// <param name="amqe">the exception, may be null to indicate no error has occurred</param>
-        ///
-        private void CloseProducersAndConsumers(AMQException amqe)
-        {
-            try
-            {
-                CloseProducers();
-            }
-            catch (QpidException e)
-            {
-                _logger.Error("Error closing session: " + e, e);
-            }
-            try
-            {
-                CloseConsumers(amqe);
-            }
-            catch (QpidException e)
-            {
-                _logger.Error("Error closing session: " + e, e);
-            }
-        }
-
-        /**
-         * Called when the server initiates the closure of the session
-         * unilaterally.
-         * @param e the exception that caused this session to be closed. Null causes the
-         */
-        public void ClosedWithException(Exception e)
-        {
-            lock (_connection.FailoverMutex)
-            {
-                // An AMQException has an error code and message already and will be passed in when closure occurs as a
-                // result of a channel close request
-                SetClosed();
-                AMQException amqe;
-                if (e is AMQException)
-                {
-                    amqe = (AMQException) e;
-                }
-                else
-                {
-                    amqe = new AMQException("Closing session forcibly", e);
-                }
-                _connection.DeregisterSession(_channelId);
-                CloseProducersAndConsumers(amqe);
-            }
-        }
-
-        /// <summary>
-        /// Called to close message producers cleanly. This may or may <b>not</b> be as a result of an error. There is
-        /// currently no way of propagating errors to message producers (this is a JMS limitation).
-        /// </summary>
-        private void CloseProducers()
-        {
-            _logger.Debug("Closing producers on session " + this);
-            // we need to clone the list of producers since the close() method updates the _producers collection
-            // which would result in a concurrent modification exception
-            ArrayList clonedProducers = new ArrayList(_producers.Values);
-            
-            foreach (BasicMessageProducer prod in clonedProducers)
-            {
-                _logger.Debug("Closing producer " + prod);
-                prod.Close();
-            }
-            // at this point the _producers map is empty
-        }
-
-        /// <summary>
-        /// Called to close message consumers cleanly. This may or may <b>not</b> be as a result of an error.
-        /// <param name="error">not null if this is a result of an error occurring at the connection level</param>
-        ///
-        private void CloseConsumers(Exception error)
-        {
-            if (_dispatcher != null)
-            {
-                _dispatcher.StopDispatcher();
-            }
-            // we need to clone the list of consumers since the close() method updates the _consumers collection
-            // which would result in a concurrent modification exception
-            ArrayList clonedConsumers = new ArrayList(_consumers.Values);
-
-            foreach (BasicMessageConsumer con in clonedConsumers)
-            {             
-                if (error != null)
-                {
-                    con.NotifyError(error);
-                }
-                else
-                {
-                    con.Close();
-                }
-            }
-            // at this point the _consumers map will be empty
-        }
-
-        public void Recover()
-        {
-            CheckNotClosed();
-            CheckNotTransacted(); // throws IllegalOperationException if not a transacted session
-
-            // TODO: This cannot be implemented using 0.8 semantics
-            throw new NotImplementedException();
-        }                
-
-        public void Run()
-        {
-            throw new NotImplementedException();
-        }
-
-        public IMessagePublisher CreatePublisher(string exchangeName, string routingKey, DeliveryMode deliveryMode,
-                                               long timeToLive, bool immediate, bool mandatory, int priority)
-        {
-            _logger.Debug(string.Format("Using new CreatePublisher exchangeName={0}, exchangeClass={1} routingKey={2}",
-                              exchangeName, "none", routingKey));
-            return CreateProducerImpl(exchangeName, routingKey, deliveryMode,
-                timeToLive, immediate, mandatory, priority);
-        }
-
-        public IMessagePublisher CreateProducerImpl(string exchangeName, string routingKey,
-                                                    DeliveryMode deliveryMode,
-                                                    long timeToLive, bool immediate, bool mandatory, int priority)
-        {
-            lock (_closingLock)
-            {
-                CheckNotClosed();
-
-                try
-                {
-                    return new BasicMessageProducer(exchangeName, routingKey, _transacted, _channelId,
-                                                    this, GetNextProducerId(),
-                                                    deliveryMode, timeToLive, immediate, mandatory, priority);
-                }
-                catch (AMQException e)
-                {
-                    _logger.Error("Error creating message producer: " + e, e);
-                    throw new QpidException("Error creating message producer", e);
-                }
-            }
-        }
-
-        public IMessageConsumer CreateConsumer(string queueName,
-                                               int prefetchLow,
-                                               int prefetchHigh,
-                                               bool noLocal,
-                                               bool exclusive,
-                                               bool durable,
-                                               string subscriptionName)
-        {
-            _logger.Debug(String.Format("CreateConsumer queueName={0} prefetchLow={1} prefetchHigh={2} noLocal={3} exclusive={4} durable={5} subscriptionName={6}",
-                                  queueName, prefetchLow, prefetchHigh, noLocal, exclusive, durable, subscriptionName));
-            return CreateConsumerImpl(queueName, prefetchLow, prefetchHigh, noLocal, exclusive, durable, subscriptionName);
-        }
-
-        private IMessageConsumer CreateConsumerImpl(string queueName,
-                                                    int prefetchLow,
-                                                    int prefetchHigh,
-                                                    bool noLocal,
-                                                    bool exclusive,
-                                                    bool durable,
-                                                    string subscriptionName)
-        {
-            if (durable || subscriptionName != null)
-            {
-                throw new NotImplementedException(); // TODO: durable subscriptions.
-            }
-
-            lock (_closingLock)
-            {
-                CheckNotClosed();
-               
-                BasicMessageConsumer consumer = new BasicMessageConsumer(_channelId, queueName, noLocal,
-                                                                         _messageFactoryRegistry, this,
-                                                                         prefetchHigh, prefetchLow, exclusive);
-                try
-                {
-                    RegisterConsumer(consumer);
-                }
-                catch (AMQException e)
-                {
-                    throw new QpidException("Error registering consumer: " + e, e);
-                }
-
-                return consumer;
-            }
-        }
-
-        public void Unsubscribe(String name)
-        {
-            throw new NotImplementedException(); // FIXME
-        }
-
-        private void CheckTransacted()
-        {
-            if (!Transacted)
-            {
-                throw new InvalidOperationException("Channel is not transacted");
-            }
-        }
-
-        private void CheckNotTransacted()
-        {
-            if (Transacted)
-            {
-                throw new InvalidOperationException("Channel is transacted");
-            }
-        }
-
-        public void MessageReceived(UnprocessedMessage message)
-        {
-            if (_logger.IsDebugEnabled)
-            {
-                _logger.Debug("Message received in session with channel id " + _channelId);
-            }
-            if ( message.DeliverBody == null )
-            {
-               ReturnBouncedMessage(message);
-            } else
-            {
-               _queue.Enqueue(message);
-            }
-        }
-
-        public int DefaultPrefetch
-        {
-           get { return DefaultPrefetchHigh; }
-        }
-        public int DefaultPrefetchLow
-        {
-            get { return _defaultPrefetchLowMark; }
-        }
-        public int DefaultPrefetchHigh
-        {
-           get { return _defaultPrefetchHighMark; }
-        }
-        public bool IsSuspended
-        {
-           get { return _suspended; }
-        }
-
-        public ushort ChannelId
-        {
-            get
-            {
-                return _channelId;
-            }
-        }
-
-        public AMQConnection Connection
-        {
-            get
-            {
-                return _connection;
-            }
-        }
-        
-        internal void Start()
-        {
-            _dispatcher = new Dispatcher(this);
-            Thread dispatcherThread = new Thread(new ThreadStart(_dispatcher.RunDispatcher));
-            dispatcherThread.IsBackground = true;
-            dispatcherThread.Start();
-        }
-
-        internal void Stop()
-        {
-            Suspend(true);
-            if (_dispatcher != null)
-            {
-                _dispatcher.StopDispatcher();
-            }
-        }
-
-        internal void RegisterConsumer(string consumerTag, IMessageConsumer consumer)
-        {
-            _consumers[consumerTag] =  consumer;
-        }
-
-        /// <summary>
-        /// Called by the MessageConsumer when closing, to deregister the consumer from the
-        /// map from consumerTag to consumer instance.
-        /// </summary>
-        /// <param name="consumerTag">the consumer tag, that was broker-generated</param>        
-        internal void DeregisterConsumer(string consumerTag)
-        {
-            _consumers.Remove(consumerTag);
-        }
-
-        internal void RegisterProducer(long producerId, IMessagePublisher publisher)
-        {
-            _producers[producerId] = publisher;
-        }
-
-        internal void DeregisterProducer(long producerId)
-        {
-            _producers.Remove(producerId);
-        }
-
-        private long GetNextProducerId()
-        {
-            return ++_nextProducerId;
-        }
-        
-        public void Dispose()
-        {
-            Close();
-        }
-
-        /**
-         * Called to mark the session as being closed. Useful when the session needs to be made invalid, e.g. after
-         * failover when the client has veoted resubscription.
-         *
-         * The caller of this method must already hold the failover mutex.
-         */
-        internal void MarkClosed()
-        {
-            SetClosed();
-            _connection.DeregisterSession(_channelId);
-            MarkClosedProducersAndConsumers();
-        }
-
-        private void MarkClosedProducersAndConsumers()
-        {
-            try
-            {
-                // no need for a markClosed* method in this case since there is no protocol traffic closing a producer
-                CloseProducers();
-            }
-            catch (QpidException e)
-            {
-                _logger.Error("Error closing session: " + e, e);
-            }
-            try
-            {
-                MarkClosedConsumers();
-            }
-            catch (QpidException e)
-            {
-                _logger.Error("Error closing session: " + e, e);
-            }
-        }
-
-        private void MarkClosedConsumers()
-        {
-            if (_dispatcher != null)
-            {
-                _dispatcher.StopDispatcher();
-            }
-            // we need to clone the list of consumers since the close() method updates the _consumers collection
-            // which would result in a concurrent modification exception
-            ArrayList clonedConsumers = new ArrayList(_consumers.Values);
-
-            foreach (BasicMessageConsumer consumer in clonedConsumers)
-            {
-                consumer.MarkClosed();
-            }
-            // at this point the _consumers map will be empty
-        }
-
-        public void PurgeQueue(string queueName, bool noWait)
-        {
-            DoPurgeQueue(queueName, noWait);
-        }
-
-        private void DoPurgeQueue(string queueName, bool noWait)
-        {
-            try
-            {
-                _logger.DebugFormat("PurgeQueue {0}", queueName);
-
-                AMQFrame purgeQueue = QueuePurgeBody.CreateAMQFrame(_channelId, 0, queueName, noWait);
-
-                if (noWait)
-                    _connection.ProtocolWriter.Write(purgeQueue);
-                else
-                    _connection.ConvenientProtocolWriter.SyncWrite(purgeQueue, typeof(QueuePurgeOkBody));
-            }
-            catch (AMQException)
-            {
-                throw;
-            }
-        }
-
-        /**
-         * Replays frame on fail over.
-         * 
-         * @throws AMQException
-         */
-        internal void ReplayOnFailOver()
-        {
-            _logger.Debug(string.Format("Replaying frames for channel {0}", _channelId));
-            foreach (AMQFrame frame in _replayFrames)
-            {
-                _logger.Debug(string.Format("Replaying frame=[{0}]", frame));
-                _connection.ProtocolWriter.Write(frame);
-            }
-        }
-
-        /// <summary>
-        /// Callers must hold the failover mutex before calling this method.
-        /// </summary>
-        /// <param name="consumer"></param>
-        void RegisterConsumer(BasicMessageConsumer consumer)
-        {
-            String consumerTag = ConsumeFromQueue(consumer.QueueName, consumer.NoLocal,
-                                           consumer.Exclusive, consumer.AcknowledgeMode);
-            consumer.ConsumerTag = consumerTag;
-            _consumers.Add(consumerTag, consumer);
-        }
-
-        public void Bind(string queueName, string exchangeName, string routingKey, IFieldTable args)
-        {
-            DoBind(queueName, exchangeName, routingKey, (FieldTable)args);            
-        }
-
-        public void Bind(string queueName, string exchangeName, string routingKey)
-        {
-            DoBind(queueName, exchangeName, routingKey, new FieldTable());
-        }
-
-        internal void DoBind(string queueName, string exchangeName, string routingKey, FieldTable args)
-        {
-
-            _logger.Debug(string.Format("QueueBind queueName={0} exchangeName={1} routingKey={2}, arg={3}",
-                                    queueName, exchangeName, routingKey, args));
-
-            AMQFrame queueBind = QueueBindBody.CreateAMQFrame(_channelId, 0,
-                                                              queueName, exchangeName,
-                                                              routingKey, true, args);
-            _replayFrames.Add(queueBind);
-
-            lock (_connection.FailoverMutex)
-            {
-                _connection.ProtocolWriter.Write(queueBind);
-            }
-        }
-
-        private String ConsumeFromQueue(String queueName, bool noLocal, bool exclusive, AcknowledgeMode acknowledgeMode)
-        {
-            // Need to generate a consumer tag on the client so we can exploit the nowait flag.
-            String tag = string.Format("{0}-{1}", _sessionNumber, _nextConsumerNumber++);
-            
-            AMQFrame basicConsume = BasicConsumeBody.CreateAMQFrame(_channelId, 0,
-                                                                  queueName, tag, noLocal,
-                                                                  acknowledgeMode == AcknowledgeMode.NoAcknowledge,
-                                                                  exclusive, true, new FieldTable());
-
-            _replayFrames.Add(basicConsume);
-
-            _connection.ProtocolWriter.Write(basicConsume);
-            return tag;
-        }
-
-        public void DeleteExchange(string exchangeName)
-        {
-            throw new NotImplementedException(); // FIXME
-        }
-
-        public void DeleteQueue(string queueName, bool ifUnused, bool ifEmpty, bool noWait)
-        {
-            DoDeleteQueue(queueName, ifUnused, ifEmpty, noWait);
-        }
-
-        private void DoDeleteQueue(string queueName, bool ifUnused, bool ifEmpty, bool noWait)
-        {
-            try
-            {
-                _logger.Debug(string.Format("DeleteQueue name={0}", queueName));
-                
-                AMQFrame queueDelete = QueueDeleteBody.CreateAMQFrame(_channelId, 0,
-                    queueName, // queueName
-                    ifUnused, // IfUnUsed
-                    ifEmpty, // IfEmpty
-                    noWait); // NoWait
-
-                _replayFrames.Add(queueDelete);
-
-                if (noWait)
-                    _connection.ProtocolWriter.Write(queueDelete);
-                else
-                    _connection.ConvenientProtocolWriter.SyncWrite(queueDelete, typeof(QueueDeleteOkBody));
-            }
-            catch (AMQException)
-            {
-                throw;
-            }
-        }
-
-        public MessageConsumerBuilder CreateConsumerBuilder(string queueName)
-        {
-            return new MessageConsumerBuilder(this, queueName);
-        }
-
-        public MessagePublisherBuilder CreatePublisherBuilder()
-        {
-            return new MessagePublisherBuilder(this);
-        }
-
-        public string GenerateUniqueName()
-        {
-            string result = _connection.ProtocolSession.GenerateQueueName();            
-            return Regex.Replace(result, "[^a-z0-9_]", "_");
-        }
-
-        public void DeclareQueue(string queueName, bool isDurable, bool isExclusive, bool isAutoDelete)
-        {
-            DoQueueDeclare(queueName, isDurable, isExclusive, isAutoDelete);
-        }
-
-        private void DoQueueDeclare(string queueName, bool isDurable, bool isExclusive, bool isAutoDelete)
-        {
-            _logger.Debug(string.Format("DeclareQueue name={0} durable={1} exclusive={2}, auto-delete={3}",
-                                        queueName, isDurable, isExclusive, isAutoDelete));
-
-            AMQFrame queueDeclare = QueueDeclareBody.CreateAMQFrame(_channelId, 0, queueName,
-                                                                    false, isDurable, isExclusive,
-                                                                    isAutoDelete, true, null);
-
-            _replayFrames.Add(queueDeclare);
-
-            lock (_connection.FailoverMutex)
-            {
-                _connection.ProtocolWriter.Write(queueDeclare);
-            }
-        }
-
-        public void DeclareExchange(String exchangeName, String exchangeClass)
-        {
-            _logger.Debug(string.Format("DeclareExchange vame={0} exchangeClass={1}", exchangeName, exchangeClass));
-
-            DeclareExchange(_channelId, 0, exchangeName, exchangeClass, false, false, false, false, true, null);
-        }
-
-        // AMQP-level method.
-        private void DeclareExchange(ushort channelId, ushort ticket, string exchangeName, 
-                                     string exchangeClass, bool passive, bool durable, 
-                                     bool autoDelete, bool xinternal, bool noWait, FieldTable args)
-        {
-            _logger.Debug(String.Format("DeclareExchange channelId={0} exchangeName={1} exchangeClass={2}",
-                                            _channelId, exchangeName, exchangeClass));
-
-            AMQFrame declareExchange = ExchangeDeclareBody.CreateAMQFrame(
-                channelId, ticket, exchangeName, exchangeClass, passive, durable, autoDelete, xinternal, noWait, args);
-
-            _replayFrames.Add(declareExchange);
-            
-            if (noWait)
-            {
-                lock (_connection.FailoverMutex)
-                {
-                    _connection.ProtocolWriter.Write(declareExchange);
-                }
-            }
-            else
-            {
-                throw new NotImplementedException("Don't use nowait=false with DeclareExchange");
-//                _connection.ConvenientProtocolWriter.SyncWrite(declareExchange, typeof (ExchangeDeclareOkBody));
-            }
-        }
-
-        /**
-         * Acknowledge a message or several messages. This method can be called via AbstractJMSMessage or from
-         * a BasicConsumer. The former where the mode is CLIENT_ACK and the latter where the mode is
-         * AUTO_ACK or similar.
-         *
-         * @param deliveryTag the tag of the last message to be acknowledged
-         * @param multiple    if true will acknowledge all messages up to and including the one specified by the
-         *                    delivery tag
-         */
-        internal void AcknowledgeMessage(ulong deliveryTag, bool multiple)
-        {
-            AMQFrame ackFrame = BasicAckBody.CreateAMQFrame(_channelId, deliveryTag, multiple);
-            if (_logger.IsDebugEnabled)
-            {
-                _logger.Debug("Sending ack for delivery tag " + deliveryTag + " on channel " + _channelId);
-            }
-            // FIXME: lock FailoverMutex here?
-            _connection.ProtocolWriter.Write(ackFrame);
-        }
-
-       /// <summary>
-       /// Handle a message that bounced from the server, creating
-       /// the corresponding exception and notifying the connection about it
-       /// </summary>
-       /// <param name="message">Unprocessed message</param>
-       private void ReturnBouncedMessage(UnprocessedMessage message)
-       {
-          try
-          {
-             AbstractQmsMessage bouncedMessage =
-                _messageFactoryRegistry.CreateMessage(
-                     0, false, message.ContentHeader,
-                     message.Bodies
-                );
-
-             int errorCode = message.BounceBody.ReplyCode;
-             string reason = message.BounceBody.ReplyText;
-             _logger.Debug("Message returned with error code " + errorCode + " (" + reason + ")");
-             AMQException exception;
-             if ( errorCode == AMQConstant.NO_CONSUMERS.Code )
-             {
-                exception = new AMQNoConsumersException(reason, bouncedMessage);
-             } else if ( errorCode == AMQConstant.NO_ROUTE.Code )
-             {
-                exception = new AMQNoRouteException(reason, bouncedMessage);
-             } else
-             {
-                exception = new AMQUndeliveredException(errorCode, reason, bouncedMessage);
-             }
-             _connection.ExceptionReceived(exception);
-          } catch ( Exception ex )
-          {
-             _logger.Error("Caught exception trying to raise undelivered message exception (dump follows) - ignoring...", ex);
-          }
-
-       }
-
-       private void OnPrefetchLowMark(int count)
-       {
-          if ( _acknowledgeMode == AcknowledgeMode.NoAcknowledge )
-          {
-             _logger.Warn("Below threshold(" + _defaultPrefetchLowMark + ") so unsuspending channel. Current value is " + count);
-             Suspend(false);
-          }
-       }
-       private void OnPrefetchHighMark(int count)
-       {
-          if ( _acknowledgeMode == AcknowledgeMode.NoAcknowledge )
-          {
-             _logger.Warn("Above threshold(" + _defaultPrefetchHighMark + ") so suspending channel. Current value is " + count);
-             Suspend(true);
-          }
-       }
-
-       private void Suspend(bool suspend)
-       {
-          lock ( _suspensionLock )
-          {
-             if ( _logger.IsDebugEnabled )
-             {
-                _logger.Debug("Setting channel flow : " + (suspend ? "suspended" : "unsuspended"));
-             }
-
-             _suspended = suspend;
-             AMQFrame frame = ChannelFlowBody.CreateAMQFrame(_channelId, !suspend);
-
-             Connection.ConvenientProtocolWriter.SyncWrite(frame, typeof(ChannelFlowOkBody));
-          }
-       }
-
-    }
-}
diff --git a/qpid/dotnet/Qpid.Client/Client/BasicMessageConsumer.cs b/qpid/dotnet/Qpid.Client/Client/BasicMessageConsumer.cs
deleted file mode 100644
index fd4ff79505..0000000000
--- a/qpid/dotnet/Qpid.Client/Client/BasicMessageConsumer.cs
+++ /dev/null
@@ -1,453 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using System;
-using System.Threading;
-using log4net;
-using Apache.Qpid.Client.Message;
-using Apache.Qpid.Collections;
-using Apache.Qpid.Framing;
-using Apache.Qpid.Messaging;
-
-namespace Apache.Qpid.Client
-{
-    public class BasicMessageConsumer : Closeable, IMessageConsumer
-    {
-        private static readonly ILog _logger = LogManager.GetLogger(typeof(BasicMessageConsumer));
-
-        private bool _noLocal;
-
-        /**
-         * We store the exclusive field in order to be able to reuse it when resubscribing in the event of failover
-         */
-        private bool _exclusive;
-
-        public bool Exclusive
-        {
-            get { return _exclusive; }
-        }
-
-        public bool NoLocal
-        {
-            get { return _noLocal; }
-            set { _noLocal = value; }
-        }
-
-        private AcknowledgeMode _acknowledgeMode;
-
-        public AcknowledgeMode AcknowledgeMode
-        {
-            get { return _acknowledgeMode; }
-        }
-
-        private MessageReceivedDelegate _messageListener;
-
-        private bool IsMessageListenerSet
-        {
-            get { return _messageListener != null; }
-        }
-
-        /// <summary>
-        /// The consumer tag allows us to close the consumer by sending a jmsCancel method to the
-        /// broker
-        /// </summary>
-        private string _consumerTag;
-
-        /// <summary>
-        /// We need to know the channel id when constructing frames
-        /// </summary>
-        private ushort _channelId;
-
-        private readonly string _queueName;
-
-        /// <summary>
-        /// Protects the setting of a messageListener
-        /// </summary>
-        private readonly object _syncLock = new object();
-
-        /// <summary>
-        /// We store the high water prefetch field in order to be able to reuse it when resubscribing in the event of failover
-        /// </summary>
-        private int _prefetchHigh;
-
-        /// <summary>
-        /// We store the low water prefetch field in order to be able to reuse it when resubscribing in the event of failover
-        /// </summary>
-        private int _prefetchLow;
-
-        /// <summary>
-        /// When true indicates that either a message listener is set or that
-        /// a blocking receive call is in progress
-        /// </summary>
-        private bool _receiving;
-
-        /// <summary>
-        /// Used in the blocking receive methods to receive a message from
-        /// the Channel thread. 
-        /// </summary>
-        private readonly ConsumerProducerQueue _messageQueue = new ConsumerProducerQueue();
-
-        private MessageFactoryRegistry _messageFactory;
-
-        private AmqChannel _channel;
-
-        /// <summary>
-        /// Tag of last message delievered, whoch should be acknowledged on commit in transaction mode.
-        /// </summary>
-        private long _lastDeliveryTag;
-
-        /// <summary>
-        /// Number of messages unacknowledged in DUPS_OK_ACKNOWLEDGE mode
-        /// </summary>
-        private int _outstanding;
-
-        /// <summary>
-        /// Switch to enable sending of acknowledgements when using DUPS_OK_ACKNOWLEDGE mode.
-        /// Enabled when _outstannding number of msgs >= _prefetchHigh and disabled at < _prefetchLow
-        /// </summary>
-        private bool _dups_ok_acknowledge_send;
-
-        internal BasicMessageConsumer(ushort channelId, string queueName, bool noLocal,
-                                      MessageFactoryRegistry messageFactory, AmqChannel channel,
-                                      int prefetchHigh, int prefetchLow, bool exclusive)
-        {
-            _channelId = channelId;
-            _queueName = queueName;
-            _noLocal = noLocal;
-            _messageFactory = messageFactory;
-            _channel = channel;
-            _acknowledgeMode = _channel.AcknowledgeMode;
-            _prefetchHigh = prefetchHigh;
-            _prefetchLow = prefetchLow;
-            _exclusive = exclusive;
-        }
-
-        #region IMessageConsumer Members
-
-        public MessageReceivedDelegate OnMessage
-        {
-            get
-            {
-                return _messageListener;
-            }
-            set
-            {
-                CheckNotClosed();
-
-                lock (_syncLock)
-                {
-                    // If someone is already receiving
-                    if (_messageListener != null && _receiving)
-                    {
-                        throw new InvalidOperationException("Another thread is already receiving...");
-                    }
-
-                    _messageListener = value;
-
-                    _receiving = (_messageListener != null);
-
-                    if (_receiving)
-                    {
-                        _logger.Debug("Message listener set for queue with name " + _queueName);
-                    }
-                }
-            }
-        }
-
-        public IMessage Receive(long delay)
-        {
-            CheckNotClosed();
-
-            lock (_syncLock)
-            {
-                // If someone is already receiving
-                if (_receiving)
-                {
-                    throw new InvalidOperationException("Another thread is already receiving (possibly asynchronously)...");
-                }
-
-                _receiving = true;
-            }
-
-            try
-            {
-                object o = _messageQueue.Dequeue(delay);
-                
-                return ReturnMessageOrThrowAndPostDeliver(o);
-            }
-            finally
-            {
-                lock (_syncLock)
-                {
-                    _receiving = false;
-                }
-            }
-        }
-
-        private IMessage ReturnMessageOrThrowAndPostDeliver(object o)
-        {
-            IMessage m = ReturnMessageOrThrow(o);
-            if (m != null)
-            {
-                PostDeliver(m);
-            }
-            return m;
-        }
-
-        public IMessage Receive()
-        {
-            return Receive(Timeout.Infinite);
-        }
-
-        public IMessage ReceiveNoWait()
-        {
-           return Receive(0);
-        }
-
-        #endregion
-
-        /// <summary>
-        /// We can get back either a Message or an exception from the queue. This method examines the argument and deals
-        /// with it by throwing it (if an exception) or returning it (in any other case).
-        /// </summary>
-        /// <param name="o">the object off the queue</param>
-        /// <returns> a message only if o is a Message</returns>
-        /// <exception>JMSException if the argument is a throwable. If it is a QpidMessagingException it is rethrown as is, but if not
-        /// a QpidMessagingException is created with the linked exception set appropriately</exception>
-        private IMessage ReturnMessageOrThrow(object o)
-        {
-            // errors are passed via the queue too since there is no way of interrupting the poll() via the API.
-            if (o is Exception)
-            {
-                Exception e = (Exception) o;
-                throw new QpidException("Message consumer forcibly closed due to error: " + e, e);
-            }
-            else
-            {
-                return (IMessage) o;
-            }
-        }
-
-        #region IDisposable Members
-
-        public void Dispose()
-        {
-            Close();
-        }
-
-        #endregion
-
-        public override void Close()
-        {
-            // FIXME: Don't we need FailoverSupport here (as we have SyncWrite). i.e. rather than just locking FailOverMutex
-            lock (_channel.Connection.FailoverMutex)
-            {
-                lock (_closingLock)
-                {
-                    Interlocked.Exchange(ref _closed, CLOSED);
-
-                    AMQFrame cancelFrame = BasicCancelBody.CreateAMQFrame(_channelId, _consumerTag, false);
-
-                    try
-                    {
-                        _channel.Connection.ConvenientProtocolWriter.SyncWrite(
-                            cancelFrame, typeof(BasicCancelOkBody));
-                    }
-                    catch (AMQException e)
-                    {
-                        _logger.Error("Error closing consumer: " + e, e);
-                        throw new QpidException("Error closing consumer: " + e);
-                    }
-                    finally
-                    {
-                        DeregisterConsumer();
-                    }
-                }
-            }
-        }
-
-        /**
-         * Called from the AMQSession when a message has arrived for this consumer. This methods handles both the case
-         * of a message listener or a synchronous receive() caller.
-         *
-         * @param messageFrame the raw unprocessed mesage
-         * @param channelId    channel on which this message was sent
-         */
-        internal void NotifyMessage(UnprocessedMessage messageFrame, int channelId)
-        {
-            if (_logger.IsDebugEnabled)
-            {
-                _logger.Debug("notifyMessage called with message number " + messageFrame.DeliverBody.DeliveryTag);
-            }
-            try
-            {
-                AbstractQmsMessage jmsMessage = _messageFactory.CreateMessage((long)messageFrame.DeliverBody.DeliveryTag,
-                                                                              messageFrame.DeliverBody.Redelivered,
-                                                                              messageFrame.ContentHeader,
-                                                                              messageFrame.Bodies);
-
-                _logger.Debug("Message is of type: " + jmsMessage.GetType().Name);
-
-                PreDeliver(jmsMessage);
-
-                if (IsMessageListenerSet)
-                {
-                    // We do not need a lock around the test above, and the dispatch below as it is invalid
-                    // for an application to alter an installed listener while the session is started.
-#if __MonoCS__
-                        _messageListener(jmsMessage);
-#else
-                    _messageListener.Invoke(jmsMessage);
-#endif
-                    PostDeliver(jmsMessage);
-                }
-                else
-                {
-                    _messageQueue.Enqueue(jmsMessage);
-                }
-            }
-            catch (Exception e)
-            {
-                _logger.Error("Caught exception (dump follows) - ignoring...", e); // FIXME
-            }
-        }
-
-
-        internal void NotifyError(Exception cause)
-        {
-            lock (_syncLock)
-            {
-                SetClosed();
-
-                // we have no way of propagating the exception to a message listener - a JMS limitation - so we
-                // deal with the case where we have a synchronous receive() waiting for a message to arrive
-                if (_messageListener == null)
-                {
-                    // offer only succeeds if there is a thread waiting for an item from the queue
-                   _messageQueue.Enqueue(cause);
-                    _logger.Debug("Passed exception to synchronous queue for propagation to receive()");
-                }
-                DeregisterConsumer();
-            }
-        }
-
-        private void SetClosed()
-        {
-            Interlocked.Exchange(ref _closed, CLOSED);
-        }
-
-        /// <summary>
-        /// Perform cleanup to deregister this consumer. This occurs when closing the consumer in both the clean
-        /// case and in the case of an error occurring.
-        /// </summary>
-        internal void DeregisterConsumer()
-        {
-            _channel.DeregisterConsumer(_consumerTag);
-        }
-
-        public string ConsumerTag
-        {
-            get
-            {
-                return _consumerTag;
-            }
-            set
-            {
-                _consumerTag = value;
-            }
-        }
-
-        /**
-         * Called when you need to invalidate a consumer. Used for example when failover has occurred and the
-         * client has vetoed automatic resubscription.
-         * The caller must hold the failover mutex.
-         */
-        internal void MarkClosed()
-        {
-            SetClosed();
-            DeregisterConsumer();
-        }
-
-        public string QueueName
-        {
-            get { return _queueName; }
-        }
-
-        /// <summary>
-        /// Acknowledge up to last message delivered (if any). Used when commiting.
-        /// </summary>
-        internal void AcknowledgeLastDelivered()
-        {
-            if (_lastDeliveryTag > 0)
-            {
-                _channel.AcknowledgeMessage((ulong)_lastDeliveryTag, true); // XXX evil cast
-                _lastDeliveryTag = -1;
-            }
-        }
-
-        private void PreDeliver(AbstractQmsMessage msg)
-        {
-            switch (AcknowledgeMode)
-            {
-                case AcknowledgeMode.PreAcknowledge:
-                    _channel.AcknowledgeMessage((ulong)msg.DeliveryTag, false);
-                    break;
-
-                case AcknowledgeMode.ClientAcknowledge:
-                    // We set the session so that when the user calls acknowledge() it can call the method on session
-                    // to send out the appropriate frame.
-                    //msg.setAMQSession(_session);
-                    msg.Channel = _channel;
-                    break;
-            }
-        }
-
-        private void PostDeliver(IMessage m)
-        {
-            AbstractQmsMessage msg = (AbstractQmsMessage) m;
-            switch (AcknowledgeMode)
-            {
-                case AcknowledgeMode.DupsOkAcknowledge:
-                    if (++_outstanding >= _prefetchHigh)
-                    {
-                        _dups_ok_acknowledge_send = true;
-                    }
-                    if (_outstanding <= _prefetchLow)
-                    {
-                        _dups_ok_acknowledge_send = false;
-                    }
-                    if (_dups_ok_acknowledge_send)
-                    {
-                        _channel.AcknowledgeMessage((ulong)msg.DeliveryTag, true);
-                    }
-                    break;
-
-                case AcknowledgeMode.AutoAcknowledge:
-                    _channel.AcknowledgeMessage((ulong)msg.DeliveryTag, true);
-                    break;
-                
-                case AcknowledgeMode.SessionTransacted:
-                    _lastDeliveryTag = msg.DeliveryTag;
-                    break;
-            }
-        }
-
-    }
-}
diff --git a/qpid/dotnet/Qpid.Client/Client/BasicMessageProducer.cs b/qpid/dotnet/Qpid.Client/Client/BasicMessageProducer.cs
deleted file mode 100644
index ca6d2abee5..0000000000
--- a/qpid/dotnet/Qpid.Client/Client/BasicMessageProducer.cs
+++ /dev/null
@@ -1,402 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using System;
-using System.Threading;
-using log4net;
-using Apache.Qpid.Buffer;
-using Apache.Qpid.Client.Message;
-using Apache.Qpid.Messaging;
-using Apache.Qpid.Framing;
-
-namespace Apache.Qpid.Client
-{
-   public class BasicMessageProducer : Closeable, IMessagePublisher
-   {
-      protected readonly ILog _logger = LogManager.GetLogger(typeof(BasicMessageProducer));
-
-      /// <summary>
-      /// If true, messages will not get a timestamp.
-      /// </summary>
-      private bool _disableTimestamps;
-
-      /// <summary>
-      /// Priority of messages created by this producer.
-      /// </summary>
-      private int _messagePriority;
-
-      /// <summary>
-      /// Time to live of messages. Specified in milliseconds but AMQ has 1 second resolution.
-      /// </summary>
-      private long _timeToLive;
-
-      /// <summary>
-      /// Delivery mode used for this producer.
-      /// </summary>
-      private DeliveryMode _deliveryMode;
-
-      private bool _immediate;
-      private bool _mandatory;
-
-      string _exchangeName;
-      string _routingKey;
-
-      /// <summary>
-      /// Default encoding used for messages produced by this producer.
-      /// </summary>
-      private string _encoding;
-
-      /// <summary>
-      /// Default encoding used for message produced by this producer.
-      /// </summary>
-      private string _mimeType;
-
-      /// <summary>
-      /// True if this producer was created from a transacted session
-      /// </summary>
-      private bool _transacted;
-
-      private ushort _channelId;
-
-      /// <summary>
-      /// This is an id generated by the session and is used to tie individual producers to the session. This means we
-      /// can deregister a producer with the session when the producer is closed. We need to be able to tie producers
-      /// to the session so that when an error is propagated to the session it can close the producer (meaning that
-      /// a client that happens to hold onto a producer reference will get an error if he tries to use it subsequently).
-      /// </summary>
-      private long _producerId;
-
-      /// <summary>
-      /// The session used to create this producer
-      /// </summary>
-      private AmqChannel _channel;
-
-      public BasicMessageProducer(string exchangeName, string routingKey,
-          bool transacted,
-          ushort channelId,
-          AmqChannel channel,
-          long producerId,
-          DeliveryMode deliveryMode,
-          long timeToLive,
-          bool immediate,
-          bool mandatory,
-          int priority)
-      {
-         _exchangeName = exchangeName;
-         _routingKey = routingKey;
-         _transacted = transacted;
-         _channelId = channelId;
-         _channel = channel;
-         _producerId = producerId;
-         _deliveryMode = deliveryMode;
-         _timeToLive = timeToLive;
-         _immediate = immediate;
-         _mandatory = mandatory;
-         _messagePriority = priority;
-
-         _channel.RegisterProducer(producerId, this);
-      }
-
-
-      #region IMessagePublisher Members
-
-      public DeliveryMode DeliveryMode
-      {
-         get
-         {
-            CheckNotClosed();
-            return _deliveryMode;
-         }
-         set
-         {
-            CheckNotClosed();
-            _deliveryMode = value;
-         }
-      }
-
-      public string ExchangeName
-      {
-         get { return _exchangeName; }
-      }
-
-      public string RoutingKey
-      {
-         get { return _routingKey; }
-      }
-
-      public bool DisableMessageID
-      {
-         get
-         {
-            throw new Exception("The method or operation is not implemented.");
-         }
-         set
-         {
-            throw new Exception("The method or operation is not implemented.");
-         }
-      }
-
-      public bool DisableMessageTimestamp
-      {
-         get
-         {
-            CheckNotClosed();
-            return _disableTimestamps;
-         }
-         set
-         {
-            CheckNotClosed();
-            _disableTimestamps = value;
-         }
-      }
-
-      public int Priority
-      {
-         get
-         {
-            CheckNotClosed();
-            return _messagePriority;
-         }
-         set
-         {
-            CheckNotClosed();
-            if ( value < 0 || value > 9 )
-            {
-               throw new ArgumentOutOfRangeException("Priority of " + value + " is illegal. Value must be in range 0 to 9");
-            }
-            _messagePriority = value;
-         }
-      }
-
-      public override void Close()
-      {
-         _logger.Debug("Closing producer " + this);
-         Interlocked.Exchange(ref _closed, CLOSED);
-         _channel.DeregisterProducer(_producerId);
-      }
-
-      public void Send(IMessage msg, DeliveryMode deliveryMode, int priority, long timeToLive)
-      {
-         CheckNotClosed();
-         SendImpl(
-            _exchangeName, 
-            _routingKey, 
-            (AbstractQmsMessage)msg, 
-            deliveryMode, 
-            priority, 
-            (uint)timeToLive, 
-            _mandatory,
-            _immediate
-            );
-      }
-
-      public void Send(IMessage msg)
-      {
-         CheckNotClosed();
-         SendImpl(
-            _exchangeName, 
-            _routingKey, 
-            (AbstractQmsMessage)msg, 
-            _deliveryMode, 
-            _messagePriority, 
-            (uint)_timeToLive,
-            _mandatory, 
-            _immediate
-            );
-      }
-
-      // This is a short-term hack (knowing that this code will be re-vamped sometime soon)
-      // to facilitate publishing messages to potentially non-existent recipients.
-      public void Send(IMessage msg, bool mandatory)
-      {
-         CheckNotClosed();
-         SendImpl(
-            _exchangeName, 
-            _routingKey, 
-            (AbstractQmsMessage)msg, 
-            _deliveryMode, 
-            _messagePriority, 
-            (uint)_timeToLive,
-            mandatory, 
-            _immediate
-            );
-      }
-
-      public long TimeToLive
-      {
-         get
-         {
-            CheckNotClosed();
-            return _timeToLive;
-         }
-         set
-         {
-            CheckNotClosed();
-            if ( value < 0 )
-            {
-               throw new ArgumentOutOfRangeException("Time to live must be non-negative - supplied value was " + value);
-            }
-            _timeToLive = value;
-         }
-      }
-
-      #endregion
-
-      public string MimeType
-      {
-         get
-         {
-            CheckNotClosed();
-            return _mimeType;
-         }
-         set
-         {
-            CheckNotClosed();
-            _mimeType = value;
-         }
-      }
-
-      public string Encoding
-      {
-         get
-         {
-            CheckNotClosed();
-            return _encoding;
-         }
-         set
-         {
-            CheckNotClosed();
-            _encoding = value;
-         }
-      }
-
-      public void Dispose()
-      {
-         Close();
-      }
-
-      #region Message Publishing
-
-      private void SendImpl(string exchangeName, string routingKey, AbstractQmsMessage message, DeliveryMode deliveryMode, int priority, uint timeToLive, bool mandatory, bool immediate)
-      {
-         // todo: handle session access ticket
-         AMQFrame publishFrame = BasicPublishBody.CreateAMQFrame(
-            _channel.ChannelId, 0, exchangeName,
-            routingKey, mandatory, immediate
-            );
-
-         // fix message properties
-         if ( !_disableTimestamps )
-         {
-            message.Timestamp = DateTime.UtcNow.Ticks;
-            message.Expiration = message.Timestamp + timeToLive;
-         } else
-         {
-            message.Expiration = 0;
-         }
-         message.DeliveryMode = deliveryMode;
-         message.Priority = (byte)priority;
-
-         ByteBuffer payload = message.Data;
-         int payloadLength = payload.Limit;
-
-         ContentBody[] contentBodies = CreateContentBodies(payload);
-         AMQFrame[] frames = new AMQFrame[2 + contentBodies.Length];
-         for ( int i = 0; i < contentBodies.Length; i++ )
-         {
-            frames[2 + i] = ContentBody.CreateAMQFrame(_channelId, contentBodies[i]);
-         }
-         if ( contentBodies.Length > 0 && _logger.IsDebugEnabled )
-         {
-            _logger.Debug(string.Format("Sending content body frames to {{exchangeName={0} routingKey={1}}}", exchangeName, routingKey));
-         }
-
-         // weight argument of zero indicates no child content headers, just bodies
-         AMQFrame contentHeaderFrame = ContentHeaderBody.CreateAMQFrame(
-            _channelId, AmqChannel.BASIC_CONTENT_TYPE, 0, 
-            message.ContentHeaderProperties, (uint)payloadLength
-            );
-         if ( _logger.IsDebugEnabled )
-         {
-            _logger.Debug(string.Format("Sending content header frame to  {{exchangeName={0} routingKey={1}}}", exchangeName, routingKey));
-         }
-
-         frames[0] = publishFrame;
-         frames[1] = contentHeaderFrame;
-         CompositeAMQDataBlock compositeFrame = new CompositeAMQDataBlock(frames);
-
-         lock ( _channel.Connection.FailoverMutex )
-         {
-            _channel.Connection.ProtocolWriter.Write(compositeFrame);
-         }
-      }
-
-
-      /// <summary>
-      /// Create content bodies. This will split a large message into numerous bodies depending on the negotiated
-      /// maximum frame size.
-      /// </summary>
-      /// <param name="payload"></param>
-      /// <returns>return the array of content bodies</returns>
-      private ContentBody[] CreateContentBodies(ByteBuffer payload)
-      {
-         if ( payload == null )
-         {
-            return null;
-         } else if ( payload.Remaining == 0 )
-         {
-            return new ContentBody[0];
-         }
-         // we substract one from the total frame maximum size to account for the end of frame marker in a body frame
-         // (0xCE byte).
-         int framePayloadMax = (int)(_channel.Connection.MaximumFrameSize - 1);
-         int frameCount = CalculateContentBodyFrames(payload);
-         ContentBody[] bodies = new ContentBody[frameCount];
-         for ( int i = 0; i < frameCount; i++ )
-         {
-            int length = (payload.Remaining >= framePayloadMax)
-               ? framePayloadMax : payload.Remaining;
-            bodies[i] = new ContentBody(payload, (uint)length);
-         }
-         return bodies;
-      }
-
-      private int CalculateContentBodyFrames(ByteBuffer payload)
-      {
-         // we substract one from the total frame maximum size to account 
-         // for the end of frame marker in a body frame
-         // (0xCE byte).
-         int frameCount;
-         if ( (payload == null) || (payload.Remaining == 0) )
-         {
-            frameCount = 0;
-         } else
-         {
-            int dataLength = payload.Remaining;
-            int framePayloadMax = (int)_channel.Connection.MaximumFrameSize - 1;
-            int lastFrame = ((dataLength % framePayloadMax) > 0) ? 1 : 0;
-            frameCount = (int)(dataLength / framePayloadMax) + lastFrame;
-         }
-
-         return frameCount;
-      }
-      #endregion // Message Publishing
-   }
-}
diff --git a/qpid/dotnet/Qpid.Client/Client/Closeable.cs b/qpid/dotnet/Qpid.Client/Client/Closeable.cs
deleted file mode 100644
index d70f75ee6b..0000000000
--- a/qpid/dotnet/Qpid.Client/Client/Closeable.cs
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using System;
-
-namespace Apache.Qpid.Client
-{
-    public abstract class Closeable
-    {
-        /// <summary>
-        /// Used to ensure orderly closing of the object. The only method that is allowed to be called
-        /// from another thread of control is close().
-        /// </summary>
-        protected readonly object _closingLock = new object();
-
-        /// <summary>
-        /// All access to this field should be using the Inerlocked class, to make it atomic.
-        /// Hence it is an int since you cannot use a bool with the Interlocked class.
-        /// </summary>
-        protected int _closed = NOT_CLOSED;
-
-        protected const int CLOSED = 1;
-        protected const int NOT_CLOSED = 2;
-
-        /// <summary>
-        /// Checks the not closed.
-        /// </summary>
-        protected void CheckNotClosed()
-        {
-            if (_closed == CLOSED)
-            {
-                throw new InvalidOperationException("Object " + ToString() + " has been closed");
-            }
-        }
-
-        /// <summary>
-        /// Gets a value indicating whether this <see cref="Closeable"/> is closed.
-        /// </summary>
-        /// <value><c>true</c> if closed; otherwise, <c>false</c>.</value>
-        public bool Closed
-        {
-            get
-            {
-                return _closed == CLOSED;
-            }
-        }
-
-        /// <summary>
-        /// Close the resource
-        /// </summary>
-        /// <exception cref="QpidMessagingException">If something goes wrong</exception>
-        public abstract void Close();
-    }
-}
diff --git a/qpid/dotnet/Qpid.Client/Client/Configuration/AuthenticationConfigurationSectionHandler.cs b/qpid/dotnet/Qpid.Client/Client/Configuration/AuthenticationConfigurationSectionHandler.cs
deleted file mode 100644
index ae9225a53a..0000000000
--- a/qpid/dotnet/Qpid.Client/Client/Configuration/AuthenticationConfigurationSectionHandler.cs
+++ /dev/null
@@ -1,84 +0,0 @@
-/*

- *

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- *

- */

-

-using System;

-using System.Collections;

-using System.Collections.Specialized;

-using System.Configuration;

-using System.Text;

-

-using Apache.Qpid.Client.Security;

-using Apache.Qpid.Sasl.Mechanisms;

-

-namespace Apache.Qpid.Client.Configuration

-{

-   public class AuthenticationConfigurationSectionHandler 

-      : IConfigurationSectionHandler

-   {

-

-      public object Create(object parent, object configContext, System.Xml.XmlNode section)

-      {

-         NameValueSectionHandler handler = new NameValueSectionHandler();

-         OrderedHashTable schemes = new OrderedHashTable();

-

-         NameValueCollection options = (NameValueCollection)

-            handler.Create(parent, configContext, section);

-

-         if ( options != null )

-         {

-            foreach ( string key in options.Keys )

-            {

-               Type type = Type.GetType(options[key]);

-               if ( type == null )

-                  throw new ConfigurationException(string.Format("Type '{0}' not found", key));

-               if ( !typeof(IAMQCallbackHandler).IsAssignableFrom(type) )

-                  throw new ConfigurationException(string.Format("Type '{0}' does not implement IAMQCallbackHandler", key));

-

-               schemes.Add(key, type);

-            }

-         }

-

-         return schemes;

-      }

-

-   } // class AuthenticationConfigurationSectionHandler

-

-   public class OrderedHashTable : Hashtable

-   {

-      private ArrayList _keys = new ArrayList();

-

-      public IList OrderedKeys

-      {

-         get { return _keys; }

-      }

-

-      public override void Add(object key, object value)

-      {

-         base.Add(key, value);

-         _keys.Add(key);

-      }

-      public override void Remove(object key)

-      {

-         base.Remove(key);

-         _keys.Remove(key);

-      }

-   }

-} // namespace Apache.Qpid.Client.Configuration

diff --git a/qpid/dotnet/Qpid.Client/Client/ConnectionTuneParameters.cs b/qpid/dotnet/Qpid.Client/Client/ConnectionTuneParameters.cs
deleted file mode 100644
index b21486bfa8..0000000000
--- a/qpid/dotnet/Qpid.Client/Client/ConnectionTuneParameters.cs
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-namespace Apache.Qpid.Client
-{
-    public class ConnectionTuneParameters
-    {
-        private uint _frameMax;
-
-        private ushort _channelMax;
-
-        private uint _hearbeat;
-
-        private uint _txnLimit;
-
-        public uint FrameMax
-        {
-            get
-            {
-                return _frameMax;
-            }
-            set
-            {
-                _frameMax = value;
-            }
-        }
-
-        public ushort ChannelMax
-        {
-            get
-            {
-                return _channelMax;
-            }
-            set
-            {
-                _channelMax = value;
-            }
-        }
-
-        public uint Heartbeat
-        {
-            get
-            {
-                return _hearbeat;
-            }
-            set
-            {
-                _hearbeat = value;
-            }
-        }
-
-        public uint TxnLimit
-        {
-            get
-            {
-                return _txnLimit;
-            }
-            set
-            {
-                _txnLimit = value;
-            }
-        }
-    }
-}
-
-
diff --git a/qpid/dotnet/Qpid.Client/Client/Failover/FailoverException.cs b/qpid/dotnet/Qpid.Client/Client/Failover/FailoverException.cs
deleted file mode 100644
index 7013746414..0000000000
--- a/qpid/dotnet/Qpid.Client/Client/Failover/FailoverException.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using System;
-using System.Runtime.Serialization;
-
-namespace Apache.Qpid.Client.Failover
-{
-    /// <summary>
-    /// This exception is thrown when failover is taking place and we need to let other
-    /// parts of the client know about this.
-    /// </summary>
-    [Serializable]
-    class FailoverException : Exception
-    {
-        public FailoverException(String message) : base(message)
-        {
-        }
-
-        protected FailoverException(SerializationInfo info, StreamingContext ctxt)
-           : base(info, ctxt)
-        {
-        }
-    }
-}
diff --git a/qpid/dotnet/Qpid.Client/Client/Failover/FailoverHandler.cs b/qpid/dotnet/Qpid.Client/Client/Failover/FailoverHandler.cs
deleted file mode 100644
index 83c69b7d25..0000000000
--- a/qpid/dotnet/Qpid.Client/Client/Failover/FailoverHandler.cs
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using System;
-using System.Threading;
-using log4net;
-using Apache.Qpid.Client.Protocol;
-using Apache.Qpid.Client.State;
-
-namespace Apache.Qpid.Client.Failover
-{
-    public class FailoverHandler
-    {
-        private static readonly ILog _log = LogManager.GetLogger(typeof(FailoverHandler));
-
-        private AMQConnection _connection;
-
-        /**
-         * Used where forcing the failover host
-         */
-        private String _host;
-
-        /**
-         * Used where forcing the failover port
-         */
-        private int _port;
-
-        public FailoverHandler(AMQConnection connection)
-        {
-            _connection = connection;
-        }
-
-        public void Run()
-        {
-            if (Thread.CurrentThread.IsBackground)
-            {
-                throw new InvalidOperationException("FailoverHandler must Run on a non-background thread.");
-            }
-
-            AMQProtocolListener pl = _connection.ProtocolListener;
-            pl.FailoverLatch = new ManualResetEvent(false);
-
-            // We wake up listeners. If they can handle failover, they will extend the
-            // FailoverSupport class and will in turn block on the latch until failover
-            // has completed before retrying the operation
-            _connection.ProtocolListener.PropagateExceptionToWaiters(new FailoverException("Failing over about to start"));
-
-            // Since failover impacts several structures we protect them all with a single mutex. These structures
-            // are also in child objects of the connection. This allows us to manipulate them without affecting
-            // client code which runs in a separate thread.
-            lock (_connection.FailoverMutex)
-            {
-                _log.Info("Starting failover process");
-
-                // We switch in a new state manager temporarily so that the interaction to get to the "connection open"
-                // state works, without us having to terminate any existing "state waiters". We could theoretically
-                // have a state waiter waiting until the connection is closed for some reason. Or in future we may have
-                // a slightly more complex state model therefore I felt it was worthwhile doing this.
-                AMQStateManager existingStateManager = _connection.ProtocolListener.StateManager;
-                _connection.ProtocolListener.StateManager = new AMQStateManager();
-                if (!_connection.FirePreFailover(_host != null))
-                {
-                    _connection.ProtocolListener.StateManager = existingStateManager;
-                    if (_host != null)
-                    {
-                        _connection.ExceptionReceived(new AMQDisconnectedException("Redirect was vetoed by client"));
-                    }
-                    else
-                    {
-                        _connection.ExceptionReceived(new AMQDisconnectedException("Failover was vetoed by client"));
-                    }
-                    pl.FailoverLatch.Set();
-                    pl.FailoverLatch = null;
-                    return;
-                }
-                bool failoverSucceeded;
-                // when host is non null we have a specified failover host otherwise we all the client to cycle through
-                // all specified hosts
-
-                // if _host has value then we are performing a redirect.
-                if (_host != null)
-                {
-                   // todo: fix SSL support!
-                    failoverSucceeded = _connection.AttemptReconnection(_host, _port, null);
-                }
-                else
-                {
-                    failoverSucceeded = _connection.AttemptReconnection();
-                }
-
-                // XXX: at this point it appears that we are going to set StateManager to existingStateManager in
-                // XXX: both paths of control.
-                if (!failoverSucceeded)
-                {
-                    _connection.ProtocolListener.StateManager = existingStateManager;
-                    _connection.ExceptionReceived(
-                        new AMQDisconnectedException("Server closed connection and no failover " +
-                                                     "was successful"));
-                }
-                else
-                {
-                    _connection.ProtocolListener.StateManager = existingStateManager;
-                    try
-                    {
-                        if (_connection.FirePreResubscribe())
-                        {
-                            _log.Info("Resubscribing on new connection");
-                            _connection.ResubscribeChannels();
-                        }
-                        else
-                        {
-                            _log.Info("Client vetoed automatic resubscription");
-                        }
-                        _connection.FireFailoverComplete();
-                        _connection.ProtocolListener.FailoverState = FailoverState.NOT_STARTED;
-                        _log.Info("Connection failover completed successfully");
-                    }
-                    catch (Exception e)
-                    {
-                        _log.Info("Failover process failed - exception being propagated by protocol handler");
-                        _connection.ProtocolListener.FailoverState = FailoverState.FAILED;
-                        try
-                        {
-                            _connection.ProtocolListener.OnException(e);
-                        }
-                        catch (Exception ex)
-                        {
-                            _log.Error("Error notifying protocol session of error: " + ex, ex);
-                        }
-                    }
-                }
-            }
-            pl.FailoverLatch.Set();
-        }
-
-        public String getHost()
-        {
-            return _host;
-        }
-
-        public void setHost(String host)
-        {
-            _host = host;
-        }
-
-        public int getPort()
-        {
-            return _port;
-        }
-
-        public void setPort(int port)
-        {
-            _port = port;
-        }
-    }
-}
-
-
diff --git a/qpid/dotnet/Qpid.Client/Client/Failover/FailoverState.cs b/qpid/dotnet/Qpid.Client/Client/Failover/FailoverState.cs
deleted file mode 100644
index 3058cdcd69..0000000000
--- a/qpid/dotnet/Qpid.Client/Client/Failover/FailoverState.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-namespace Apache.Qpid.Client.Failover
-{
-    /// <summary>
-    /// Enumeration of failover states. Used to handle failover from within AMQProtocolHandler where MINA events need to be
-    /// dealt with and can happen during failover.
-    /// </summary>
-    enum FailoverState
-    {
-        NOT_STARTED, IN_PROGRESS, FAILED
-    }
-}
diff --git a/qpid/dotnet/Qpid.Client/Client/Failover/FailoverSupport.cs b/qpid/dotnet/Qpid.Client/Client/Failover/FailoverSupport.cs
deleted file mode 100644
index afa5301f39..0000000000
--- a/qpid/dotnet/Qpid.Client/Client/Failover/FailoverSupport.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using log4net;
-
-namespace Apache.Qpid.Client.Failover
-{
-    public abstract class FailoverSupport
-    {
-        private static readonly ILog _log = LogManager.GetLogger(typeof(FailoverSupport));
-
-        public object execute(AMQConnection con)
-        {
-            // We wait until we are not in the middle of failover before acquiring the mutex and then proceeding.
-            // Any method that can potentially block for any reason should use this class so that deadlock will not
-            // occur. The FailoverException is propagated by the AMQProtocolHandler to any listeners (e.g. frame listeners)
-            // that might be causing a block. When that happens, the exception is caught here and the mutex is released
-            // before waiting for the failover to complete (either successfully or unsuccessfully).
-            while (true)
-            {
-                con.ProtocolListener.BlockUntilNotFailingOver();
-                lock (con.FailoverMutex)
-                {
-                    try
-                    {
-                        return operation();
-                    }
-                    catch (FailoverException e)
-                    {
-                        _log.Info("Failover exception caught during operation", e);
-                    }
-                }
-            }
-        }
-
-        protected abstract object operation();
-    }
-}
diff --git a/qpid/dotnet/Qpid.Client/Client/Handler/BasicDeliverMethodHandler.cs b/qpid/dotnet/Qpid.Client/Client/Handler/BasicDeliverMethodHandler.cs
deleted file mode 100644
index def1e78e8c..0000000000
--- a/qpid/dotnet/Qpid.Client/Client/Handler/BasicDeliverMethodHandler.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using log4net;
-using Apache.Qpid.Client.Message;
-using Apache.Qpid.Client.Protocol;
-using Apache.Qpid.Client.State;
-using Apache.Qpid.Framing;
-
-namespace Apache.Qpid.Client.Handler
-{
-    public class BasicDeliverMethodHandler : IStateAwareMethodListener
-    {
-        private static readonly ILog _logger = LogManager.GetLogger(typeof(BasicDeliverMethodHandler));
-
-        public void MethodReceived(AMQStateManager stateManager, AMQMethodEvent evt)
-        {
-            UnprocessedMessage msg = new UnprocessedMessage();
-            msg.DeliverBody = (BasicDeliverBody) evt.Method;
-            msg.ChannelId = evt.ChannelId;
-            _logger.Debug("New JmsDeliver method received");
-            evt.ProtocolSession.UnprocessedMessageReceived(msg);
-        }
-    }
-}
diff --git a/qpid/dotnet/Qpid.Client/Client/Handler/BasicReturnMethodHandler.cs b/qpid/dotnet/Qpid.Client/Client/Handler/BasicReturnMethodHandler.cs
deleted file mode 100644
index f413dfc9c6..0000000000
--- a/qpid/dotnet/Qpid.Client/Client/Handler/BasicReturnMethodHandler.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using log4net;
-using Apache.Qpid.Client.Message;
-using Apache.Qpid.Client.Protocol;
-using Apache.Qpid.Client.State;
-using Apache.Qpid.Framing;
-
-namespace Apache.Qpid.Client.Handler
-{
-    public class BasicReturnMethodHandler : IStateAwareMethodListener
-    {
-        private static readonly ILog _logger = LogManager.GetLogger(typeof(BasicReturnMethodHandler));
-
-        public void MethodReceived(AMQStateManager stateManager, AMQMethodEvent evt) 
-        {
-            _logger.Debug("New Basic.Return method received");
-            UnprocessedMessage msg = new UnprocessedMessage();
-            msg.DeliverBody = null;
-            msg.BounceBody = (BasicReturnBody) evt.Method;
-            msg.ChannelId = evt.ChannelId;
-
-            evt.ProtocolSession.UnprocessedMessageReceived(msg);
-        }
-    }
-}
diff --git a/qpid/dotnet/Qpid.Client/Client/Handler/ChannelCloseMethodHandler.cs b/qpid/dotnet/Qpid.Client/Client/Handler/ChannelCloseMethodHandler.cs
deleted file mode 100644
index 9ed09a0d01..0000000000
--- a/qpid/dotnet/Qpid.Client/Client/Handler/ChannelCloseMethodHandler.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using log4net;
-using Apache.Qpid.Client.Protocol;
-using Apache.Qpid.Client.State;
-using Apache.Qpid.Protocol;
-using Apache.Qpid.Framing;
-
-namespace Apache.Qpid.Client.Handler
-{
-    public class ChannelCloseMethodHandler : IStateAwareMethodListener
-    {
-        private static readonly ILog _logger = LogManager.GetLogger(typeof(ChannelCloseMethodHandler));
-
-        public void MethodReceived(AMQStateManager stateManager, AMQMethodEvent evt)
-        {
-            _logger.Debug("ChannelClose method received");
-            ChannelCloseBody method = (ChannelCloseBody) evt.Method;
-
-            int errorCode = method.ReplyCode;
-            string reason = method.ReplyText;
-            if (_logger.IsDebugEnabled)
-            {
-                _logger.Debug("Channel close reply code: " + errorCode + ", reason: " + reason);
-            }
-
-            AMQFrame frame = ChannelCloseOkBody.CreateAMQFrame(evt.ChannelId);
-            evt.ProtocolSession.WriteFrame(frame);
-
-            if ( errorCode != AMQConstant.REPLY_SUCCESS.Code )
-            {
-               _logger.Debug("Channel close received with errorCode " + errorCode + ", throwing exception");
-               if ( errorCode == AMQConstant.NO_CONSUMERS.Code )
-                  throw new AMQNoConsumersException(reason);
-               if ( errorCode == AMQConstant.NO_ROUTE.Code )
-                  throw new AMQNoRouteException(reason);
-               if ( errorCode == AMQConstant.INVALID_ARGUMENT.Code )
-                  throw new AMQInvalidArgumentException(reason);
-               if ( errorCode == AMQConstant.INVALID_ROUTING_KEY.Code )
-                  throw new AMQInvalidRoutingKeyException(reason);
-               // any other
-               throw new AMQChannelClosedException(errorCode, "Error: " + reason);
-            }
-            evt.ProtocolSession.ChannelClosed(evt.ChannelId, errorCode, reason);
-        }
-    }
-}
-
-
-
diff --git a/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionCloseMethodHandler.cs b/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionCloseMethodHandler.cs
deleted file mode 100644
index 66cff3bc65..0000000000
--- a/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionCloseMethodHandler.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using System;
-using System.Threading;
-using log4net;
-using Apache.Qpid.Client.Protocol;
-using Apache.Qpid.Client.State;
-using Apache.Qpid.Framing;
-using Apache.Qpid.Protocol;
-
-namespace Apache.Qpid.Client.Handler
-{
-    public class ConnectionCloseMethodHandler : IStateAwareMethodListener
-    {
-        private static readonly ILog _logger = LogManager.GetLogger(typeof(ConnectionCloseMethodHandler));
-
-        public void MethodReceived(AMQStateManager stateManager, AMQMethodEvent evt)
-        {
-            _logger.Debug("ConnectionClose frame received");
-            ConnectionCloseBody method = (ConnectionCloseBody) evt.Method;
-
-            int errorCode = method.ReplyCode;
-            String reason = method.ReplyText;
-
-            // send CloseOK
-            evt.ProtocolSession.WriteFrame(ConnectionCloseOkBody.CreateAMQFrame(evt.ChannelId));
-            
-            if ( errorCode != AMQConstant.REPLY_SUCCESS.Code )
-            {
-               if ( errorCode == AMQConstant.NOT_ALLOWED.Code )
-               {
-                  _logger.Info("Authentication Error: " + Thread.CurrentThread.Name);
-                  evt.ProtocolSession.CloseProtocolSession();
-
-                  //todo this is a bit of a fudge (could be conssidered such as each new connection needs a new state manager or at least a fresh state.
-                  stateManager.ChangeState(AMQState.CONNECTION_NOT_STARTED);
-
-                  throw new AMQAuthenticationException(errorCode, reason);
-               } else
-               {
-                  _logger.Info("Connection close received with error code " + errorCode);
-                  throw new AMQConnectionClosedException(errorCode, "Error: " + reason);
-               }
-            }
-            // this actually closes the connection in the case where it is not an error.
-            evt.ProtocolSession.CloseProtocolSession();
-            stateManager.ChangeState(AMQState.CONNECTION_CLOSED);
-        }
-    }
-}
diff --git a/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionCloseOkHandler.cs b/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionCloseOkHandler.cs
deleted file mode 100644
index 038da15731..0000000000
--- a/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionCloseOkHandler.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using log4net;
-using Apache.Qpid.Client.Protocol;
-using Apache.Qpid.Client.State;
-using Apache.Qpid.Framing;
-
-namespace Apache.Qpid.Client.Handler
-{
-    public class ConnectionCloseOkHandler : IStateAwareMethodListener
-    {
-        private static readonly ILog _logger = LogManager.GetLogger(typeof(ConnectionCloseOkHandler));
-
-        public void MethodReceived(AMQStateManager stateManager, AMQMethodEvent evt)
-        {
-            _logger.Debug("ConnectionCloseOk frame received");
-//            ConnectionCloseOkBody method = (ConnectionCloseOkBody)evt.Method;
-            stateManager.ChangeState(AMQState.CONNECTION_CLOSED);
-        }
-    }
-}
-
-
diff --git a/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionOpenOkMethodHandler.cs b/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionOpenOkMethodHandler.cs
deleted file mode 100644
index a12e4ead60..0000000000
--- a/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionOpenOkMethodHandler.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using Apache.Qpid.Client.Protocol;
-using Apache.Qpid.Client.State;
-
-namespace Apache.Qpid.Client.Handler
-{
-    public class ConnectionOpenOkMethodHandler : IStateAwareMethodListener
-    {
-        public void MethodReceived(AMQStateManager stateManager, AMQMethodEvent evt)
-        {
-            stateManager.ChangeState(AMQState.CONNECTION_OPEN);
-        }
-    }
-}
-
-
diff --git a/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionRedirectMethodHandler.cs b/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionRedirectMethodHandler.cs
deleted file mode 100644
index 08cc580b17..0000000000
--- a/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionRedirectMethodHandler.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using log4net;
-using Apache.Qpid.Client.Protocol;
-using Apache.Qpid.Client.State;
-
-namespace Apache.Qpid.Client.Handler
-{
-    public class ConnectionRedirectMethodHandler : IStateAwareMethodListener
-    {
-//        private static readonly ILog _logger = LogManager.GetLogger(typeof(ConnectionRedirectMethodHandler));
-
-        private const int DEFAULT_REDIRECT_PORT = 5672;
-
-        private static ConnectionRedirectMethodHandler _handler = new ConnectionRedirectMethodHandler();
-
-        public static ConnectionRedirectMethodHandler GetInstance()
-        {
-            return _handler;
-        }
-
-        private ConnectionRedirectMethodHandler()
-        {
-        }
-
-        public void MethodReceived(AMQStateManager stateManager, AMQMethodEvent evt)
-        {
-            /*_logger.Info("ConnectionRedirect frame received");
-            ConnectionRedirectBody method = (ConnectionRedirectBody) evt.Method;
-
-            // the host is in the form hostname:port with the port being optional
-            int portIndex = method.Host.IndexOf(':');
-            String host;
-            int port;
-            if (portIndex == -1)
-            {
-                host = method.Host;
-                port = DEFAULT_REDIRECT_PORT;
-            }
-            else
-            {
-                host = method.Host.Substring(0, portIndex);
-                port = Int32.Parse(method.Host.Substring(portIndex + 1));
-            }
-            evt.ProtocolSession.Failover(host, port);*/
-        }
-    }
-}
-
-
diff --git a/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionSecureMethodHandler.cs b/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionSecureMethodHandler.cs
deleted file mode 100644
index 9333d4d0a6..0000000000
--- a/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionSecureMethodHandler.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using Apache.Qpid.Client.Protocol;
-using Apache.Qpid.Client.State;
-using Apache.Qpid.Framing;
-using Apache.Qpid.Sasl;
-
-namespace Apache.Qpid.Client.Handler
-{
-    public class ConnectionSecureMethodHandler : IStateAwareMethodListener
-    {
-        public void MethodReceived(AMQStateManager stateManager, AMQMethodEvent evt)
-        {
-            ISaslClient saslClient = evt.ProtocolSession.SaslClient;
-            if ( saslClient == null )
-            {
-               throw new AMQException("No SASL client set up - cannot proceed with authentication");
-            }
-
-
-            ConnectionSecureBody body = (ConnectionSecureBody)evt.Method;
-
-            try
-            {
-                // Evaluate server challenge
-                byte[] response = saslClient.EvaluateChallenge(body.Challenge);
-                // AMQP version change: Hardwire the version to 0-8 (major=8, minor=0)
-                // TODO: Connect this to the session version obtained from ProtocolInitiation for this session.
-                // Be aware of possible changes to parameter order as versions change.
-                AMQFrame responseFrame = ConnectionSecureOkBody.CreateAMQFrame(
-                    evt.ChannelId, response);
-                evt.ProtocolSession.WriteFrame(responseFrame);
-            } catch ( SaslException e )
-            {
-                throw new AMQException("Error processing SASL challenge: " + e, e);
-            }
-        }
-    }
-}
-
-
-
diff --git a/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionStartMethodHandler.cs b/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionStartMethodHandler.cs
deleted file mode 100644
index 1710c19080..0000000000
--- a/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionStartMethodHandler.cs
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using System;
-using System.Collections;
-using System.Text;
-using log4net;
-using Apache.Qpid.Client.Protocol;
-using Apache.Qpid.Client.Security;
-using Apache.Qpid.Client.State;
-using Apache.Qpid.Framing;
-using Apache.Qpid.Sasl;
-
-
-namespace Apache.Qpid.Client.Handler
-{
-    public class ConnectionStartMethodHandler : IStateAwareMethodListener
-    {
-        private static readonly ILog _log = LogManager.GetLogger(typeof(ConnectionStartMethodHandler));
-
-        public void MethodReceived(AMQStateManager stateManager, AMQMethodEvent evt)
-        {
-            ConnectionStartBody body = (ConnectionStartBody) evt.Method;
-            AMQProtocolSession ps = evt.ProtocolSession;
-
-            try
-            {
-                if ( body.Mechanisms == null )
-                {
-                    throw new AMQException("mechanism not specified in ConnectionStart method frame");
-                }
-                string mechanisms = Encoding.UTF8.GetString(body.Mechanisms);
-                string selectedMechanism = ChooseMechanism(mechanisms);
-                if ( selectedMechanism == null )
-                {
-                    throw new AMQException("No supported security mechanism found, passed: " + mechanisms);
-                }
-               
-                byte[] saslResponse = DoAuthentication(selectedMechanism, ps);
-
-                if (body.Locales == null)
-                {
-                    throw new AMQException("Locales is not defined in Connection Start method");
-                }
-                string allLocales = Encoding.ASCII.GetString(body.Locales);
-                string[] locales = allLocales.Split(' ');
-                string selectedLocale;
-                if (locales != null && locales.Length > 0)
-                {
-                    selectedLocale = locales[0];
-                }
-                else
-                {
-                    throw new AMQException("No locales sent from server, passed: " + locales);
-                }
-
-                stateManager.ChangeState(AMQState.CONNECTION_NOT_TUNED);
-                FieldTable clientProperties = new FieldTable();
-                clientProperties["product"] = "Apache.Qpid.NET";
-                clientProperties["version"] = "1.0";
-                clientProperties["platform"] = GetFullSystemInfo();
-                AMQFrame frame = ConnectionStartOkBody.CreateAMQFrame(
-                   evt.ChannelId, clientProperties, selectedMechanism,
-                  saslResponse, selectedLocale);
-                ps.WriteFrame(frame);
-            }
-            catch (Exception e)
-            {
-                throw new AMQException(_log, "Unable to decode data: " + e, e);
-            }
-        }
-
-        private string GetFullSystemInfo()
-        {
-            StringBuilder sysInfo = new StringBuilder();
-            // check if we're running on mono or .net
-            Type monoRuntime = Type.GetType("Mono.Runtime");
-            if ( monoRuntime != null )
-               sysInfo.Append("Mono");
-            else
-               sysInfo.Append(".NET");
-            sysInfo.Append(" ").Append(Environment.Version);
-            sysInfo.Append(", ").Append(Environment.OSVersion);
-            return sysInfo.ToString();
-        }
-
-       private string ChooseMechanism(string mechanisms)
-       {
-          return CallbackHandlerRegistry.Instance.ChooseMechanism(mechanisms);
-       }
-
-       private byte[] DoAuthentication(string selectedMechanism, AMQProtocolSession ps)
-       {
-           ISaslClient saslClient = Sasl.Sasl.CreateClient(
-               new string[] { selectedMechanism }, null, "AMQP", "localhost",
-               new Hashtable(), CreateCallbackHandler(selectedMechanism, ps)
-           );
-           if ( saslClient == null )
-           {
-               throw new AMQException("Client SASL configuration error: no SaslClient could be created for mechanism " +
-                                      selectedMechanism);
-           }
-           ps.SaslClient = saslClient;
-           try
-           {
-               return saslClient.HasInitialResponse ?
-                  saslClient.EvaluateChallenge(new byte[0]) : null;
-           } catch ( Exception ex )
-           {
-               ps.SaslClient = null;
-               throw new AMQException("Unable to create SASL client", ex);
-           }
-       }
-
-       private IAMQCallbackHandler CreateCallbackHandler(string mechanism, AMQProtocolSession session)
-       {
-           Type type = CallbackHandlerRegistry.Instance.GetCallbackHandler(mechanism);
-           IAMQCallbackHandler handler = 
-               (IAMQCallbackHandler)Activator.CreateInstance(type);
-           if ( handler == null )
-               throw new AMQException("Unable to create callback handler: " + mechanism);
-           handler.Initialize(session);
-           return handler;
-       }
-    }
-}
diff --git a/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionTuneMethodHandler.cs b/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionTuneMethodHandler.cs
deleted file mode 100644
index 15a1d908b7..0000000000
--- a/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionTuneMethodHandler.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using System;
-using log4net;
-using Apache.Qpid.Client.Protocol;
-using Apache.Qpid.Client.State;
-using Apache.Qpid.Framing;
-
-namespace Apache.Qpid.Client.Handler
-{
-    public class ConnectionTuneMethodHandler : IStateAwareMethodListener
-    {
-        private static readonly ILog _logger = LogManager.GetLogger(typeof(ConnectionTuneMethodHandler));
-
-        public void MethodReceived(AMQStateManager stateManager, AMQMethodEvent evt)
-        {
-            _logger.Debug("ConnectionTune frame received");
-            ConnectionTuneBody frame = (ConnectionTuneBody) evt.Method;
-            AMQProtocolSession session = evt.ProtocolSession;
-
-            ConnectionTuneParameters parameters = session.ConnectionTuneParameters;
-            if (parameters == null)
-            {
-                parameters = new ConnectionTuneParameters();
-            }
-
-            _logger.Debug(String.Format("ConnectionTune.heartbeat = {0}.", frame.Heartbeat));
-
-            parameters.FrameMax = frame.FrameMax;
-            parameters.Heartbeat = frame.Heartbeat;
-            session.ConnectionTuneParameters = parameters;
-
-            stateManager.ChangeState(AMQState.CONNECTION_NOT_OPENED);
-            session.WriteFrame(ConnectionTuneOkBody.CreateAMQFrame(
-                                   evt.ChannelId, frame.ChannelMax, frame.FrameMax, frame.Heartbeat));
-            session.WriteFrame(ConnectionOpenBody.CreateAMQFrame(
-                                   evt.ChannelId, session.AMQConnection.VirtualHost, null, true));
-
-            if (frame.Heartbeat > 0)
-            {
-                evt.ProtocolSession.AMQConnection.StartHeartBeatThread(frame.Heartbeat);
-            }
-        }
-    }
-}
diff --git a/qpid/dotnet/Qpid.Client/Client/Handler/QueueDeleteOkMethodHandler.cs b/qpid/dotnet/Qpid.Client/Client/Handler/QueueDeleteOkMethodHandler.cs
deleted file mode 100644
index 7290d758f8..0000000000
--- a/qpid/dotnet/Qpid.Client/Client/Handler/QueueDeleteOkMethodHandler.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-/*

- *

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- *

- */

-using log4net;

-using Apache.Qpid.Client.Message;

-using Apache.Qpid.Client.Protocol;

-using Apache.Qpid.Client.State;

-using Apache.Qpid.Framing;

-

-namespace Apache.Qpid.Client.Handler

-{

-    public class QueueDeleteOkMethodHandler : IStateAwareMethodListener

-    {

-

-        private static readonly ILog _logger = LogManager.GetLogger(typeof(QueueDeleteOkMethodHandler));

-

-        public void MethodReceived(AMQStateManager stateManager, AMQMethodEvent evt)

-        {

-            QueueDeleteOkBody body = (QueueDeleteOkBody)evt.Method;

-            if (body != null)

-            {

-                _logger.InfoFormat("Received Queue.Delete-Ok message, message count {0}", body.MessageCount);

-            }

-        }

-

-    }

-}

diff --git a/qpid/dotnet/Qpid.Client/Client/Handler/QueuePurgeOkMethodHandler.cs b/qpid/dotnet/Qpid.Client/Client/Handler/QueuePurgeOkMethodHandler.cs
deleted file mode 100644
index 8bde707b00..0000000000
--- a/qpid/dotnet/Qpid.Client/Client/Handler/QueuePurgeOkMethodHandler.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-/*

- *

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- *

- */

-using log4net;

-using Apache.Qpid.Client.Message;

-using Apache.Qpid.Client.Protocol;

-using Apache.Qpid.Client.State;

-using Apache.Qpid.Framing;

-

-namespace Apache.Qpid.Client.Handler

-{

-    public class QueuePurgeOkMethodHandler : IStateAwareMethodListener

-    {

-

-        private static readonly ILog _logger = LogManager.GetLogger(typeof(QueuePurgeOkMethodHandler));

-

-        public void MethodReceived(AMQStateManager stateManager, AMQMethodEvent evt)

-        {

-            QueuePurgeOkBody body = (QueuePurgeOkBody)evt.Method;

-            if (body != null)

-            {

-                _logger.InfoFormat("Received Queue.Purge-Ok message, message count {0}", body.MessageCount);

-            }

-        }

-

-    }

-}

diff --git a/qpid/dotnet/Qpid.Client/Client/Message/AMQMessage.cs b/qpid/dotnet/Qpid.Client/Client/Message/AMQMessage.cs
deleted file mode 100644
index e58de2ab96..0000000000
--- a/qpid/dotnet/Qpid.Client/Client/Message/AMQMessage.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using Apache.Qpid.Framing;
-
-namespace Apache.Qpid.Client.Message
-{
-    public class AMQMessage
-    {
-        protected IContentHeaderProperties _contentHeaderProperties;
-
-        /// <summary>
-        /// If the acknowledge mode is CLIENT_ACKNOWLEDGE the session is required
-        /// </summary>
-        protected AmqChannel _channel;
-
-        private long _deliveryTag;
-
-        public AMQMessage(IContentHeaderProperties properties, long deliveryTag)
-        {
-            _contentHeaderProperties = properties;
-            _deliveryTag = deliveryTag;
-        }
-
-        public AMQMessage(IContentHeaderProperties properties)
-            : this(properties, -1)
-        {
-        }
-
-        public long DeliveryTag
-        {
-            get { return _deliveryTag; }
-        }
-
-        public AmqChannel Channel
-        {
-            get { return _channel; }
-            set { _channel = value; }
-        }
-    }
-}
diff --git a/qpid/dotnet/Qpid.Client/Client/Message/AMQMessageFactory.cs b/qpid/dotnet/Qpid.Client/Client/Message/AMQMessageFactory.cs
deleted file mode 100644
index f352d62c11..0000000000
--- a/qpid/dotnet/Qpid.Client/Client/Message/AMQMessageFactory.cs
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using System.Collections;
-using Apache.Qpid.Framing;
-using log4net;
-using Apache.Qpid.Buffer;
-
-namespace Apache.Qpid.Client.Message
-{
-    public abstract class AbstractQmsMessageFactory : IMessageFactory
-    {
-        public abstract AbstractQmsMessage CreateMessage(string mimeType);
-
-        private static readonly ILog _logger = LogManager.GetLogger(typeof (AbstractQmsMessageFactory));
-
-        protected abstract AbstractQmsMessage CreateMessage(long messageNbr, ByteBuffer data, ContentHeaderBody contentHeader);
-
-        protected AbstractQmsMessage CreateMessageWithBody(long messageNbr,
-                                                           ContentHeaderBody contentHeader,
-                                                           IList bodies)
-        {
-            ByteBuffer data;
-
-            // we optimise the non-fragmented case to avoid copying
-            if (bodies != null && bodies.Count == 1)
-            {
-                _logger.Debug("Non-fragmented message body (bodySize=" + contentHeader.BodySize +")");
-                data = ((ContentBody)bodies[0]).Payload;
-            }
-            else
-            {
-                _logger.Debug("Fragmented message body (" + bodies.Count + " frames, bodySize=" + contentHeader.BodySize + ")");
-                data = ByteBuffer.Allocate((int)contentHeader.BodySize); // XXX: Is cast a problem?
-                foreach (ContentBody body in bodies) {
-                    data.Put(body.Payload);
-                    //body.Payload.Release();
-                }
-
-                data.Flip();
-            }
-            _logger.Debug("Creating message from buffer with position=" + data.Position + " and remaining=" + data.Remaining);
-
-            return CreateMessage(messageNbr, data, contentHeader);
-        }
-
-        public AbstractQmsMessage CreateMessage(long messageNbr, bool redelivered,
-                                                ContentHeaderBody contentHeader,
-                                                IList bodies)
-        {
-            AbstractQmsMessage msg = CreateMessageWithBody(messageNbr, contentHeader, bodies);
-            msg.Redelivered = redelivered;
-            return msg;
-        }
-    }
-}
diff --git a/qpid/dotnet/Qpid.Client/Client/Message/AbstractQmsMessage.cs b/qpid/dotnet/Qpid.Client/Client/Message/AbstractQmsMessage.cs
deleted file mode 100644
index 19f59a4fc1..0000000000
--- a/qpid/dotnet/Qpid.Client/Client/Message/AbstractQmsMessage.cs
+++ /dev/null
@@ -1,484 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using System;
-using System.Collections;
-using System.Text;
-using log4net;
-using Apache.Qpid.Framing;
-using Apache.Qpid.Messaging;
-using Apache.Qpid.Buffer;
-
-namespace Apache.Qpid.Client.Message
-{
-    public abstract class AbstractQmsMessage : AMQMessage, IMessage
-    {
-        protected bool _redelivered;
-
-        protected ByteBuffer _data;
-        protected bool _readableMessage = false;
-        private QpidHeaders _headers;
-
-#region new_java_ctrs
-
-        protected AbstractQmsMessage(ByteBuffer data)
-            : base(new BasicContentHeaderProperties())
-        {
-           Init(data);
-        }
-
-        protected AbstractQmsMessage(long deliveryTag, BasicContentHeaderProperties contentHeader, ByteBuffer data)
-            : this(contentHeader, deliveryTag)
-        {
-           Init(data);
-        }
-
-        protected AbstractQmsMessage(BasicContentHeaderProperties contentHeader, long deliveryTag) : base(contentHeader, deliveryTag)
-        {
-           Init(null);
-        }
-
-        private void Init(ByteBuffer data)
-        {
-           _data = data;
-           if ( _data != null )
-           {
-              _data.Acquire();
-           }
-           _readableMessage = (data != null);
-           if ( ContentHeaderProperties.Headers == null )
-              ContentHeaderProperties.Headers = new FieldTable();
-           _headers = new QpidHeaders(ContentHeaderProperties.Headers);
-        }
-
-#endregion
-
-        #region Properties
-        //
-        // Properties
-        //
-
-        /// <summary>
-        /// The application message identifier
-        /// </summary>
-        public string MessageId
-        {
-            get {
-                if (ContentHeaderProperties.MessageId == null)
-                {
-                    ContentHeaderProperties.MessageId = "ID:" + DeliveryTag;
-                }
-                return ContentHeaderProperties.MessageId;
-            }
-            set { ContentHeaderProperties.MessageId = value; }
-        }
-
-        /// <summary>
-        /// The message timestamp
-        /// </summary>
-        public long Timestamp
-        {
-            get
-            {
-                // TODO: look at ulong/long choice
-                return (long) ContentHeaderProperties.Timestamp;
-            }
-            set
-            {
-                ContentHeaderProperties.Timestamp = (ulong) value;
-            }
-        }        
-
-        /// <summary>
-        /// The <see cref="CorrelationId"/> as a byte array.
-        /// </summary>
-        public byte[] CorrelationIdAsBytes
-        {
-            get { return Encoding.Default.GetBytes(ContentHeaderProperties.CorrelationId); }
-            set { ContentHeaderProperties.CorrelationId = Encoding.Default.GetString(value); }
-        }
-
-        /// <summary>
-        /// The application correlation identifier
-        /// </summary>
-        public string CorrelationId
-        {
-            get { return ContentHeaderProperties.CorrelationId; }
-            set { ContentHeaderProperties.CorrelationId = value; }
-        }
-        
-        struct Dest
-        {
-            public string ExchangeName;
-            public string RoutingKey;
-
-            public Dest(string exchangeName, string routingKey)
-            {
-                ExchangeName = exchangeName;
-                RoutingKey = routingKey;
-            }
-        }
-
-        /// <summary>
-        /// Exchange name of the reply-to address
-        /// </summary>
-        public string ReplyToExchangeName
-        {
-            get
-            {
-                Dest dest = ReadReplyToHeader();
-                return dest.ExchangeName;
-            }
-            set
-            {
-                Dest dest = ReadReplyToHeader();
-                dest.ExchangeName = value;
-                WriteReplyToHeader(dest);
-            }
-        }
-
-        /// <summary>
-        /// Routing key of the reply-to address
-        /// </summary>
-        public string ReplyToRoutingKey
-        {
-            get
-            {
-                Dest dest = ReadReplyToHeader();
-                return dest.RoutingKey;
-            }
-            set
-            {
-                Dest dest = ReadReplyToHeader();
-                dest.RoutingKey = value;
-                WriteReplyToHeader(dest);
-            }
-        }
-
-
-
-        /// <summary>
-        /// Non-persistent (1) or persistent (2)
-        /// </summary>
-        public DeliveryMode DeliveryMode
-        {
-            get
-            {
-                byte b = ContentHeaderProperties.DeliveryMode;
-                switch (b)
-                {
-                    case 1:
-                        return DeliveryMode.NonPersistent;
-                    case 2:
-                        return DeliveryMode.Persistent;
-                    default:
-                        throw new QpidException("Illegal value for delivery mode in content header properties");
-                }                
-            }
-            set
-            {
-                ContentHeaderProperties.DeliveryMode = (byte)(value==DeliveryMode.NonPersistent?1:2);
-            }
-        }        
-
-       /// <summary>
-       /// True, if this is a redelivered message
-       /// </summary>
-        public bool Redelivered
-        {
-            get { return _redelivered; }
-            set { _redelivered = value; }
-        }
-
-        /// <summary>
-        /// The message type name
-        /// </summary>
-        public string Type
-        {
-            get { return ContentHeaderProperties.Type; }
-            set { ContentHeaderProperties.Type = value; }
-        }
-
-        /// <summary>
-        /// Message expiration specification
-        /// </summary>
-        public long Expiration
-        {
-            get { return ContentHeaderProperties.Expiration; }
-            set { ContentHeaderProperties.Expiration = value; }
-        }
-
-        /// <summary>
-        /// The message priority, 0 to 9
-        /// </summary>
-        public byte Priority
-        {
-            get { return ContentHeaderProperties.Priority; }
-            set { ContentHeaderProperties.Priority = (byte) value; }
-        }
-
-        /// <summary>
-        /// The MIME Content Type
-        /// </summary>
-        public string ContentType
-        {
-            get { return ContentHeaderProperties.ContentType; }
-            set { ContentHeaderProperties.ContentType = value; }
-        }
-
-        /// <summary>
-        /// The MIME Content Encoding
-        /// </summary>
-        public string ContentEncoding
-        {
-            get { return ContentHeaderProperties.Encoding; }
-            set { ContentHeaderProperties.Encoding = value; }
-        }
-
-        /// <summary>
-        /// Headers of this message
-        /// </summary>
-        public IHeaders Headers
-        {
-            get { return _headers; }
-        }
-
-        /// <summary>
-        /// The creating user id
-        /// </summary>
-        public string UserId
-        {
-            get { return ContentHeaderProperties.UserId; }
-            set { ContentHeaderProperties.UserId = value; }
-        }
-
-        /// <summary>
-        /// The creating application id
-        /// </summary>
-        public string AppId
-        {
-            get { return ContentHeaderProperties.AppId; }
-            set { ContentHeaderProperties.AppId = value; }
-        }
-
-        /// <summary>
-        /// Intra-cluster routing identifier
-        /// </summary>
-        public string ClusterId
-        {
-            get { return ContentHeaderProperties.ClusterId; }
-            set { ContentHeaderProperties.ClusterId = value; }
-        }
-
-        /// <summary>
-        /// Return the raw byte array that is used to populate the frame when sending
-        /// the message.
-        /// </summary>
-        /// <value>a byte array of message data</value>                
-        public ByteBuffer Data
-        {
-            get
-            {
-                if (_data != null)
-                {
-                    if (!_readableMessage)
-                    {
-                        _data.Flip();
-                    }
-                    else
-                    {
-                        // Make sure we rewind the data just in case any method has moved the
-                        // position beyond the start.
-                        _data.Rewind();
-                    }
-                }
-                return _data;
-            }
-
-            set
-            {
-                _data = value;
-            }
-        }
-        #endregion // Properties
-
-
-        public void Acknowledge()
-        {
-            // the JMS 1.1 spec says in section 3.6 that calls to acknowledge are ignored when client acknowledge
-            // is not specified. In our case, we only set the session field where client acknowledge mode is specified.
-            if (_channel != null)
-            {
-                // we set multiple to true here since acknowledgement implies acknowledge of all count messages
-                // received on the session
-                _channel.AcknowledgeMessage((ulong)DeliveryTag, true);
-            }
-
-        }
-
-        public abstract void ClearBodyImpl();
-
-        public void ClearBody()
-        {
-            ClearBodyImpl();
-            _readableMessage = false;
-        }
-
-        /// <summary>
-        /// Get a String representation of the body of the message. Used in the
-        /// toString() method which outputs this before message properties.
-        /// </summary>
-        /// <exception cref="QpidException"></exception>
-        public abstract string ToBodyString();
-
-        public override string ToString()
-        {
-            try
-            {
-                StringBuilder buf = new StringBuilder("Body:\n");
-                buf.Append(ToBodyString());
-                buf.Append("\nQmsTimestamp: ").Append(Timestamp);
-                buf.Append("\nQmsExpiration: ").Append(Expiration);
-                buf.Append("\nQmsPriority: ").Append(Priority);
-                buf.Append("\nQmsDeliveryMode: ").Append(DeliveryMode);
-                buf.Append("\nReplyToExchangeName: ").Append(ReplyToExchangeName);
-                buf.Append("\nReplyToRoutingKey: ").Append(ReplyToRoutingKey);
-                buf.Append("\nAMQ message number: ").Append(DeliveryTag);
-                buf.Append("\nProperties:");
-                if (ContentHeaderProperties.Headers == null)
-                {
-                    buf.Append("<NONE>");
-                }
-                else
-                {
-                    buf.Append(Headers.ToString());
-                }
-                return buf.ToString();
-            }
-            catch (Exception e)
-            {
-                return e.ToString();
-            }
-        }
-
-        public FieldTable PopulateHeadersFromMessageProperties()
-        {
-            if (ContentHeaderProperties.Headers == null)
-            {
-                return null;
-            }
-            else
-            {
-                //
-                // We need to convert every property into a String representation
-                // Note that type information is preserved in the property name
-                //
-                FieldTable table = new FieldTable();
-                foreach (DictionaryEntry entry in  ContentHeaderProperties.Headers)
-                {                    
-                    string propertyName = (string) entry.Key;
-                    if (propertyName == null)
-                    {
-                        continue;
-                    }
-                    else
-                    {
-                        table[propertyName] = entry.Value.ToString();
-                    }
-                }
-                return table;
-            }
-        }
-
-        public BasicContentHeaderProperties ContentHeaderProperties
-        {
-            get
-            {
-                return (BasicContentHeaderProperties) _contentHeaderProperties;
-            }
-        }
-
-        protected virtual void Reset()
-        {
-            _readableMessage = true;
-        }
-
-        public bool IsReadable
-        {
-            get { return _readableMessage; }
-        }
-
-        public bool isWritable
-        {
-            get { return !_readableMessage; }
-        }
-
-        protected void CheckReadable()
-        {
-           if ( !_readableMessage )
-           {
-              throw new MessageNotReadableException("You need to call reset() to make the message readable");
-           }
-        }
-
-        /// <summary>
-        /// Decodes the replyto field if one is set.
-        /// 
-        /// Splits a replyto field containing an exchange name followed by a ':', followed by a routing key into the exchange name and
-        /// routing key seperately. The exchange name may be empty in which case the empty string is returned. If the exchange name is
-        /// empty the replyto field is expected to being with ':'.
-        /// 
-        /// Anyhting other than a two part replyto field sperated with a ':' will result in an exception.
-        /// </summary>
-        /// 
-        /// <returns>A destination initialized to the replyto location if a replyto field was set, or an empty destination otherwise.</returns>
-        private Dest ReadReplyToHeader()
-        {
-           string replyToEncoding = ContentHeaderProperties.ReplyTo;
-
-           if ( replyToEncoding == null )
-           {
-              return new Dest();
-           } else
-           {
-              // Split the replyto field on a ':'
-              string[] split = replyToEncoding.Split(':');
-
-              // Ensure that the replyto field argument only consisted of two parts.
-              if ( split.Length != 2 )
-              {
-                 throw new QpidException("Illegal value in ReplyTo property: " + replyToEncoding);
-              }
-
-              // Extract the exchange name and routing key from the split replyto field.
-              string exchangeName = split[0];
-              string routingKey = split[1];
-
-              return new Dest(exchangeName, routingKey);
-           }
-        }
-
-        private void WriteReplyToHeader(Dest dest)
-        {
-           string encodedDestination = string.Format("{0}:{1}", dest.ExchangeName, dest.RoutingKey);
-           ContentHeaderProperties.ReplyTo = encodedDestination;
-        }
-    }
-}
diff --git a/qpid/dotnet/Qpid.Client/Client/Message/IMessageFactory.cs b/qpid/dotnet/Qpid.Client/Client/Message/IMessageFactory.cs
deleted file mode 100644
index bed379290f..0000000000
--- a/qpid/dotnet/Qpid.Client/Client/Message/IMessageFactory.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using System.Collections;
-using Apache.Qpid.Framing;
-
-namespace Apache.Qpid.Client.Message
-{
-    public interface IMessageFactory
-    {
-        /// <summary>
-        /// Create a message
-        /// </summary>
-        /// <param name="deliverTag">Delivery Tag</param>
-        /// <param name="messageNbr">Message Sequence Number</param>
-        /// <param name="redelivered">True if this is a redelivered message</param>
-        /// <param name="contentHeader">Content headers</param>
-        /// <param name="bodies">Message bodies</param>
-        /// <returns>The new message</returns>
-        /// <exception cref="QpidMessagingException">if the message cannot be created</exception>
-        AbstractQmsMessage CreateMessage(long deliverTag, bool redelivered,
-                                         ContentHeaderBody contentHeader,
-                                         IList bodies);
-
-        /// <summary>
-        /// Creates the message.
-        /// </summary>
-        /// <param name="mimeType">Mime type to associate the new message with</param>
-        /// <returns>The new message</returns>
-        /// <exception cref="QpidMessagingException">if the message cannot be created</exception>
-        AbstractQmsMessage CreateMessage(string mimeType);
-    }
-}
-
-
diff --git a/qpid/dotnet/Qpid.Client/Client/Message/MessageFactoryRegistry.cs b/qpid/dotnet/Qpid.Client/Client/Message/MessageFactoryRegistry.cs
deleted file mode 100644
index fdb5e14aa6..0000000000
--- a/qpid/dotnet/Qpid.Client/Client/Message/MessageFactoryRegistry.cs
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using System;
-using System.Collections;
-using Apache.Qpid.Framing;
-using Apache.Qpid.Messaging;
-
-namespace Apache.Qpid.Client.Message
-{
-   public class MessageFactoryRegistry
-   {
-      private readonly Hashtable _mimeToFactoryMap = new Hashtable();
-      private IMessageFactory _defaultFactory;
-
-      /// <summary>
-      /// Default factory to use for unknown message types
-      /// </summary>
-      public IMessageFactory DefaultFactory
-      {
-         get { return _defaultFactory; }
-         set { _defaultFactory = value; }
-      }
-
-      /// <summary>
-      /// Register a new message factory for a MIME type
-      /// </summary>
-      /// <param name="mimeType">Mime type to register</param>
-      /// <param name="mf"></param>
-      public void RegisterFactory(string mimeType, IMessageFactory mf)
-      {
-         if ( mf == null )
-            throw new ArgumentNullException("mf");
-         if ( mimeType == null || mimeType.Length == 0 )
-            throw new ArgumentNullException("mimeType");
-
-         _mimeToFactoryMap[mimeType] = mf;
-      }
-
-      /// <summary>
-      /// Remove a message factory
-      /// </summary>
-      /// <param name="mimeType">MIME type to unregister</param>
-      public void DeregisterFactory(string mimeType)
-      {
-         _mimeToFactoryMap.Remove(mimeType);
-      }
-
-      /// <summary>
-      /// Create a message. This looks up the MIME type from the content header and instantiates the appropriate
-      /// concrete message type.
-      /// </summary>
-      /// <param name="messageNbr">the AMQ message id</param>
-      /// <param name="redelivered">true if redelivered</param>
-      /// <param name="contentHeader">the content header that was received</param>
-      /// <param name="bodies">a list of ContentBody instances</param>
-      /// <returns>the message.</returns>
-      /// <exception cref="AMQException"/>
-      /// <exception cref="QpidException"/>
-      public AbstractQmsMessage CreateMessage(long messageNbr, bool redelivered,
-                                              ContentHeaderBody contentHeader,
-                                              IList bodies)
-      {
-         BasicContentHeaderProperties properties = (BasicContentHeaderProperties)contentHeader.Properties;
-
-         if ( properties.ContentType == null )
-         {
-            properties.ContentType = "";
-         }
-
-         IMessageFactory mf = GetFactory(properties.ContentType);
-         return mf.CreateMessage(messageNbr, redelivered, contentHeader, bodies);
-      }
-
-      /// <summary>
-      /// Create a new message of the specified type
-      /// </summary>
-      /// <param name="mimeType">The Mime type</param>
-      /// <returns>The new message</returns>
-      public AbstractQmsMessage CreateMessage(string mimeType)
-      {
-         if ( mimeType == null || mimeType.Length == 0 )
-            throw new ArgumentNullException("mimeType");
-
-         IMessageFactory mf = GetFactory(mimeType);
-         return mf.CreateMessage(mimeType);
-      }
-
-      /// <summary>
-      /// Construct a new registry with the default message factories registered
-      /// </summary>
-      /// <returns>a message factory registry</returns>
-      public static MessageFactoryRegistry NewDefaultRegistry()
-      {
-         MessageFactoryRegistry mf = new MessageFactoryRegistry();
-         mf.RegisterFactory("text/plain", new QpidTextMessageFactory());
-         mf.RegisterFactory("text/xml", new QpidTextMessageFactory());
-         mf.RegisterFactory("application/octet-stream", new QpidBytesMessageFactory());
-
-         mf.DefaultFactory = new QpidBytesMessageFactory();
-         return mf;
-      }
-
-      private IMessageFactory GetFactory(string mimeType)
-      {
-         IMessageFactory mf = (IMessageFactory)_mimeToFactoryMap[mimeType];
-         return mf != null ? mf : _defaultFactory;
-      }
-   }
-}
-
-
diff --git a/qpid/dotnet/Qpid.Client/Client/Message/QpidBytesMessage.cs b/qpid/dotnet/Qpid.Client/Client/Message/QpidBytesMessage.cs
deleted file mode 100644
index fb3efb1b0f..0000000000
--- a/qpid/dotnet/Qpid.Client/Client/Message/QpidBytesMessage.cs
+++ /dev/null
@@ -1,353 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using System;
-using System.IO;
-using System.Runtime.Serialization;
-using System.Text;
-using Apache.Qpid.Framing;
-using Apache.Qpid.Messaging;
-using Apache.Qpid.Buffer;
-
-namespace Apache.Qpid.Client.Message
-{
-    [Serializable]
-    class MessageEOFException : QpidException
-    {
-        public MessageEOFException(string message) : base(message)
-        {
-        }
-
-        protected MessageEOFException(SerializationInfo info, StreamingContext ctxt)
-           : base(info, ctxt)
-        {
-        }
-    }
-
-    public class QpidBytesMessage : AbstractQmsMessage, IBytesMessage
-    {
-        private const int DEFAULT_BUFFER_INITIAL_SIZE = 1024;
-
-        public QpidBytesMessage() : this(null)
-        {            
-        }
-
-        /// <summary>
-        /// Construct a bytes message with existing data.
-        /// </summary>
-        /// <param name="data">if data is not null, the message is immediately in read only mode. if data is null, it is in
-        /// write-only mode</param>        
-        QpidBytesMessage(ByteBuffer data) : base(data)
-        {
-            // superclass constructor has instantiated a content header at this point
-            if (data == null)
-            {
-                _data = ByteBuffer.Allocate(DEFAULT_BUFFER_INITIAL_SIZE);
-                _data.IsAutoExpand = true;
-            }
-        }
-
-        internal QpidBytesMessage(long messageNbr, ContentHeaderBody contentHeader, ByteBuffer data)
-            // TODO: this casting is ugly. Need to review whole ContentHeaderBody idea
-            : base(messageNbr, (BasicContentHeaderProperties)contentHeader.Properties, data)
-        {
-        }
-
-        public override void ClearBodyImpl()
-        {
-            _data.Clear();
-        }
-
-        public override string ToBodyString()
-        {
-            CheckReadable();
-            try
-            {
-                return GetText();
-            }
-            catch (IOException e)
-            {
-                throw new QpidException(e.ToString());
-            }
-        }
-
-        private String GetText()
-        {
-            // this will use the default platform encoding
-            if (_data == null)
-            {
-                return null;
-            }
-            int pos = _data.Position;
-            _data.Rewind();
-            // one byte left is for the end of frame marker
-            if (_data.Remaining == 0)
-            {
-                // this is really redundant since pos must be zero
-                _data.Position = pos;
-                return null;
-            }
-            else
-            {
-                byte[] data = new byte[_data.Remaining];
-                _data.GetBytes(data);
-                return Encoding.UTF8.GetString(data);
-            }
-        }
-
-        public long BodyLength
-        {
-            get
-            {
-                CheckReadable();
-                return _data.Limit;
-            }
-        }
-
-        private void CheckWritable()
-        {
-            if (_readableMessage)
-            {
-                throw new MessageNotWriteableException("You need to call clearBody() to make the message writable");
-            }
-        }
-
-        public bool ReadBoolean()
-        {
-            CheckReadable();
-            CheckAvailable(1);
-            return _data.GetByte() != 0;
-        }
-
-        public byte ReadByte()
-        {
-            CheckReadable();
-            CheckAvailable(1);
-            return _data.GetByte();
-        }
-
-        public short ReadSignedByte()
-        {
-            CheckReadable();
-            CheckAvailable(1);
-            return _data.GetSByte();
-        }
-
-        public short ReadShort()
-        {
-            CheckReadable();
-            CheckAvailable(2);
-            return _data.GetInt16();
-        }
-
-        public char ReadChar()
-        {
-            CheckReadable();
-            CheckAvailable(2);
-            return _data.GetChar();
-        }
-
-        public int ReadInt()
-        {
-            CheckReadable();
-            CheckAvailable(4);
-            return _data.GetInt32();
-        }
-
-        public long ReadLong()
-        {
-            CheckReadable();
-            CheckAvailable(8);
-            return _data.GetInt64();
-        }
-
-        public float ReadFloat()
-        {
-            CheckReadable();
-            CheckAvailable(4);
-            return _data.GetFloat();
-        }
-
-        public double ReadDouble()
-        {
-            CheckReadable();
-            CheckAvailable(8);
-            return _data.GetDouble();
-        }
-
-        public string ReadUTF()
-        {
-            CheckReadable();
-            // we check only for one byte since theoretically the string could be only a
-            // single byte when using UTF-8 encoding
-            CheckAvailable(1);
-            try
-            {
-                byte[] data = new byte[_data.Remaining];
-                _data.GetBytes(data);
-                return Encoding.UTF8.GetString(data);                
-            }
-            catch (IOException e)
-            {
-                throw new QpidException(e.ToString(), e);
-            }
-        }
-
-        public int ReadBytes(byte[] bytes)
-        {
-            if (bytes == null)
-            {
-                throw new ArgumentNullException("bytes");
-            }
-            CheckReadable();
-            int count = (_data.Remaining >= bytes.Length ? bytes.Length : _data.Remaining);
-            if (count == 0)
-            {
-                return -1;
-            }
-            else
-            {
-                _data.GetBytes(bytes, 0, count);
-                return count;
-            }
-        }
-
-        public int ReadBytes(byte[] bytes, int maxLength)
-        {
-            if (bytes == null)
-            {
-                throw new ArgumentNullException("bytes");
-            }
-            if (maxLength > bytes.Length)
-            {
-                throw new ArgumentOutOfRangeException("maxLength must be >= 0");
-            }
-            CheckReadable();
-            int count = (_data.Remaining >= maxLength ? maxLength : _data.Remaining);
-            if (count == 0)
-            {
-                return -1;
-            }
-            else
-            {
-                _data.GetBytes(bytes, 0, count);
-                return count;
-            }
-        }
-
-        public void WriteBoolean(bool b)
-        {
-            CheckWritable();
-            _data.Put(b ? (byte)1 : (byte)0);
-        }
-
-        public void WriteByte(byte b)
-        {
-            CheckWritable();
-            _data.Put(b);
-        }
-
-        public void WriteShort(short i)
-        {
-            CheckWritable();
-            _data.Put(i);
-        }
-
-        public void WriteChar(char c)
-        {
-            CheckWritable();
-            _data.Put(c);
-        }
-
-        public void WriteSignedByte(short value)
-        {
-            CheckWritable();
-            _data.Put(value);
-        }
-
-        public void WriteDouble(double value)
-        {
-            CheckWritable();
-            _data.Put(value);
-        }
-
-        public void WriteFloat(float value)
-        {
-            CheckWritable();
-            _data.Put(value);
-        }
-
-        public void WriteInt(int value)
-        {
-            CheckWritable();
-            _data.Put(value);
-        }
-
-        public void WriteLong(long value)
-        {
-            CheckWritable();
-            _data.Put(value);
-        }        
-
-        public void WriteUTF(string value)
-        {
-            CheckWritable();
-            byte[] encodedData = Encoding.UTF8.GetBytes(value);
-            _data.Put(encodedData);
-        }
-
-        public void WriteBytes(byte[] bytes)
-        {
-            CheckWritable();
-            _data.Put(bytes);
-        }
-
-        public void WriteBytes(byte[] bytes, int offset, int length)
-        {
-            CheckWritable();
-            _data.Put(bytes, offset, length);
-        }
-
-        protected override void Reset()
-        {
-            base.Reset();
-            _data.Flip();
-        }
-
-        void IBytesMessage.Reset()
-        {
-            Reset();
-        }
-
-        /**
-         * Check that there is at least a certain number of bytes available to read
-         *
-         * @param len the number of bytes
-         * @throws MessageEOFException if there are less than len bytes available to read
-         */
-        private void CheckAvailable(int len)
-        {
-            if (_data.Remaining < len)
-            {
-                throw new MessageEOFException("Unable to read " + len + " bytes");
-            }
-        }
-    }
-}
diff --git a/qpid/dotnet/Qpid.Client/Client/Message/QpidBytesMessageFactory.cs b/qpid/dotnet/Qpid.Client/Client/Message/QpidBytesMessageFactory.cs
deleted file mode 100644
index 3cc96cbddc..0000000000
--- a/qpid/dotnet/Qpid.Client/Client/Message/QpidBytesMessageFactory.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using System;
-using System.Collections;
-using Apache.Qpid.Framing;
-using Apache.Qpid.Buffer;
-
-namespace Apache.Qpid.Client.Message
-{
-    public class QpidBytesMessageFactory : AbstractQmsMessageFactory
-    {
-        //protected override AbstractQmsMessage CreateMessageWithBody(long messageNbr,
-        //                                                            ContentHeaderBody contentHeader,
-        //                                                            IList bodies)
-        //{
-        //    byte[] data;
-
-        //    // we optimise the non-fragmented case to avoid copying
-        //    if (bodies != null && bodies.Count == 1)
-        //    {
-        //        data = ((ContentBody)bodies[0]).Payload;
-        //    }
-        //    else
-        //    {
-        //        data = new byte[(long)contentHeader.BodySize];
-        //        int currentPosition = 0;
-        //        foreach (ContentBody cb in bodies)
-        //        {
-        //            Array.Copy(cb.Payload, 0, data, currentPosition, cb.Payload.Length);
-        //            currentPosition += cb.Payload.Length;
-        //        }
-        //    }
-
-        //    return new QpidBytesMessage(messageNbr, data, contentHeader);
-        //}
-
-        //public override AbstractQmsMessage CreateMessage()
-        //{
-        //    return new QpidBytesMessage();
-        //}
-
-        protected override AbstractQmsMessage CreateMessage(long deliveryTag, ByteBuffer data, ContentHeaderBody contentHeader)
-        {
-            return new QpidBytesMessage(deliveryTag, contentHeader, data);
-        }
-
-        public override AbstractQmsMessage CreateMessage(string mimeType)
-        {
-            QpidBytesMessage msg = new QpidBytesMessage();
-            msg.ContentType = mimeType;
-            return msg;
-        }
-
-    }
-}
-
-
diff --git a/qpid/dotnet/Qpid.Client/Client/Message/QpidHeaders.cs b/qpid/dotnet/Qpid.Client/Client/Message/QpidHeaders.cs
deleted file mode 100644
index d27c1df853..0000000000
--- a/qpid/dotnet/Qpid.Client/Client/Message/QpidHeaders.cs
+++ /dev/null
@@ -1,213 +0,0 @@
-using System;
-using System.Collections;
-using System.Text;
-using Apache.Qpid.Framing;
-using Apache.Qpid.Messaging;
-
-namespace Apache.Qpid.Client.Message
-{
-   internal class QpidHeaders : IHeaders
-   {
-      private FieldTable _headers;
-
-      public QpidHeaders(FieldTable headers)
-      {
-         if ( headers == null )
-            throw new ArgumentNullException("headers");
-         _headers = headers;
-      }
-
-      public bool Contains(string name)
-      {
-         CheckPropertyName(name);
-         return _headers.Contains(name);
-      }
-
-      public void Clear()
-      {
-         _headers.Clear();
-      }
-
-      public object this[string name]
-      {
-         get { return GetObject(name); }
-         set { SetObject(name, value); }
-      }
-
-      public bool GetBoolean(string name)
-      {
-         CheckPropertyName(name);
-         if ( Contains(name) )
-            return _headers.GetBoolean(name);
-         return false;
-      }
-
-      public void SetBoolean(string name, bool b)
-      {
-         CheckPropertyName(name);
-         _headers.SetBoolean(name, b);
-      }
-
-      public byte GetByte(string propertyName)
-      {
-         CheckPropertyName(propertyName);
-         if ( Contains(propertyName) )
-            return _headers.GetByte(propertyName);
-         return 0;
-      }
-
-      public void SetByte(string propertyName, byte b)
-      {
-         CheckPropertyName(propertyName);
-         _headers.SetByte(propertyName, b);
-      }
-
-      //  we have sbyte overloads to interoperate with java
-      // because the Java client/server uses signed bytes
-      // by default, while C#'s is unsigned
-      public sbyte GetSByte(string propertyName)
-      {
-         CheckPropertyName(propertyName);
-         if ( Contains(propertyName) )
-            return _headers.GetSByte(propertyName);
-         return 0;
-      }
-
-      public void SetSByte(string propertyName, sbyte b)
-      {
-         CheckPropertyName(propertyName);
-         _headers.SetSByte(propertyName, b);
-      }
-
-      public short GetShort(string propertyName)
-      {
-         CheckPropertyName(propertyName);
-         if ( Contains(propertyName) )
-            return _headers.GetInt16(propertyName);
-         return 0;
-      }
-
-      public void SetShort(string propertyName, short i)
-      {
-         CheckPropertyName(propertyName);
-         _headers.SetInt16(propertyName, i);
-      }
-
-      public int GetInt(string propertyName)
-      {
-         CheckPropertyName(propertyName);
-         if ( Contains(propertyName) )
-            return _headers.GetInt32(propertyName);
-         return 0;
-      }
-
-      public void SetInt(string propertyName, int i)
-      {
-         CheckPropertyName(propertyName);
-         _headers.SetInt32(propertyName, i);
-      }
-
-      public long GetLong(string propertyName)
-      {
-         CheckPropertyName(propertyName);
-         if ( Contains(propertyName) )
-            return _headers.GetInt64(propertyName);
-         return 0;
-      }
-
-      public void SetLong(string propertyName, long l)
-      {
-         CheckPropertyName(propertyName);
-         _headers.SetInt64(propertyName, l);
-      }
-
-      public float GetFloat(String propertyName)
-      {
-         CheckPropertyName(propertyName);
-         if ( Contains(propertyName) )
-            return _headers.GetFloat(propertyName);
-         return 0f;
-      }
-
-      public void SetFloat(string propertyName, float f)
-      {
-         CheckPropertyName(propertyName);
-         _headers.SetFloat(propertyName, f);
-      }
-
-      public double GetDouble(string propertyName)
-      {
-         CheckPropertyName(propertyName);
-         if ( Contains(propertyName) )
-            return _headers.GetDouble(propertyName);
-         return 0;
-      }
-
-      public void SetDouble(string propertyName, double v)
-      {
-         CheckPropertyName(propertyName);
-         _headers.SetDouble(propertyName, v);
-      }
-
-      public string GetString(string propertyName)
-      {
-         CheckPropertyName(propertyName);
-         return _headers.GetString(propertyName);
-      }
-
-      public void SetString(string propertyName, string value)
-      {
-         CheckPropertyName(propertyName);
-         _headers.SetString(propertyName, value);
-      }
-
-      public object GetObject(string propertyName)
-      {
-         CheckPropertyName(propertyName);
-         return _headers[propertyName];
-      }
-
-      public void SetObject(string propertyName, object value)
-      {
-         CheckPropertyName(propertyName);
-         _headers[propertyName] = value;
-      }
-
-      private static void CheckPropertyName(string propertyName)
-      {
-         if ( propertyName == null )
-         {
-            throw new ArgumentException("Property name must not be null");
-         } else if ( "".Equals(propertyName) )
-         {
-            throw new ArgumentException("Property name must not be the empty string");
-         }
-      }
-
-      public override string ToString()
-      {
-         StringBuilder buf = new StringBuilder("{");
-         int i = 0;
-         foreach ( DictionaryEntry entry in _headers )
-         {
-            ++i;
-            if ( i > 1 )
-            {
-               buf.Append(", ");
-            }
-            string propertyName = (string)entry.Key;
-            if ( propertyName == null )
-            {
-               buf.Append("\nInternal error: Property with NULL key defined");
-            } else
-            {
-               buf.Append(propertyName);
-               buf.Append(" = ").Append(entry.Value);
-            }
-         }
-         buf.Append("}");
-         return buf.ToString();
-      }
-
-   }
-}
diff --git a/qpid/dotnet/Qpid.Client/Client/Message/QpidTextMessage.cs b/qpid/dotnet/Qpid.Client/Client/Message/QpidTextMessage.cs
deleted file mode 100644
index 24aef92aa5..0000000000
--- a/qpid/dotnet/Qpid.Client/Client/Message/QpidTextMessage.cs
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using System;
-using System.Text;
-using Apache.Qpid.Framing;
-using Apache.Qpid.Messaging;
-using Apache.Qpid.Buffer;
-
-namespace Apache.Qpid.Client.Message
-{
-    public class QpidTextMessage : AbstractQmsMessage, ITextMessage
-    {
-        private string _decodedValue = null;
-        private static Encoding DEFAULT_ENCODING = Encoding.UTF8;
-
-        internal QpidTextMessage() : this(null, null)
-        {
-           ContentEncoding = DEFAULT_ENCODING.BodyName;
-        }
-
-        internal QpidTextMessage(ByteBuffer data, String encoding) : base(data)
-        {
-            ContentEncoding = encoding;
-        }
-
-        internal QpidTextMessage(long deliveryTag, BasicContentHeaderProperties contentHeader, ByteBuffer data)
-            :base(deliveryTag, contentHeader, data)
-        {
-        }
-
-        public override void ClearBodyImpl()
-        {
-            if (_data != null)
-            {
-                _data.Release();
-            }
-            _data = null;
-            _decodedValue = null;
-        }
-
-        public override string ToBodyString()
-        {
-            return Text;
-        }
-
-        public string Text
-        {
-            get
-            {
-                if (_data == null && _decodedValue == null)
-                {
-                    return null;
-                }
-                else if (_decodedValue != null)
-                {
-                    return _decodedValue;
-                }
-                else
-                {
-                    _data.Rewind();
-
-                    // Read remaining bytes.
-                    byte[] bytes = new byte[_data.Remaining];
-                    _data.GetBytes(bytes);
-
-                    // Convert to string based on encoding.
-                    if (ContentHeaderProperties.Encoding != null)
-                    {
-                        // throw ArgumentException if the encoding is not supported
-                        _decodedValue = Encoding.GetEncoding(ContentHeaderProperties.Encoding).GetString(bytes);
-                    }
-                    else
-                    {
-                        _decodedValue = DEFAULT_ENCODING.GetString(bytes);
-                    }
-                    return _decodedValue;                    
-                }
-            }
-
-            set
-            {
-                byte[] bytes;
-                if (ContentHeaderProperties.Encoding == null)
-                {
-                    bytes = Encoding.Default.GetBytes(value);
-                }
-                else
-                {
-                    // throw ArgumentException if the encoding is not supported
-                    bytes = Encoding.GetEncoding(ContentHeaderProperties.Encoding).GetBytes(value);
-                }
-                _data = ByteBuffer.Wrap(bytes);
-                _decodedValue = value;
-            }
-        }
-    }
-}
diff --git a/qpid/dotnet/Qpid.Client/Client/Message/QpidTextMessageFactory.cs b/qpid/dotnet/Qpid.Client/Client/Message/QpidTextMessageFactory.cs
deleted file mode 100644
index 79871e85ca..0000000000
--- a/qpid/dotnet/Qpid.Client/Client/Message/QpidTextMessageFactory.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using Apache.Qpid.Buffer;
-using Apache.Qpid.Framing;
-
-namespace Apache.Qpid.Client.Message
-{
-    public class QpidTextMessageFactory : AbstractQmsMessageFactory
-    {        
-        public override AbstractQmsMessage CreateMessage(string mimeType)
-        {
-            QpidTextMessage msg = new QpidTextMessage();
-            msg.ContentType = mimeType;
-            return msg;
-        }
-
-        protected override AbstractQmsMessage CreateMessage(long deliveryTag, ByteBuffer data, ContentHeaderBody contentHeader)
-        {
-            return new QpidTextMessage(deliveryTag, (BasicContentHeaderProperties) contentHeader.Properties, data);
-        }
-    }
-}
diff --git a/qpid/dotnet/Qpid.Client/Client/Message/UnexpectedBodyReceivedException.cs b/qpid/dotnet/Qpid.Client/Client/Message/UnexpectedBodyReceivedException.cs
deleted file mode 100644
index 4317ef3474..0000000000
--- a/qpid/dotnet/Qpid.Client/Client/Message/UnexpectedBodyReceivedException.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using System;
-using System.Runtime.Serialization;
-using log4net;
-
-namespace Apache.Qpid.Client.Message
-{
-    /// <summary>
-    /// Raised when a message body is received unexpectedly by the client. This typically occurs when the
-    /// length of bodies received does not match with the declared length in the content header.
-    /// </summary>
-    [Serializable]
-    public class UnexpectedBodyReceivedException : AMQException
-    {
-        public UnexpectedBodyReceivedException(ILog logger, string msg, Exception t)
-            : base(logger, msg, t)
-        {        
-        }
-
-        public UnexpectedBodyReceivedException(ILog logger, string msg)
-            : base(logger, msg)
-        {            
-        }
-
-        public UnexpectedBodyReceivedException(ILog logger, int errorCode, string msg)
-            : base(logger, errorCode, msg)
-        {                        
-        }
-
-        protected UnexpectedBodyReceivedException(SerializationInfo info, StreamingContext ctxt)
-           : base(info, ctxt)
-        {
-        }
-    }
-}
-
-
-
diff --git a/qpid/dotnet/Qpid.Client/Client/Message/UnprocessedMessage.cs b/qpid/dotnet/Qpid.Client/Client/Message/UnprocessedMessage.cs
deleted file mode 100644
index d329712334..0000000000
--- a/qpid/dotnet/Qpid.Client/Client/Message/UnprocessedMessage.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using System.Collections;
-using Apache.Qpid.Framing;
-
-namespace Apache.Qpid.Client.Message
-{
-    public class UnprocessedMessage
-    {
-        private ulong _bytesReceived = 0;
-
-        public BasicDeliverBody DeliverBody;
-        public BasicReturnBody BounceBody;
-        public ushort ChannelId;
-        public ContentHeaderBody ContentHeader;
-
-        /// <summary>
-        /// List of ContentBody instances. Due to fragmentation you don't know how big this will be in general
-        /// </summary>
-        /// TODO: write and use linked list class
-        public IList Bodies = new ArrayList();
-
-        public void ReceiveBody(ContentBody body)
-        {
-            Bodies.Add(body);
-            if (body.Payload != null)
-            {
-                _bytesReceived += (uint)body.Payload.Remaining;
-            }
-        }
-
-        public bool IsAllBodyDataReceived()
-        {
-            return _bytesReceived == ContentHeader.BodySize;
-        }
-    }
-}
-
-
diff --git a/qpid/dotnet/Qpid.Client/Client/Protocol/AMQMethodEvent.cs b/qpid/dotnet/Qpid.Client/Client/Protocol/AMQMethodEvent.cs
deleted file mode 100644
index a7ce808862..0000000000
--- a/qpid/dotnet/Qpid.Client/Client/Protocol/AMQMethodEvent.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using System;
-using System.Text;
-using Apache.Qpid.Framing;
-
-namespace Apache.Qpid.Client.Protocol
-{
-    public class AMQMethodEvent
-    {
-        private AMQMethodBody _method;
-
-        private ushort _channelId;
-
-        private AMQProtocolSession _protocolSession;
-
-        public AMQMethodEvent(ushort channelId, AMQMethodBody method, AMQProtocolSession protocolSession)
-        {
-            _channelId = channelId;
-            _method = method;
-            _protocolSession = protocolSession;
-        }
-
-        public AMQMethodBody Method
-        {
-            get
-            {
-                return _method;
-            }
-        }
-
-        public ushort ChannelId
-        {
-            get
-            {
-                return _channelId;
-            }
-        }
-
-        public AMQProtocolSession ProtocolSession
-        {
-            get
-            {
-                return _protocolSession;
-            }            
-        }
-
-        public override String ToString()
-        {
-            StringBuilder buf = new StringBuilder("Method event: ");
-            buf.Append("\nChannel id: ").Append(_channelId);
-            buf.Append("\nMethod: ").Append(_method);
-            return buf.ToString();
-        }
-    }
-}
-
-
diff --git a/qpid/dotnet/Qpid.Client/Client/Protocol/AMQProtocolListener.cs b/qpid/dotnet/Qpid.Client/Client/Protocol/AMQProtocolListener.cs
deleted file mode 100644
index 326afbe613..0000000000
--- a/qpid/dotnet/Qpid.Client/Client/Protocol/AMQProtocolListener.cs
+++ /dev/null
@@ -1,297 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using System;
-using System.Collections;
-using System.Threading;
-using log4net;
-using Apache.Qpid.Client.Failover;
-using Apache.Qpid.Client.Protocol.Listener;
-using Apache.Qpid.Client.State;
-using Apache.Qpid.Framing;
-
-namespace Apache.Qpid.Client.Protocol
-{
-    public class AMQProtocolListener : IProtocolListener
-    {
-        private static readonly ILog _log = LogManager.GetLogger(typeof(AMQProtocolListener));
-
-        /**
-         * We create the failover handler when the session is created since it needs a reference to the IoSession in order
-         * to be able to send errors during failover back to the client application. The session won't be available in the
-         * case where we failing over due to a Connection.Redirect message from the broker.
-         */
-        private FailoverHandler _failoverHandler;
-
-        /**
-         * This flag is used to track whether failover is being attempted. It is used to prevent the application constantly
-         * attempting failover where it is failing.
-         */
-        internal FailoverState _failoverState = FailoverState.NOT_STARTED;
-
-        internal FailoverState FailoverState
-        {
-            get { return _failoverState; }
-            set { _failoverState = value; }
-        }
-
-        internal ManualResetEvent FailoverLatch;
-
-        AMQConnection _connection;
-        AMQStateManager _stateManager;
-
-        public AMQStateManager StateManager
-        {
-            get { return _stateManager; }
-            set { _stateManager = value; }
-        }
-
-        //private readonly CopyOnWriteArraySet _frameListeners = new CopyOnWriteArraySet();
-        private readonly ArrayList _frameListeners = ArrayList.Synchronized(new ArrayList());
-        
-        AMQProtocolSession _protocolSession = null; // FIXME
-        public AMQProtocolSession ProtocolSession { set { _protocolSession = value; } } // FIXME: can this be fixed?
-        
-
-        private readonly Object _lock = new Object();
-
-        public AMQProtocolListener(AMQConnection connection, AMQStateManager stateManager)
-        {
-            _connection = connection;
-            _stateManager = stateManager;
-            _failoverHandler = new FailoverHandler(connection);
-        }
-
-        public void OnMessage(IDataBlock message)
-        {
-            // Handle incorrect protocol version.
-            if (message is ProtocolInitiation)
-            {
-                string error = String.Format("Protocol mismatch - {0}", message.ToString());
-                AMQException e = new AMQProtocolHeaderException(error);
-                _log.Error("Closing connection because of protocol mismatch", e);
-                //_protocolSession.CloseProtocolSession();
-                _stateManager.Error(e);
-                return;
-            }
-
-            AMQFrame frame = (AMQFrame)message;
-
-            if (frame.BodyFrame is AMQMethodBody)
-            {
-                if (_log.IsDebugEnabled)
-                {
-                    _log.Debug("Method frame received: " + frame);
-                }
-                AMQMethodEvent evt = new AMQMethodEvent(frame.Channel, (AMQMethodBody)frame.BodyFrame, _protocolSession);
-                try
-                {
-                    bool wasAnyoneInterested = false;
-                    lock (_frameListeners.SyncRoot)
-                    {
-                        foreach (IAMQMethodListener listener in _frameListeners)
-                        {
-                            wasAnyoneInterested = listener.MethodReceived(evt) || wasAnyoneInterested;
-                        }
-                    }
-                    if (!wasAnyoneInterested)
-                    {
-                        throw new AMQException("AMQMethodEvent " + evt + " was not processed by any listener.");
-                    }
-                }
-                catch (Exception e)
-                {
-                    foreach (IAMQMethodListener listener in _frameListeners)
-                    {
-                        listener.Error(e);
-                    }
-                }
-            }
-            else if (frame.BodyFrame is ContentHeaderBody)
-            {
-                _protocolSession.MessageContentHeaderReceived(frame.Channel,
-                                                              (ContentHeaderBody)frame.BodyFrame);
-            }
-            else if (frame.BodyFrame is ContentBody)
-            {
-                _protocolSession.MessageContentBodyReceived(frame.Channel,
-                                                            (ContentBody)frame.BodyFrame);
-            }
-            else if (frame.BodyFrame is HeartbeatBody)
-            {
-                _log.Debug("HeartBeat received");
-            }
-            //_connection.BytesReceived(_protocolSession.Channel.ReadBytes); // XXX: is this really useful?
-        }
-
-        public void OnException(Exception cause)
-        {
-            _log.Warn("Protocol Listener received exception", cause);
-            lock (_lock)
-            {
-                if (_failoverState == FailoverState.NOT_STARTED)
-                {
-                    if (cause is AMQConnectionClosedException)
-                    {
-                        WhenClosed();
-                    }
-                }
-                    // We reach this point if failover was attempted and failed therefore we need to let the calling app
-                    // know since we cannot recover the situation.
-                else if (_failoverState == FailoverState.FAILED)
-                {
-                    // we notify the state manager of the error in case we have any clients waiting on a state
-                    // change. Those "waiters" will be interrupted and can handle the exception
-                    AMQException amqe = new AMQException("Protocol handler error: " + cause, cause);
-                    PropagateExceptionToWaiters(amqe);
-                    _connection.ExceptionReceived(cause);
-                }
-            }
-        }
-
-        /**
-         * When the broker connection dies we can either get sessionClosed() called or exceptionCaught() followed by
-         * sessionClosed() depending on whether we were trying to send data at the time of failure.
-         *
-         * @param session
-         * @throws Exception
-         */
-        void WhenClosed()
-        {
-            _connection.StopHeartBeatThread();
-
-            // TODO: Server just closes session with no warning if auth fails.
-            if (_connection.Closed)
-            {
-                _log.Info("Channel closed called by client");
-            }
-            else
-            {
-                _log.Info("Channel closed called with failover state currently " + _failoverState);
-
-                // Reconnectablility was introduced here so as not to disturb the client as they have made their intentions
-                // known through the policy settings.
-
-                if ((_failoverState != FailoverState.IN_PROGRESS) && _connection.IsFailoverAllowed)
-                {
-                    _log.Info("FAILOVER STARTING");
-                    if (_failoverState == FailoverState.NOT_STARTED)
-                    {
-                        _failoverState = FailoverState.IN_PROGRESS;
-                        StartFailoverThread();
-                    }
-                    else
-                    {
-                        _log.Info("Not starting failover as state currently " + _failoverState);
-                    }
-                }
-                else
-                {
-                    _log.Info("Failover not allowed by policy.");
-
-                    if (_failoverState != FailoverState.IN_PROGRESS)
-                    {
-                        _log.Info("sessionClose() not allowed to failover");
-                        _connection.ExceptionReceived(
-                            new AMQDisconnectedException("Server closed connection and reconnection not permitted."));
-                    }
-                    else
-                    {
-                        _log.Info("sessionClose() failover in progress");
-                    }
-                }
-            }
-
-            _log.Info("Protocol Channel [" + this + "] closed");
-        }
-
-        /// <summary>
-        /// There are two cases where we have other threads potentially blocking for events to be handled by this
-        /// class. These are for the state manager (waiting for a state change) or a frame listener (waiting for a
-        /// particular type of frame to arrive). When an error occurs we need to notify these waiters so that they can
-        /// react appropriately.
-        /// 
-        /// <param name="e">the exception to propagate</param>
-        /// </summary>
-        public void PropagateExceptionToWaiters(Exception e)
-        {
-            // FIXME: not sure if required as StateManager is in _frameListeners. Probably something to do with fail-over.
-            _stateManager.Error(e);
-            lock ( _lock )
-            {
-               foreach ( IAMQMethodListener listener in _frameListeners )
-               {
-                  listener.Error(e);
-               }
-            }
-        }
-
-        public void AddFrameListener(IAMQMethodListener listener)
-        {
-           lock ( _lock )
-           {
-              _frameListeners.Add(listener);
-           }
-        }
-
-        public void RemoveFrameListener(IAMQMethodListener listener)
-        {
-            if (_log.IsDebugEnabled)
-            {
-                _log.Debug("Removing frame listener: " + listener.ToString());
-            }
-            lock ( _lock )
-            {
-               _frameListeners.Remove(listener);
-            }
-        }
-
-        public void BlockUntilNotFailingOver()
-        {
-            if (FailoverLatch != null)
-            {
-                FailoverLatch.WaitOne();
-            }
-        }
-
-        /// <summary>
-        ///  "Failover" for redirection.
-        /// </summary>
-        /// <param name="host"></param>
-        /// <param name="port"></param>
-        public void Failover(string host, int port)
-        {
-            _failoverHandler.setHost(host);
-            _failoverHandler.setPort(port);
-            // see javadoc for FailoverHandler to see rationale for separate thread
-            StartFailoverThread();
-        }
-
-        private void StartFailoverThread()
-        {
-            Thread failoverThread = new Thread(new ThreadStart(_failoverHandler.Run));
-            failoverThread.Name = "Failover";
-            // Do not inherit daemon-ness from current thread as this can be a daemon
-            // thread such as a AnonymousIoService thread.
-            failoverThread.IsBackground = false;
-            failoverThread.Start();
-        }
-    }
-}
diff --git a/qpid/dotnet/Qpid.Client/Client/Protocol/AMQProtocolSession.cs b/qpid/dotnet/Qpid.Client/Client/Protocol/AMQProtocolSession.cs
deleted file mode 100644
index e0fa22e7a3..0000000000
--- a/qpid/dotnet/Qpid.Client/Client/Protocol/AMQProtocolSession.cs
+++ /dev/null
@@ -1,277 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using System;
-using System.Collections;
-using log4net;
-using Apache.Qpid.Client.Message;
-using Apache.Qpid.Client.Transport;
-using Apache.Qpid.Framing;
-using Apache.Qpid.Sasl;
-
-namespace Apache.Qpid.Client.Protocol
-{
-    public class AMQProtocolSession
-    {
-        private static readonly ILog _logger = LogManager.GetLogger(typeof(AMQProtocolSession));
-
-        private readonly IProtocolWriter _protocolWriter;
-        private readonly IConnectionCloser _connectionCloser;
-
-        /**
-         * Counter to ensure unique queue names
-         */
-        private int _queueId = 1;
-        private readonly Object _queueIdLock = new Object();
-
-        /// <summary>
-        /// Maps from the channel id to the AmqChannel that it represents.
-        /// </summary>
-        //private ConcurrentMap _channelId2SessionMap = new ConcurrentHashMap();
-        private Hashtable _channelId2SessionMap = Hashtable.Synchronized(new Hashtable());
-
-        //private ConcurrentMap _closingChannels = new ConcurrentHashMap();
-        private Hashtable _closingChannels = Hashtable.Synchronized(new Hashtable());
-
-        /// <summary>
-        /// Maps from a channel id to an unprocessed message. This is used to tie together the
-        /// JmsDeliverBody (which arrives first) with the subsequent content header and content bodies.
-        /// </summary>
-        //private ConcurrentMap _channelId2UnprocessedMsgMap = new ConcurrentHashMap();
-        private Hashtable _channelId2UnprocessedMsgMap = Hashtable.Synchronized(new Hashtable());
-
-        private AMQConnection _connection;
-        
-        public AMQProtocolSession(IProtocolWriter protocolWriter, IConnectionCloser connectionCloser, AMQConnection connection)
-        {
-            _protocolWriter = protocolWriter;
-            _connectionCloser = connectionCloser;
-            _connection = connection;
-        }
-
-        public void Init()
-        {
-            // start the process of setting up the connection. This is the first place that
-            // data is written to the server.
-            _protocolWriter.Write(new ProtocolInitiation());
-        }
-
-        public string Username
-        {
-            get
-            {
-                return AMQConnection.Username;
-            }            
-        }
-
-        public string Password
-        {
-            get
-            {
-                return AMQConnection.Password;
-            }            
-        }
-
-        ConnectionTuneParameters _connectionTuneParameters; // TODO: should be able to have this in the Java too.
-        
-        public ConnectionTuneParameters ConnectionTuneParameters
-        {
-            get
-            {
-                return _connectionTuneParameters;
-            }            
-            set
-            {
-                _connectionTuneParameters = value;
-                AMQConnection con = AMQConnection;
-                con.SetMaximumChannelCount(value.ChannelMax);
-                con.MaximumFrameSize = value.FrameMax;
-            }
-        }
-
-        private ISaslClient _saslClient;
-        public ISaslClient SaslClient
-        {
-            get { return _saslClient; }
-            set { _saslClient = value; }
-        }
-        
-        /// <summary>
-        /// Callback invoked from the BasicDeliverMethodHandler when a message has been received.
-        /// This is invoked on the MINA dispatcher thread.
-        /// </summary>
-        /// <param name="message">the unprocessed message</param>
-        /// <exception cname="AMQException">if this was not expected</exception>         
-        public void UnprocessedMessageReceived(UnprocessedMessage message)
-        {
-            _channelId2UnprocessedMsgMap[message.ChannelId] = message;
-        }
-
-        public void MessageContentHeaderReceived(ushort channelId, ContentHeaderBody contentHeader)                
-        {
-            UnprocessedMessage msg = (UnprocessedMessage) _channelId2UnprocessedMsgMap[channelId];
-            if (msg == null)
-            {
-                throw new AMQException("Error: received content header without having received a JMSDeliver frame first");
-            }
-            if (msg.ContentHeader != null)
-            {
-                throw new AMQException("Error: received duplicate content header or did not receive correct number of content body frames");
-            }
-            msg.ContentHeader = contentHeader;
-            if (contentHeader.BodySize == 0)
-            {
-                DeliverMessageToAMQSession(channelId, msg);
-            }
-        }
-
-        public void MessageContentBodyReceived(ushort channelId, ContentBody contentBody)
-        {
-            UnprocessedMessage msg = (UnprocessedMessage) _channelId2UnprocessedMsgMap[channelId];
-            if (msg == null)
-            {
-                throw new AMQException("Error: received content body without having received a BasicDeliver frame first");
-            }
-            if (msg.ContentHeader == null)
-            {
-                _channelId2UnprocessedMsgMap.Remove(channelId);
-                throw new AMQException("Error: received content body without having received a ContentHeader frame first");
-            }
-            try
-            {
-                msg.ReceiveBody(contentBody);
-            }
-            catch (UnexpectedBodyReceivedException e)
-            {
-                _channelId2UnprocessedMsgMap.Remove(channelId);
-                throw e;
-            }
-            if (msg.IsAllBodyDataReceived())
-            {
-                DeliverMessageToAMQSession(channelId,  msg);
-            }
-        }
-
-        /// <summary>
-        /// Deliver a message to the appropriate session, removing the unprocessed message
-        /// from our map
-        /// <param name="channelId">the channel id the message should be delivered to</param>
-        /// <param name="msg"> the message</param>         
-        private void DeliverMessageToAMQSession(ushort channelId, UnprocessedMessage msg)
-        {
-            AmqChannel channel = (AmqChannel) _channelId2SessionMap[channelId];
-            channel.MessageReceived(msg);
-            _channelId2UnprocessedMsgMap.Remove(channelId);
-        }
-
-        /// <summary>
-        /// Convenience method that writes a frame to the protocol session. Equivalent
-        /// to calling getProtocolSession().write().
-        /// </summary>
-        /// <param name="frame">the frame to write</param>
-        public void WriteFrame(IDataBlock frame)
-        {
-            _protocolWriter.Write(frame);
-        }
-
-        public void AddSessionByChannel(ushort channelId, AmqChannel channel)
-        {            
-            if (channel == null)
-            {
-                throw new ArgumentNullException("Attempt to register a null channel");
-            }
-            _logger.Debug("Add channel with channel id  " + channelId);
-            _channelId2SessionMap[channelId] = channel;
-        }
-
-        public void RemoveSessionByChannel(ushort channelId)
-        {            
-            _logger.Debug("Removing session with channelId " + channelId);
-            _channelId2SessionMap.Remove(channelId);
-        }
-
-        /// <summary>
-        /// Starts the process of closing a channel
-        /// </summary>
-        /// <param name="channel" the AmqChannel being closed</param>         
-        public void CloseSession(AmqChannel channel)
-        {
-            _logger.Debug("closeSession called on protocol channel for channel " + channel.ChannelId);
-            ushort channelId = channel.ChannelId;
-            
-            // we need to know when a channel is closing so that we can respond
-            // with a channel.close frame when we receive any other type of frame
-            // on that channel
-            _closingChannels[channelId] = channel;
-
-        }
-
-        /// <summary>
-        /// Called from the ChannelClose handler when a channel close frame is received.
-        /// This method decides whether this is a response or an initiation. The latter
-        /// case causes the AmqChannel to be closed and an exception to be thrown if
-        /// appropriate.
-        /// </summary>
-        /// <param name="channelId">the id of the channel (session)</param>
-        /// <returns>true if the client must respond to the server, i.e. if the server
-        /// initiated the channel close, false if the channel close is just the server
-        /// responding to the client's earlier request to close the channel.</returns>         
-        public bool ChannelClosed(ushort channelId, int code, string text)
-        {            
-            // if this is not a response to an earlier request to close the channel            
-            if (!_closingChannels.ContainsKey(channelId))
-            {
-                _closingChannels.Remove(channelId);
-                AmqChannel channel = (AmqChannel) _channelId2SessionMap[channelId];
-                channel.ClosedWithException(new AMQException(_logger, code, text));
-                return true;
-            }
-            else
-            {
-                return false;
-            }
-        }
-
-        public AMQConnection AMQConnection
-        {
-            get
-            {
-                return _connection;
-            }
-        }
-
-        public void CloseProtocolSession()
-        {
-            _logger.Debug("Closing protocol session");
-            _connectionCloser.Close();
-        }
-
-        internal string GenerateQueueName()
-        {
-            int id;
-            lock(_queueIdLock)
-            {
-                id = _queueId++;
-            }
-
-            return "tmp_" + _connection.Transport.LocalEndpoint + "_" + id;          
-        }
-    }
-}
diff --git a/qpid/dotnet/Qpid.Client/Client/Protocol/DefaultTimeouts.cs b/qpid/dotnet/Qpid.Client/Client/Protocol/DefaultTimeouts.cs
deleted file mode 100644
index 6841b46f54..0000000000
--- a/qpid/dotnet/Qpid.Client/Client/Protocol/DefaultTimeouts.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-/*

- *

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- *

- */

-

-using System;

-using System.Text;

-

-namespace Apache.Qpid.Client.Protocol

-{

-   /// <summary>

-   /// Default timeout values for the protocol

-   /// </summary>

-   sealed class DefaultTimeouts

-   {

-      /// <summary>

-      /// Maximum number of milliseconds to wait for a state change

-      /// in the protocol's state machine

-      /// </summary>

-      public const int MaxWaitForState = 30* 1000;

-      /// <summary>

-      /// Maximum number of milliseconds to wait for a reply

-      /// frame when doing synchronous writer to the broker

-      /// </summary>

-      public const int MaxWaitForSyncWriter = 30 * 1000;

-

-      private DefaultTimeouts()

-      {

-      }

-   }

-}

diff --git a/qpid/dotnet/Qpid.Client/Client/Protocol/IConnectionCloser.cs b/qpid/dotnet/Qpid.Client/Client/Protocol/IConnectionCloser.cs
deleted file mode 100644
index e3298200c4..0000000000
--- a/qpid/dotnet/Qpid.Client/Client/Protocol/IConnectionCloser.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-namespace Apache.Qpid.Client.Protocol
-{
-    public interface IConnectionCloser
-    {
-        void Close();
-    }
-}
diff --git a/qpid/dotnet/Qpid.Client/Client/Protocol/IProtocolListener.cs b/qpid/dotnet/Qpid.Client/Client/Protocol/IProtocolListener.cs
deleted file mode 100644
index 3b53f015f8..0000000000
--- a/qpid/dotnet/Qpid.Client/Client/Protocol/IProtocolListener.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using System;
-using Apache.Qpid.Client.Protocol.Listener;
-using Apache.Qpid.Framing;
-
-namespace Apache.Qpid.Client.Protocol
-{
-    public interface IProtocolListener
-    {
-        void OnMessage(IDataBlock message);
-        void OnException(Exception e);
-
-        // XXX: .NET way of doing listeners?
-        void AddFrameListener(IAMQMethodListener listener);
-        void RemoveFrameListener(IAMQMethodListener listener);
-    }
-}
diff --git a/qpid/dotnet/Qpid.Client/Client/Protocol/Listener/BlockingMethodFrameListener.cs b/qpid/dotnet/Qpid.Client/Client/Protocol/Listener/BlockingMethodFrameListener.cs
deleted file mode 100644
index 9cc9f8cee5..0000000000
--- a/qpid/dotnet/Qpid.Client/Client/Protocol/Listener/BlockingMethodFrameListener.cs
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using System;
-using System.Threading;
-using Apache.Qpid.Framing;
-
-namespace Apache.Qpid.Client.Protocol.Listener
-{
-    public abstract class BlockingMethodFrameListener : IAMQMethodListener
-    {
-        private ManualResetEvent _resetEvent;
-        
-        public abstract bool ProcessMethod(ushort channelId, AMQMethodBody frame);        
-
-        /// <summary>
-        /// This is set if there is an exception thrown from processCommandFrame and the
-        /// exception is rethrown to the caller of blockForFrame()
-        /// </summary>
-        private volatile Exception _error;
-
-        protected ushort _channelId;
-
-        protected AMQMethodEvent _doneEvt = null;
-
-        public BlockingMethodFrameListener(ushort channelId)
-        {
-            _channelId = channelId;
-            _resetEvent = new ManualResetEvent(false);
-        }
-
-        /// <summary>
-        /// This method is called by the MINA dispatching thread. Note that it could
-        /// be called before BlockForFrame() has been called.
-        /// </summary>
-        /// <param name="evt">the frame event</param>
-        /// <returns>true if the listener has dealt with this frame</returns>
-        /// <exception cref="AMQException"></exception>
-        public bool MethodReceived(AMQMethodEvent evt)
-        {
-            AMQMethodBody method = evt.Method;
-
-            try
-            {
-                bool ready = (evt.ChannelId == _channelId) && ProcessMethod(evt.ChannelId, method);
-                if (ready)
-                {                    
-                    _doneEvt = evt;                        
-                    _resetEvent.Set();
-                }
-
-                return ready;
-            }
-            catch (AMQException e)
-            {
-                Error(e);
-                // we rethrow the error here, and the code in the frame dispatcher will go round
-                // each listener informing them that an exception has been thrown
-                throw e;
-            }
-        }
-
-        /// <summary>
-        /// This method is called by the thread that wants to wait for a frame.
-        /// </summary>
-        /// <param name="timeout">Set the number of milliseconds to wait</param>
-        public AMQMethodEvent BlockForFrame(int timeout)
-        {
-            _resetEvent.WaitOne(timeout, true);
-            //at this point the event will have been signalled. The error field might or might not be set
-            // depending on whether an error occurred
-            if (_error != null)
-            {
-                throw _error;
-            }
-
-            return _doneEvt;
-        }
-
-        /// <summary>
-        /// This is a callback, called by the MINA dispatcher thread only. It is also called from within this
-        /// class to avoid code repetition but again is only called by the MINA dispatcher thread.
-        /// </summary>
-        /// <param name="e">the exception that caused the error</param>         
-        public void Error(Exception e)
-        {
-            // set the error so that the thread that is blocking (in BlockForFrame())
-            // can pick up the exception and rethrow to the caller
-            _error = e;
-            _resetEvent.Set();
-        }
-    }
-}
diff --git a/qpid/dotnet/Qpid.Client/Client/Protocol/Listener/IAMQMethodListener.cs b/qpid/dotnet/Qpid.Client/Client/Protocol/Listener/IAMQMethodListener.cs
deleted file mode 100644
index b5450d00f7..0000000000
--- a/qpid/dotnet/Qpid.Client/Client/Protocol/Listener/IAMQMethodListener.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using System;
-
-namespace Apache.Qpid.Client.Protocol.Listener
-{
-    public interface IAMQMethodListener
-    {
-        /// <summary>
-        /// Invoked when a method frame has been received
-        /// <param name="evt">the event</param>
-        /// <returns>true if the handler has processed the method frame, false otherwise. Note
-        /// that this does not prohibit the method event being delivered to subsequent listeners
-        /// but can be used to determine if nobody has dealt with an incoming method frame.</param>
-        /// <exception cname="AMQException">if an error has occurred. This exception will be delivered
-        /// to all registered listeners using the error() method (see below) allowing them to
-        /// perform cleanup if necessary.</exception>     
-        bool MethodReceived(AMQMethodEvent evt);
-
-        /// <summary>
-        /// Callback when an error has occurred. Allows listeners to clean up.
-        /// </summary>
-        /// <param name="e">the exception</param>         
-        void Error(Exception e);
-    }
-}
-
-
diff --git a/qpid/dotnet/Qpid.Client/Client/Protocol/Listener/SpecificMethodFrameListener.cs b/qpid/dotnet/Qpid.Client/Client/Protocol/Listener/SpecificMethodFrameListener.cs
deleted file mode 100644
index 8cdc1dbba9..0000000000
--- a/qpid/dotnet/Qpid.Client/Client/Protocol/Listener/SpecificMethodFrameListener.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using System;
-using Apache.Qpid.Framing;
-
-namespace Apache.Qpid.Client.Protocol.Listener
-{
-    public class SpecificMethodFrameListener : BlockingMethodFrameListener
-    {
-        private readonly Type _expectedClass;
-
-        public SpecificMethodFrameListener(ushort channelId, Type expectedClass) : base(channelId)
-        {        
-            _expectedClass = expectedClass;
-        }
-
-        public override bool ProcessMethod(ushort channelId, AMQMethodBody frame)
-        {
-            return _expectedClass.IsInstanceOfType(frame);
-        }
-    }
-}
-
-
diff --git a/qpid/dotnet/Qpid.Client/Client/Protocol/ProtocolWriter.cs b/qpid/dotnet/Qpid.Client/Client/Protocol/ProtocolWriter.cs
deleted file mode 100644
index 11918f1ea2..0000000000
--- a/qpid/dotnet/Qpid.Client/Client/Protocol/ProtocolWriter.cs
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using System;
-using Apache.Qpid.Client.Protocol.Listener;
-using Apache.Qpid.Client.Transport;
-using Apache.Qpid.Framing;
-
-using log4net;
-
-namespace Apache.Qpid.Client.Protocol
-{
-    /// <summary>
-    /// A convenient interface to writing protocol frames.
-    /// </summary>
-    public class ProtocolWriter
-    {
-
-        private ILog _logger = LogManager.GetLogger(typeof(ProtocolWriter));
-
-        IProtocolWriter _protocolWriter;
-        IProtocolListener _protocolListener;
-        
-        public ProtocolWriter(IProtocolWriter protocolWriter, IProtocolListener protocolListener)
-        {
-            _protocolWriter = protocolWriter;
-            _protocolListener = protocolListener;
-        }
-
-        public void WriteFrame(IDataBlock frame)
-        {
-            _protocolWriter.Write(frame);
-        }
-
-        /// <summary>
-        /// Convenience method that writes a frame to the protocol session and waits for
-        /// a particular response. Equivalent to calling getProtocolSession().write() then
-        /// waiting for the response.
-        /// </summary>
-        /// <param name="frame">the frame</param>
-        /// <param name="listener">the blocking listener. Note the calling thread will block.</param>         
-        /// <param name="timeout">set the number of milliseconds to wait</param>
-        private AMQMethodEvent SyncWrite(AMQFrame frame, BlockingMethodFrameListener listener, int timeout)
-        {
-            try
-            {
-                _protocolListener.AddFrameListener(listener);
-                _protocolWriter.Write(frame);
-                
-                return listener.BlockForFrame(timeout);
-            }
-            finally
-            {
-                _protocolListener.RemoveFrameListener(listener);
-            }
-            // When control resumes before this line, a reply will have been received
-            // that matches the criteria defined in the blocking listener
-        }
-
-        /// <summary>
-        /// Convenience method that writes a frame to the protocol session and waits for
-        /// a particular response. Equivalent to calling getProtocolSession().write() then
-        /// waiting for the response.
-        /// </summary>
-        /// <param name="frame">the frame</param>
-        /// <param name="responseType">the type of method response</param>
-        public AMQMethodEvent SyncWrite(AMQFrame frame, Type responseType)
-        {
-            // TODO: If each frame knew it's response type, then the responseType argument would
-            // TODO: not be neccesary.
-            return SyncWrite(frame, responseType, DefaultTimeouts.MaxWaitForSyncWriter);
-        }
-
-        /// <summary>
-        /// Convenience method that writes a frame to the protocol session and waits for
-        /// a particular response. Equivalent to calling getProtocolSession().write() then
-        /// waiting for the response.
-        /// </summary>
-        /// <param name="frame">the frame</param>
-        /// <param name="responseType">the type of method response</param>
-        /// <param name="timeout">set the number of milliseconds to wait</param>
-        /// <returns>set the number of milliseconds to wait</returns>
-        public AMQMethodEvent SyncWrite(AMQFrame frame, Type responseType, int timeout)
-        {
-            return SyncWrite(frame, new SpecificMethodFrameListener(frame.Channel, responseType), timeout);
-        }
-    }
-}
-
-
diff --git a/qpid/dotnet/Qpid.Client/Client/QpidConnectionInfo.cs b/qpid/dotnet/Qpid.Client/Client/QpidConnectionInfo.cs
deleted file mode 100644
index ede8966f37..0000000000
--- a/qpid/dotnet/Qpid.Client/Client/QpidConnectionInfo.cs
+++ /dev/null
@@ -1,504 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using System;
-using System.Collections;
-using System.Net;
-using System.Text;
-using System.Text.RegularExpressions;
-using log4net;
-using Apache.Qpid.Client.Qms;
-
-namespace Apache.Qpid.Client
-{
-
-    public class URLHelper
-    {
-        public static char DEFAULT_OPTION_SEPERATOR = '&';
-        public static char ALTERNATIVE_OPTION_SEPARATOR = ',';
-        public static char BROKER_SEPARATOR = ';';
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="optionMap"></param>
-        /// <param name="options"></param>
-        public static void parseOptions(IDictionary optionMap, string options)
-        {
-            //options looks like this
-            //brokerlist='tcp://host:port?option='value',option='value';vm://:3/virtualpath?option='value'',failover='method?option='value',option='value''
-
-            if (options == null || options.IndexOf('=') == -1)
-            {
-                return;
-            }
-
-            int optionIndex = options.IndexOf('=');
-
-            String option = options.Substring(0, optionIndex);
-
-            int length = options.Length;
-
-            int nestedQuotes = 0;
-
-            // to store index of final "'"
-            int valueIndex = optionIndex;
-
-            //Walk remainder of url.
-            while (nestedQuotes > 0 || valueIndex < length)
-            {
-                valueIndex++;
-
-                if (valueIndex >= length)
-                {
-                    break;
-                }
-
-                if (options[valueIndex] == '\'')
-                {
-                    if (valueIndex + 1 < options.Length)
-                    {
-                        if (options[valueIndex + 1] == DEFAULT_OPTION_SEPERATOR ||
-                                options[valueIndex + 1] == ALTERNATIVE_OPTION_SEPARATOR ||
-                                options[valueIndex + 1] == BROKER_SEPARATOR ||
-                                options[valueIndex + 1] == '\'')
-                        {
-                            nestedQuotes--;
-                            //                        System.out.println(
-                            //                                options + "\n" + "-" + nestedQuotes + ":" + getPositionString(valueIndex - 2, 1));
-                            if (nestedQuotes == 0)
-                            {
-                                //We've found the value of an option
-                                break;
-                            }
-                        }
-                        else
-                        {
-                            nestedQuotes++;
-                            //                        System.out.println(
-                            //                                options + "\n" + "+" + nestedQuotes + ":" + getPositionString(valueIndex - 2, 1));
-                        }
-                    }
-                    else
-                    {
-                        // We are at the end of the string
-                        // Check to see if we are corectly closing quotes
-                        if (options[valueIndex] == '\'')
-                        {
-                            nestedQuotes--;
-                        }
-
-                        break;
-                    }
-                }
-            }
-
-            if (nestedQuotes != 0 || valueIndex < (optionIndex + 2))
-            {
-                int sepIndex = 0;
-
-                //Try and identify illegal separator character
-                if (nestedQuotes > 1)
-                {
-                    for (int i = 0; i < nestedQuotes; i++)
-                    {
-                        sepIndex = options.IndexOf('\'', sepIndex);
-                        sepIndex++;
-                    }
-                }
-
-                if (sepIndex >= options.Length || sepIndex == 0)
-                {
-                    parseError(valueIndex, "Unterminated option", options);
-                }
-                else
-                {
-                    parseError(sepIndex, "Unterminated option. Possible illegal option separator:'" +
-                            options[sepIndex] + "'", options);
-                }
-            }
-
-            // optionIndex +2 to skip "='"
-            int sublen = valueIndex - (optionIndex + 2);
-            String value = options.Substring(optionIndex + 2, sublen);
-
-            optionMap.Add(option, value);
-
-            if (valueIndex < (options.Length - 1))
-            {
-                //Recurse to get remaining options
-                parseOptions(optionMap, options.Substring(valueIndex + 2));
-            }
-        }
-
-
-        public static void parseError(int index, String error, String url)
-        {
-            parseError(index, 1, error, url);
-        }
-
-        public static void parseError(int index, int length, String error, String url)
-        {
-            throw new UrlSyntaxException(url, error, index, length);
-        }
-
-        public static String printOptions(Hashtable options)
-        {
-            if (options.Count == 0)
-            {
-                return "";
-            }
-            else
-            {
-                StringBuilder sb = new StringBuilder();
-                sb.Append('?');
-                foreach (String key in options.Keys)
-                {
-                    sb.AppendFormat("{0}='{1}'{2}", key, options[key], DEFAULT_OPTION_SEPERATOR);
-                }
-
-                sb.Remove(sb.Length - 1, 1);
-                return sb.ToString();
-            }
-        }
-
-    }
-
-    public class QpidConnectionUrl
-    {
-        internal static IConnectionInfo FromUrl(string fullURL)
-        {
-            //_url = fullURL;
-            IConnectionInfo connectionInfo = new QpidConnectionInfo();
-
-
-            //            _options = new HashMap<String, String>();
-            //            _brokers = new LinkedList();
-            //            _failoverOptions = new HashMap<String, String>();
-
-            // Connection URL format
-            //amqp://[user:pass@][clientid]/virtualhost?brokerlist='tcp://host:port?option=\'value\',option=\'value\';vm://:3/virtualpath?option=\'value\'',failover='method?option=\'value\',option='value''"
-            // Options are of course optional except for requiring a single broker in the broker list.
-            try
-            {
-                Uri connection = new Uri(fullURL);
-
-                if (connection.Scheme == null || !(connection.Scheme.Equals(ConnectionUrlConstants.AMQ_PROTOCOL)))
-                {
-                    throw new UrlSyntaxException(fullURL, "Not an AMQP URL");
-                }
-
-                if (connection.Host != null && connection.Host.Length > 0 && !connection.Host.Equals("default"))
-                {
-                    connectionInfo.ClientName = connection.Host;
-                }
-
-                String userInfo = connection.UserInfo;
-                if (userInfo == null || userInfo.Length == 0)
-                {
-                    URLHelper.parseError(ConnectionUrlConstants.AMQ_PROTOCOL.Length + 3,
-                            "User information not found on url", fullURL);
-                }
-                else
-                {
-                    parseUserInfo(userInfo, fullURL, connectionInfo);
-                }
-                String virtualHost = connection.AbsolutePath; // XXX: is AbsolutePath corrrect?
-
-                if (virtualHost != null && virtualHost.Length > 0)
-                {
-                    connectionInfo.VirtualHost = virtualHost;
-                }
-                else
-                {
-                    int authLength = connection.Authority.Length;
-                    int start = ConnectionUrlConstants.AMQ_PROTOCOL.Length + 3;
-                    int testIndex = start + authLength;
-                    if (testIndex < fullURL.Length && fullURL[testIndex] == '?')
-                    {
-                        URLHelper.parseError(start, testIndex - start, "Virtual host found", fullURL);
-                    }
-                    else
-                    {
-                        URLHelper.parseError(-1, "Virtual host not specified", fullURL);
-                    }
-
-                }
-
-                QpidConnectionInfo qci = (QpidConnectionInfo)connectionInfo;
-                string query = connection.Query;
-                if (query[0] == '?') query = query.Substring(1);
-                URLHelper.parseOptions(qci.GetOptions(), query);
-
-                processOptions(connectionInfo);
-
-                //Fragment is #string (not used)
-                //System.out.println(connection.getFragment());
-                return connectionInfo;
-            }
-            catch (UriFormatException uris)
-            {
-                throw uris;
-                //                if (uris is UrlSyntaxException)
-                //                {
-                //                    throw uris;
-                //                }
-                //
-                //                int slash = fullURL.IndexOf("\\");
-                //
-                //                if (slash == -1)
-                //                {
-                //                    URLHelper.parseError(uris.GetIndex(), uris.getReason(), uris.getInput());
-                //                }
-                //                else
-                //                {
-                //                    if (slash != 0 && fullURL.charAt(slash - 1) == ':')
-                //                    {
-                //                        URLHelper.parseError(slash - 2, fullURL.indexOf('?') - slash + 2, "Virtual host looks like a windows path, forward slash not allowed in URL", fullURL);
-                //                    }
-                //                    else
-                //                    {
-                //                        URLHelper.parseError(slash, "Forward slash not allowed in URL", fullURL);
-                //                    }
-                //                }
-            }
-        }
-
-        private static void parseUserInfo(String userinfo, string fullUrl, IConnectionInfo connectionInfo)
-        {
-            //user info = user:pass
-
-            int colonIndex = userinfo.IndexOf(':');
-
-            if (colonIndex == -1)
-            {
-                URLHelper.parseError(ConnectionUrlConstants.AMQ_PROTOCOL.Length + 3,
-                    userinfo.Length, "Null password in user information not allowed.", fullUrl);
-            }
-            else
-            {
-                connectionInfo.Username = userinfo.Substring(0, colonIndex);
-                connectionInfo.Password = userinfo.Substring(colonIndex + 1);
-            }
-        }
-
-        private static void processOptions(IConnectionInfo connectionInfo)
-        {
-            string brokerlist = connectionInfo.GetOption(ConnectionUrlConstants.OPTIONS_BROKERLIST);
-            if (brokerlist != null)
-            {
-                //brokerlist tcp://host:port?option='value',option='value';vm://:3/virtualpath?option='value'
-                Regex splitter = new Regex("" + URLHelper.BROKER_SEPARATOR);
-
-                foreach (string broker in splitter.Split(brokerlist))
-                {
-                    connectionInfo.AddBrokerInfo(new AmqBrokerInfo(broker));
-                }
-
-                connectionInfo.SetOption(ConnectionUrlConstants.OPTIONS_BROKERLIST, null);
-                //                _options.remove(OPTIONS_BROKERLIST);
-            }
-
-            string failover = connectionInfo.GetOption(ConnectionUrlConstants.OPTIONS_FAILOVER);
-            if (failover != null)
-            {
-                // failover='method?option='value',option='value''
-
-                int methodIndex = failover.IndexOf('?');
-
-                if (methodIndex > -1)
-                {
-                    connectionInfo.FailoverMethod = failover.Substring(0, methodIndex);
-                    QpidConnectionInfo qpidConnectionInfo = (QpidConnectionInfo)connectionInfo;
-                    URLHelper.parseOptions(qpidConnectionInfo.GetFailoverOptions(),
-                        failover.Substring(methodIndex + 1));
-                }
-                else
-                {
-                    connectionInfo.FailoverMethod = failover;
-                }
-
-                connectionInfo.SetOption(ConnectionUrlConstants.OPTIONS_FAILOVER, null);
-                //                _options.remove(OPTIONS_FAILOVER);
-            }
-        }
-
-        internal static IConnectionInfo FromUri(Uri uri)
-        {
-            return null; // FIXME
-
-        }
-    }
-
-    public class QpidConnectionInfo : IConnectionInfo
-    {
-        const string DEFAULT_VHOST = "/";
-        string _username = "guest";
-        string _password = "guest";
-        string _virtualHost = DEFAULT_VHOST;
-
-        string _failoverMethod = null;
-        IDictionary _failoverOptions = new Hashtable();
-        IDictionary _options = new Hashtable();
-        IList _brokerInfos = new ArrayList(); // List<BrokerInfo>
-        string _clientName = String.Format("{0}{1:G}", Dns.GetHostName(), DateTime.Now.Ticks);
-
-        public IDictionary GetFailoverOptions()
-        {
-            return _failoverOptions;
-        }
-
-        public IDictionary GetOptions()
-        {
-            return _options;
-        }
-
-        public static IConnectionInfo FromUrl(String url)
-        {
-            return QpidConnectionUrl.FromUrl(url);
-        }
-
-        public string AsUrl()
-        {
-            StringBuilder sb = new StringBuilder();
-            sb.AppendFormat("{0}://", ConnectionUrlConstants.AMQ_PROTOCOL);
-
-            if (_username != null)
-            {
-                sb.Append(_username);
-                if (_password != null)
-                {
-                    sb.AppendFormat(":{0}", _password);
-                }
-                sb.Append("@");
-            }
-
-            sb.Append(_clientName);
-            sb.Append(_virtualHost);
-            sb.Append(OptionsToString());
-
-            return sb.ToString();
-        }
-
-        private String OptionsToString()
-        {
-            StringBuilder sb = new StringBuilder();
-            sb.AppendFormat("?{0}='", ConnectionUrlConstants.OPTIONS_BROKERLIST);
-
-            foreach (IBrokerInfo broker in _brokerInfos)
-            {
-                sb.AppendFormat("{0};", broker);
-            }
-
-            sb.Remove(sb.Length - 1, 1);
-            sb.Append("'");
-
-            if (_failoverMethod != null)
-            {
-                sb.AppendFormat("{0}{1}='{2}{3}'", URLHelper.DEFAULT_OPTION_SEPERATOR,
-                    ConnectionUrlConstants.OPTIONS_FAILOVER,
-                    _failoverMethod,
-                    URLHelper.printOptions((Hashtable)_failoverOptions));
-            }
-
-            return sb.ToString();
-        }
-
-
-        public string FailoverMethod
-        {
-            get { return _failoverMethod; }
-            set { _failoverMethod = value; }
-        }
-
-        public string GetFailoverOption(string key)
-        {
-            return (string)_failoverOptions[key];
-        }
-
-        public int BrokerCount
-        {
-            get { return _brokerInfos.Count; }
-        }
-
-        public IBrokerInfo GetBrokerInfo(int index)
-        {
-            return (IBrokerInfo)_brokerInfos[index];
-        }
-
-        public void AddBrokerInfo(IBrokerInfo brokerInfo)
-        {
-            if (!_brokerInfos.Contains(brokerInfo))
-            {
-                _brokerInfos.Add(brokerInfo);
-            }
-        }
-
-        public IList GetAllBrokerInfos()
-        {
-            return _brokerInfos;
-        }
-
-        public string ClientName
-        {
-            get { return _clientName; }
-            set { _clientName = value; }
-        }
-
-        public string Username
-        {
-            get { return _username; }
-            set { _username = value; }
-        }
-
-        public string Password
-        {
-            get { return _password; }
-            set { _password = value; }
-        }
-
-        public string VirtualHost
-        {
-            get { return _virtualHost; }
-            set { 
-               _virtualHost = value;
-               if ( _virtualHost == null || _virtualHost.Length == 0 )
-                  _virtualHost = DEFAULT_VHOST;
-               if ( _virtualHost[0] != '/' )
-                  _virtualHost = '/' + _virtualHost;
-            }
-        }
-
-        public string GetOption(string key)
-        {
-            return (string)_options[key];
-        }
-
-        public void SetOption(string key, string value)
-        {
-            _options[key] = value;
-        }
-
-        public override string ToString()
-        {
-            return AsUrl();
-        }
-    }
-}
diff --git a/qpid/dotnet/Qpid.Client/Client/Security/CallbackHandlerRegistry.cs b/qpid/dotnet/Qpid.Client/Client/Security/CallbackHandlerRegistry.cs
deleted file mode 100644
index 85be927ff4..0000000000
--- a/qpid/dotnet/Qpid.Client/Client/Security/CallbackHandlerRegistry.cs
+++ /dev/null
@@ -1,127 +0,0 @@
-/*

- *

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- *

- */

-

-using System;

-using System.Collections;

-using System.Configuration;

-using System.Text;

-using Apache.Qpid.Sasl;

-using Apache.Qpid.Sasl.Mechanisms;

-

-using Apache.Qpid.Client.Configuration;

-

-namespace Apache.Qpid.Client.Security

-{

-

-   /// <summary>

-   /// Helper class to map SASL mechanisms to our 

-   /// internal ISaslCallbackHandler implementations.

-   /// </summary>

-   /// <remarks>

-   /// The set of configured callback handlers and their order

-   /// controls the selection of the SASL mechanism used for authentication.

-   /// <para>

-   /// You can either replace the default handler for CRAM-MD5 and PLAIN

-   /// authentication (the two default options) using the application 

-   /// configuration file. Configuration is done by especifying the SASL

-   /// mechanism name (e.g PLAIN) and the type implementing the callback handler

-   /// used to provide any data required by the mechanism like username and password.

-   /// </para>

-   /// <para>

-   /// Callback handler types should implement the IAMQCallbackHandler interface.

-   /// </para>

-   /// <para>

-   /// New callbacks or authentication mechanisms can be configured like this:

-   /// </para>

-   /// <example><![CDATA[

-   /// <configuration>

-   ///   <configSections>

-   ///      <sectionGroup name="qpid.client">

-   ///         <section name="authentication" type="Apache.Qpid.Client.Configuration.AuthenticationConfigurationSectionHandler, Apache.Qpid.Client"/>

-   ///      </sectionGroup>

-   ///   </configSections>

-   ///   <qpid.client>

-   ///      <authentication>

-   ///         <add key="TEST" value="Apache.Qpid.Client.Tests.Security.TestCallbackHandler, Apache.Qpid.Client.Tests"/>

-   ///      </authentication>

-   ///   </qpid.client>

-   /// </configuration>

-   /// ]]></example>

-   /// </remarks>

-   public sealed class CallbackHandlerRegistry

-   {

-      private static CallbackHandlerRegistry _instance = 

-         new CallbackHandlerRegistry();

-      private OrderedHashTable _mechanism2HandlerMap;

-      private string[] _mechanisms;

-

-      public static CallbackHandlerRegistry Instance

-      {

-         get { return _instance; }

-      }

-

-      public string[] Mechanisms

-      {

-         get { return _mechanisms; }

-      }

-

-      private CallbackHandlerRegistry()

-      {

-         _mechanism2HandlerMap = (OrderedHashTable)

-            ConfigurationSettings.GetConfig("qpid.client/authentication");

-

-         // configure default options if not available

-         if ( _mechanism2HandlerMap == null )

-            _mechanism2HandlerMap = new OrderedHashTable();

-

-         if ( !_mechanism2HandlerMap.Contains(ExternalSaslClient.Mechanism) )

-            _mechanism2HandlerMap.Add(ExternalSaslClient.Mechanism, typeof(UsernamePasswordCallbackHandler));

-         if ( !_mechanism2HandlerMap.Contains(CramMD5SaslClient.Mechanism) )

-            _mechanism2HandlerMap.Add(CramMD5SaslClient.Mechanism, typeof(UsernamePasswordCallbackHandler));

-         if ( !_mechanism2HandlerMap.Contains(PlainSaslClient.Mechanism) )

-            _mechanism2HandlerMap.Add(PlainSaslClient.Mechanism, typeof(UsernamePasswordCallbackHandler));

-

-         _mechanisms = new string[_mechanism2HandlerMap.Count];

-         _mechanism2HandlerMap.OrderedKeys.CopyTo(_mechanisms, 0);

-      }

-

-      public bool IsSupportedMechanism(string mechanism)

-      {

-         return _mechanism2HandlerMap.Contains(mechanism);

-      }

-

-      public string ChooseMechanism(string mechanisms)

-      {

-         IList mechs = mechanisms.Split(' ');

-         foreach ( string supportedMech in _mechanisms )

-         {

-            if ( mechs.Contains(supportedMech) )

-               return supportedMech;

-         }

-         return null;

-      }

-

-      public Type GetCallbackHandler(string mechanism)

-      {

-         return (Type)_mechanism2HandlerMap[mechanism];

-      }

-   }

-}

diff --git a/qpid/dotnet/Qpid.Client/Client/Security/IAMQCallbackHandler.cs b/qpid/dotnet/Qpid.Client/Client/Security/IAMQCallbackHandler.cs
deleted file mode 100644
index 2560c1d96b..0000000000
--- a/qpid/dotnet/Qpid.Client/Client/Security/IAMQCallbackHandler.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-/*

- *

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- *

- */

-using System;

-using System.Text;

-using Apache.Qpid.Client.Protocol;

-using Apache.Qpid.Sasl;

-

-namespace Apache.Qpid.Client.Security

-{

-   public interface IAMQCallbackHandler : ISaslCallbackHandler

-   {

-      void Initialize(AMQProtocolSession session);

-   }

-

-} 

-

-

diff --git a/qpid/dotnet/Qpid.Client/Client/Security/UsernamePasswordCallbackHandler.cs b/qpid/dotnet/Qpid.Client/Client/Security/UsernamePasswordCallbackHandler.cs
deleted file mode 100644
index 489d4d1665..0000000000
--- a/qpid/dotnet/Qpid.Client/Client/Security/UsernamePasswordCallbackHandler.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-/*

- *

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- *

- */

-

-using System;

-using System.Collections;

-using System.Text;

-using Apache.Qpid.Client.Protocol;

-using Apache.Qpid.Sasl;

-

-namespace Apache.Qpid.Client.Security

-{

-   internal class UsernamePasswordCallbackHandler : IAMQCallbackHandler

-   {

-      private AMQProtocolSession _session;

-

-      public void Initialize(AMQProtocolSession session)

-      {

-         if ( session == null )

-            throw new ArgumentNullException("session");

-

-         _session = session;

-      }

-

-      public void Handle(ISaslCallback[] callbacks)

-      {

-         foreach ( ISaslCallback cb in callbacks )

-         {

-            if ( cb is NameCallback )

-            {

-               ((NameCallback)cb).Text = _session.Username;

-            } else if ( cb is PasswordCallback )

-            {

-               ((PasswordCallback)cb).Text = _session.Password;

-            }

-         }

-      }

-   }

-}

diff --git a/qpid/dotnet/Qpid.Client/Client/SslOptions.cs b/qpid/dotnet/Qpid.Client/Client/SslOptions.cs
deleted file mode 100644
index d637101000..0000000000
--- a/qpid/dotnet/Qpid.Client/Client/SslOptions.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-/*

- *

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- *

- */

-using System;

-using System.Security.Cryptography.X509Certificates;

-

-namespace Apache.Qpid.Client

-{

-   /// <summary>

-   /// Configures SSL-related options to connect to an AMQP broker.

-   /// </summary>

-   /// <remarks>

-   /// If the server certificate is not trusted by the client,

-   /// connection will fail. However, you can set the 

-   /// <see cref="IgnoreValidationErrors"/> property to true

-   /// to ignore any certificate verification errors for debugging purposes.

-   /// </remarks>

-   public class SslOptions

-   {

-      private X509Certificate _clientCertificate;

-      private bool _ignoreValidationErrors;

-

-      /// <summary>

-      /// Certificate to present to the broker to authenticate

-      /// this client connection

-      /// </summary>

-      public X509Certificate ClientCertificate

-      {

-         get { return _clientCertificate; }

-      }

-

-      /// <summary>

-      /// If true, the validity of the broker certificate 

-      /// will not be verified on connection

-      /// </summary>

-      public bool IgnoreValidationErrors

-      {

-         get { return _ignoreValidationErrors; }

-      }

-

-      /// <summary>

-      /// Initialize a new instance with default values 

-      /// (No client certificate, don't ignore validation errors)

-      /// </summary>

-      public SslOptions()

-      {

-      }

-

-      /// <summary>

-      /// Initialize a new instance

-      /// </summary>

-      /// <param name="clientCertificate">

-      /// Certificate to use to authenticate the client to the broker

-      /// </param>

-      /// <param name="ignoreValidationErrors">

-      /// If true, ignore any validation errors when validating the server certificate

-      /// </param>

-      public SslOptions(X509Certificate clientCertificate, bool ignoreValidationErrors)

-      {

-         _clientCertificate = clientCertificate;

-         _ignoreValidationErrors = ignoreValidationErrors;

-      }

-   }

-}

diff --git a/qpid/dotnet/Qpid.Client/Client/State/AMQState.cs b/qpid/dotnet/Qpid.Client/Client/State/AMQState.cs
deleted file mode 100644
index 67f8427fb2..0000000000
--- a/qpid/dotnet/Qpid.Client/Client/State/AMQState.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-namespace Apache.Qpid.Client.State
-{
-    public enum AMQState
-    {
-        CONNECTION_NOT_STARTED,    
-        CONNECTION_NOT_TUNED,    
-        CONNECTION_NOT_OPENED,
-        CONNECTION_OPEN,
-        CONNECTION_CLOSING,    
-        CONNECTION_CLOSED,
-        ALL // all is a special state used in the state manager. It is not valid to be "in" the state "all".
-    }
-}
-
-
diff --git a/qpid/dotnet/Qpid.Client/Client/State/AMQStateChangedEvent.cs b/qpid/dotnet/Qpid.Client/Client/State/AMQStateChangedEvent.cs
deleted file mode 100644
index a464bbb6f5..0000000000
--- a/qpid/dotnet/Qpid.Client/Client/State/AMQStateChangedEvent.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-namespace Apache.Qpid.Client.State
-{
-    public class AMQStateChangedEvent
-    {
-        private readonly AMQState _oldState;
-
-        private readonly AMQState _newState;
-
-        public AMQStateChangedEvent(AMQState oldState, AMQState newState)
-        {
-            _oldState = oldState;
-            _newState = newState;
-        }
-
-        public AMQState OldState
-        {
-            get
-            {
-                return _oldState;
-            }
-        }
-
-        public AMQState NewState
-        {
-            get
-            {
-                return _newState;
-            }
-        }
-
-    }
-}
diff --git a/qpid/dotnet/Qpid.Client/Client/State/AMQStateManager.cs b/qpid/dotnet/Qpid.Client/Client/State/AMQStateManager.cs
deleted file mode 100644
index 881e01e697..0000000000
--- a/qpid/dotnet/Qpid.Client/Client/State/AMQStateManager.cs
+++ /dev/null
@@ -1,251 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using System;
-using System.Collections;
-using log4net;
-using Apache.Qpid.Client.Handler;
-using Apache.Qpid.Client.Protocol;
-using Apache.Qpid.Client.Protocol.Listener;
-using Apache.Qpid.Framing;
-
-namespace Apache.Qpid.Client.State
-{
-    public class AMQStateManager : IAMQMethodListener
-    {
-        private static readonly ILog _logger = LogManager.GetLogger(typeof(AMQStateManager));
-
-        const bool InfoLoggingHack = true;
-            
-        /// <summary>
-        /// The current state
-        /// </summary>
-        private AMQState _currentState;
-
-        /// <summary>
-        /// Maps from an AMQState instance to a Map from Class to StateTransitionHandler.
-        /// The class must be a subclass of AMQFrame.
-        /// </summary>
-        private readonly IDictionary _state2HandlersMap;
-        private ArrayList _stateListeners;
-        private object _syncLock;
-        
-        public AMQStateManager()
-        {
-            _syncLock = new object();
-            _state2HandlersMap = new Hashtable();
-            _stateListeners = ArrayList.Synchronized(new ArrayList(5));
-            _currentState = AMQState.CONNECTION_NOT_STARTED;
-            RegisterListeners();
-        }
-
-        private void RegisterListeners()
-        {
-            IStateAwareMethodListener connectionStart = new ConnectionStartMethodHandler();
-            IStateAwareMethodListener connectionClose = new ConnectionCloseMethodHandler();
-            IStateAwareMethodListener connectionCloseOk = new ConnectionCloseOkHandler();
-            IStateAwareMethodListener connectionTune = new ConnectionTuneMethodHandler();
-            IStateAwareMethodListener connectionSecure = new ConnectionSecureMethodHandler();
-            IStateAwareMethodListener connectionOpenOk = new ConnectionOpenOkMethodHandler();
-            IStateAwareMethodListener channelClose = new ChannelCloseMethodHandler();
-            IStateAwareMethodListener basicDeliver = new BasicDeliverMethodHandler();
-            IStateAwareMethodListener basicReturn = new BasicReturnMethodHandler();
-            IStateAwareMethodListener queueDeleteOk = new QueueDeleteOkMethodHandler();
-            IStateAwareMethodListener queuePurgeOk = new QueuePurgeOkMethodHandler();
-            
-            // We need to register a map for the null (i.e. all state) handlers otherwise you get
-            // a stack overflow in the handler searching code when you present it with a frame for which
-            // no handlers are registered.
-            _state2HandlersMap[AMQState.ALL] = new Hashtable();
-
-            {
-                Hashtable notStarted = new Hashtable();
-                notStarted[typeof(ConnectionStartBody)] = connectionStart;
-                notStarted[typeof(ConnectionCloseBody)] = connectionClose;
-                _state2HandlersMap[AMQState.CONNECTION_NOT_STARTED] = notStarted;
-            }
-            {
-                Hashtable notTuned = new Hashtable();
-                notTuned[typeof(ConnectionTuneBody)] = connectionTune;
-                notTuned[typeof(ConnectionSecureBody)] = connectionSecure;
-                notTuned[typeof(ConnectionCloseBody)] = connectionClose;
-                _state2HandlersMap[AMQState.CONNECTION_NOT_TUNED] = notTuned;
-            }
-            {
-                Hashtable notOpened = new Hashtable();
-                notOpened[typeof(ConnectionOpenOkBody)] = connectionOpenOk;
-                notOpened[typeof(ConnectionCloseBody)] = connectionClose;
-                _state2HandlersMap[AMQState.CONNECTION_NOT_OPENED] = notOpened;
-            }
-            {
-                Hashtable open = new Hashtable();
-                open[typeof(ChannelCloseBody)] = channelClose;
-                open[typeof(ConnectionCloseBody)] = connectionClose;
-                open[typeof(BasicDeliverBody)] = basicDeliver;
-                open[typeof(BasicReturnBody)] = basicReturn;
-                open[typeof(QueueDeleteOkBody)] = queueDeleteOk;
-                open[typeof(QueuePurgeOkBody)] = queuePurgeOk;
-                _state2HandlersMap[AMQState.CONNECTION_OPEN] = open;
-            }
-            {
-                Hashtable closing = new Hashtable();
-                closing[typeof(ConnectionCloseOkBody)] = connectionCloseOk;
-                _state2HandlersMap[AMQState.CONNECTION_CLOSING] = closing;
-            }
-        }
-
-        public AMQState CurrentState
-        {
-            get
-            {
-                return _currentState;
-            }
-        }
-
-        /// <summary>
-        /// Changes the state.
-        /// </summary>
-        /// <param name="newState">The new state.</param>
-        /// <exception cref="AMQException">if there is an error changing state</exception>
-        public void ChangeState(AMQState newState)
-        {
-            if (InfoLoggingHack)
-            {
-                _logger.Debug("State changing to " + newState + " from old state " + _currentState);
-            }
-            _logger.Debug("State changing to " + newState + " from old state " + _currentState);
-            AMQState oldState = _currentState;
-            _currentState = newState;
-
-            lock ( _syncLock )
-            {
-               foreach ( IStateListener l in _stateListeners )
-               {
-                  l.StateChanged(oldState, newState);
-               }
-            }
-        }
-
-        public void Error(Exception e)
-        {
-            _logger.Debug("State manager receive error notification: " + e);
-            lock ( _syncLock )
-            {
-               foreach ( IStateListener l in _stateListeners )
-               {
-                  l.Error(e);
-               }
-            }
-        }
-
-        public bool MethodReceived(AMQMethodEvent evt)
-        {
-            _logger.Debug(String.Format("Finding method handler. currentState={0} type={1}", _currentState, evt.Method.GetType()));            
-            IStateAwareMethodListener handler = FindStateTransitionHandler(_currentState, evt.Method);
-            if (handler != null)
-            {
-                handler.MethodReceived(this, evt);
-                return true;
-            }
-            return false;
-        }
-
-        /// <summary>
-        /// Finds the state transition handler.
-        /// </summary>
-        /// <param name="currentState">State of the current.</param>
-        /// <param name="frame">The frame.</param>
-        /// <returns></returns>
-        /// <exception cref="IllegalStateTransitionException">if the state transition if not allowed</exception>
-        private IStateAwareMethodListener FindStateTransitionHandler(AMQState currentState,
-                                                                     AMQMethodBody frame)                
-        {
-            Type clazz = frame.GetType();
-            if (_logger.IsDebugEnabled)
-            {
-                _logger.Debug("Looking for state transition handler for frame " + clazz);
-            }
-            IDictionary classToHandlerMap = (IDictionary) _state2HandlersMap[currentState];
-
-            if (classToHandlerMap == null)
-            {
-                // if no specialised per state handler is registered look for a
-                // handler registered for "all" states
-                return FindStateTransitionHandler(AMQState.ALL, frame);
-            }
-            IStateAwareMethodListener handler = (IStateAwareMethodListener) classToHandlerMap[clazz];
-            if (handler == null)
-            {
-                if (currentState == AMQState.ALL)
-                {
-                    _logger.Debug("No state transition handler defined for receiving frame " + frame);
-                    return null;
-                }
-                else
-                {
-                    // if no specialised per state handler is registered look for a
-                    // handler registered for "all" states
-                    return FindStateTransitionHandler(AMQState.ALL, frame);
-                }
-            }
-            else
-            {
-                return handler;
-            }
-        }
-
-        public void AddStateListener(IStateListener listener)
-        {
-            _logger.Debug("Adding state listener");
-            lock ( _syncLock )
-            {
-               _stateListeners.Add(listener);
-            }
-        }
-
-        public void RemoveStateListener(IStateListener listener)
-        {
-           lock ( _syncLock )
-           {
-              _stateListeners.Remove(listener);
-           }
-        }
-
-        public void AttainState(AMQState s)
-        {
-            if (_currentState != s)
-            {
-                StateWaiter sw = null;
-                try
-                {
-                    _logger.Debug("Adding state wait to reach state " + s);
-                    sw = new StateWaiter(s);
-                    AddStateListener(sw);
-                    sw.WaituntilStateHasChanged();
-                    // at this point the state will have changed.
-                }
-                finally
-                { 
-                    RemoveStateListener(sw);
-                }
-            }
-        }        
-    }
-}
diff --git a/qpid/dotnet/Qpid.Client/Client/State/IAMQStateListener.cs b/qpid/dotnet/Qpid.Client/Client/State/IAMQStateListener.cs
deleted file mode 100644
index 31e4b5046d..0000000000
--- a/qpid/dotnet/Qpid.Client/Client/State/IAMQStateListener.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-namespace Apache.Qpid.Client.State
-{
-    public interface IAMQStateListener
-    {
-        void StateChanged(AMQStateChangedEvent evt);               
-    }
-}
-
-
diff --git a/qpid/dotnet/Qpid.Client/Client/State/IStateAwareMethodListener.cs b/qpid/dotnet/Qpid.Client/Client/State/IStateAwareMethodListener.cs
deleted file mode 100644
index 0874f39665..0000000000
--- a/qpid/dotnet/Qpid.Client/Client/State/IStateAwareMethodListener.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using Apache.Qpid.Client.Protocol;
-
-namespace Apache.Qpid.Client.State
-{
-    public interface IStateAwareMethodListener
-    {
-        void MethodReceived(AMQStateManager stateManager, AMQMethodEvent evt);
-    }
-}
-
-
diff --git a/qpid/dotnet/Qpid.Client/Client/State/IStateListener.cs b/qpid/dotnet/Qpid.Client/Client/State/IStateListener.cs
deleted file mode 100644
index edd7382f93..0000000000
--- a/qpid/dotnet/Qpid.Client/Client/State/IStateListener.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using System;
-
-namespace Apache.Qpid.Client.State
-{
-    public interface IStateListener
-    {
-        void StateChanged(AMQState oldState, AMQState newState);
-
-        void Error(Exception e);
-    }
-}
-
-
diff --git a/qpid/dotnet/Qpid.Client/Client/State/IllegalStateTransitionException.cs b/qpid/dotnet/Qpid.Client/Client/State/IllegalStateTransitionException.cs
deleted file mode 100644
index 81de622617..0000000000
--- a/qpid/dotnet/Qpid.Client/Client/State/IllegalStateTransitionException.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using System;
-using System.Runtime.Serialization;
-
-namespace Apache.Qpid.Client.State
-{
-    [Serializable]
-    public class IllegalStateTransitionException : AMQException
-    {
-        private AMQState _originalState;
-
-        private Type _frame;
-
-        public IllegalStateTransitionException(AMQState originalState, Type frame)
-            : base("No valid state transition defined for receiving frame " + frame +
-                   " from state " + originalState)
-        {            
-            _originalState = originalState;
-            _frame = frame;
-        }
-
-        protected IllegalStateTransitionException(SerializationInfo info, StreamingContext ctxt)
-           : base(info, ctxt)
-        {
-           _originalState = (AMQState)info.GetValue("OriginalState", typeof(AMQState));
-           _frame = (Type)info.GetValue("FrameType", typeof(Type));
-        }
-
-        public AMQState OriginalState            
-        {
-            get
-            {
-                return _originalState;
-            }
-        }
-
-        public Type FrameType
-        {
-            get
-            {
-                return _frame;
-            }
-        }
-
-        public override void GetObjectData(SerializationInfo info, StreamingContext context)
-        {
-           base.GetObjectData(info, context);
-           info.AddValue("OriginalState", OriginalState);
-           info.AddValue("FrameType", FrameType);
-        }
-    }
-}
-
-
-
diff --git a/qpid/dotnet/Qpid.Client/Client/State/StateWaiter.cs b/qpid/dotnet/Qpid.Client/Client/State/StateWaiter.cs
deleted file mode 100644
index e739d0cb44..0000000000
--- a/qpid/dotnet/Qpid.Client/Client/State/StateWaiter.cs
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using System;
-using System.Threading;
-using Apache.Qpid.Client.Protocol;
-using log4net;
-
-namespace Apache.Qpid.Client.State
-{
-    public class StateWaiter : IStateListener
-    {
-        private static readonly ILog _logger = LogManager.GetLogger(typeof(StateWaiter));
-
-        private readonly AMQState _state;
-        private AMQState _newState;
-
-        private volatile bool _newStateAchieved;
-
-        private volatile Exception _exception;
-
-        private ManualResetEvent _resetEvent = new ManualResetEvent(false);
-        
-        public StateWaiter(AMQState state)
-        {
-            _state = state;
-        }
-
-        public void StateChanged(AMQState oldState, AMQState newState)
-        {
-            _newState = newState;
-            if (_logger.IsDebugEnabled)
-            {
-                _logger.Debug("stateChanged called");
-            }
-            if (_state == newState)
-            {
-                _newStateAchieved = true;
-
-                if (_logger.IsDebugEnabled)
-                {
-                    _logger.Debug("New state reached so notifying monitor");
-                }
-                _resetEvent.Set();
-            }            
-        }
-
-        public void Error(Exception e)
-        {            
-            if (_logger.IsDebugEnabled)
-            {
-                _logger.Debug("exceptionThrown called");
-            }
-
-            _exception = e;
-            _resetEvent.Set();
-        }
-        
-        public void WaituntilStateHasChanged()
-        {            
-            //
-            // The guard is required in case we are woken up by a spurious
-            // notify().
-            //
-
-            TimeSpan waitTime = TimeSpan.FromMilliseconds(DefaultTimeouts.MaxWaitForState);
-            DateTime waitUntilTime = DateTime.Now + waitTime;
-
-            while ( !_newStateAchieved 
-               && _exception == null 
-               && waitTime.TotalMilliseconds > 0 )
-            {
-                _logger.Debug("State not achieved so waiting...");
-                try
-                {
-                    _resetEvent.WaitOne(waitTime, true);
-                }
-                finally
-                {
-                    if (!_newStateAchieved)
-                    {
-                        waitTime = waitUntilTime - DateTime.Now;
-                    }
-                }
-            }
-
-            if (_exception != null)
-            {
-                _logger.Debug("Throwable reached state waiter: " + _exception);
-                if (_exception is AMQException)
-                    throw _exception;
-                else
-                    throw new AMQException("Error: "  + _exception, _exception);
-            }
-
-            if (!_newStateAchieved)
-            {
-                string error = string.Format("State not achieved within permitted time. Current state: {0}, desired state: {1}", _state, _newState);
-                _logger.Warn(error);
-                throw new AMQException(error);
-            }
-        }
-    }
-}
diff --git a/qpid/dotnet/Qpid.Client/Client/Transport/AMQProtocolProvider.cs b/qpid/dotnet/Qpid.Client/Client/Transport/AMQProtocolProvider.cs
deleted file mode 100644
index dd0bb404cb..0000000000
--- a/qpid/dotnet/Qpid.Client/Client/Transport/AMQProtocolProvider.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using Apache.Qpid.Codec;
-using Apache.Qpid.Codec.Demux;
-using Apache.Qpid.Framing;
-
-namespace Apache.Qpid.Client.Transport
-{
-    public class AMQProtocolProvider
-    {
-        private DemuxingProtocolCodecFactory _factory;
-
-        public AMQProtocolProvider()
-        {
-            _factory = new DemuxingProtocolCodecFactory();
-            _factory.Register(new AMQDataBlockEncoder());
-            _factory.Register(new AMQDataBlockDecoder());
-            _factory.Register(new ProtocolInitiation.Decoder());
-        }
-
-        public IProtocolCodecFactory CodecFactory
-        {
-            get
-            {
-                return _factory;
-            }
-        }
-    }
-}
diff --git a/qpid/dotnet/Qpid.Client/Client/Transport/AmqpChannel.cs b/qpid/dotnet/Qpid.Client/Client/Transport/AmqpChannel.cs
deleted file mode 100644
index dc72846bbe..0000000000
--- a/qpid/dotnet/Qpid.Client/Client/Transport/AmqpChannel.cs
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using System;
-using System.Collections;
-using log4net;
-using Apache.Qpid.Buffer;
-using Apache.Qpid.Codec;
-using Apache.Qpid.Codec.Support;
-using Apache.Qpid.Framing;
-
-namespace Apache.Qpid.Client.Transport
-{
-    public class AmqpChannel : IProtocolChannel
-    {
-        // Warning: don't use this log for regular logging.
-        static readonly ILog _protocolTraceLog = LogManager.GetLogger("Qpid.Client.ProtocolChannel.Tracing");
-        
-        IByteChannel _byteChannel;
-        IProtocolEncoder _encoder;
-        IProtocolDecoder _decoder;
-        IProtocolDecoderOutput _decoderOutput;
-        private object _syncLock;
-
-        public AmqpChannel(IByteChannel byteChannel, IProtocolDecoderOutput decoderOutput)
-        {
-            _byteChannel = byteChannel;
-            _decoderOutput = decoderOutput;
-            _syncLock = new object();
-            
-            AMQProtocolProvider protocolProvider = new AMQProtocolProvider();
-            IProtocolCodecFactory factory = protocolProvider.CodecFactory;
-            _encoder = factory.Encoder;
-            _decoder = factory.Decoder;
-        }
-
-        public void Read()
-        {
-            ByteBuffer buffer = _byteChannel.Read();
-            Decode(buffer);
-        }
-        
-        public IAsyncResult BeginRead(AsyncCallback callback, object state)
-        {
-           return _byteChannel.BeginRead(callback, state);
-        }
-
-        public void EndRead(IAsyncResult result)
-        {
-           ByteBuffer buffer = _byteChannel.EndRead(result);
-           Decode(buffer);
-        }
-
-        public void Write(IDataBlock o)
-        {
-            // TODO: Refactor to decorator.
-            if (_protocolTraceLog.IsDebugEnabled)
-            {
-                _protocolTraceLog.Debug(String.Format("WRITE {0}", o));
-            }
-            // we should be doing an async write, but apparently
-            // the mentalis library doesn't queue async read/writes
-            // correctly and throws random IOException's. Stay sync for a while
-            //_byteChannel.BeginWrite(Encode(o), OnAsyncWriteDone, null);
-            _byteChannel.Write(Encode(o));
-        }
-
-        // not used for now
-        //private void OnAsyncWriteDone(IAsyncResult result)
-        //{
-        //   _byteChannel.EndWrite(result);
-        //}
-
-        private void Decode(ByteBuffer buffer)
-        {
-           // make sure we don't try to decode more than
-           // one buffer at the same time
-           lock ( _syncLock )
-           {
-              _decoder.Decode(buffer, _decoderOutput);
-           }
-        }
-
-        private ByteBuffer Encode(object o)
-        {
-            SingleProtocolEncoderOutput output = new SingleProtocolEncoderOutput();
-            _encoder.Encode(o, output);
-            return output.buffer;
-        }
-
-    }
-}
-
-
diff --git a/qpid/dotnet/Qpid.Client/Client/Transport/IByteChannel.cs b/qpid/dotnet/Qpid.Client/Client/Transport/IByteChannel.cs
deleted file mode 100644
index 35806f2a6e..0000000000
--- a/qpid/dotnet/Qpid.Client/Client/Transport/IByteChannel.cs
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using System;
-using Apache.Qpid.Buffer;
-
-namespace Apache.Qpid.Client.Transport
-{
-   /// <summary>
-   /// Represents input/output channels that read
-   /// and write <see cref="ByteBuffer"/> instances
-   /// </summary>
-   public interface IByteChannel
-   {
-      /// <summary>
-      /// Read a <see cref="ByteBuffer"/> from the underlying 
-      /// network stream and any configured filters 
-      /// </summary>
-      /// <returns>A ByteBuffer, if available</returns>
-      ByteBuffer Read();
-      /// <summary>
-      /// Begin an asynchronous read operation
-      /// </summary>
-      /// <param name="callback">Callback method to call when read operation completes</param>
-      /// <param name="state">State object</param>
-      /// <returns>An <see cref="System.IAsyncResult"/> object</returns>
-      IAsyncResult BeginRead(AsyncCallback callback, object state);
-      /// <summary>
-      /// End an asynchronous read operation
-      /// </summary>
-      /// <param name="result">The <see cref="System.IAsyncResult"/> object returned from <see cref="BeginRead"/></param>
-      /// <returns>The <see cref="ByteBuffer"/> read</returns>
-      ByteBuffer EndRead(IAsyncResult result);
-      /// <summary>
-      /// Write a <see cref="ByteBuffer"/> to the underlying network 
-      /// stream, going through any configured filters
-      /// </summary>
-      /// <param name="buffer"></param>
-      void Write(ByteBuffer buffer);
-      /// <summary>
-      /// Begin an asynchronous write operation
-      /// </summary>
-      /// <param name="buffer">Buffer to write</param>
-      /// <param name="callback">A callback to call when the operation completes</param>
-      /// <param name="state">State object</param>
-      /// <returns>An <see cref="System.IAsyncResult"/> object</returns>
-      IAsyncResult BeginWrite(ByteBuffer buffer, AsyncCallback callback, object state);
-      /// <summary>
-      /// End an asynchronous write operation
-      /// </summary>
-      /// <param name="result">The <see cref="System.IAsyncResult"/> object returned by <see cref="BeginWrite"/></param>
-      void EndWrite(IAsyncResult result);
-   }
-}
diff --git a/qpid/dotnet/Qpid.Client/Client/Transport/IProtocolChannel.cs b/qpid/dotnet/Qpid.Client/Client/Transport/IProtocolChannel.cs
deleted file mode 100644
index 0b59ee8799..0000000000
--- a/qpid/dotnet/Qpid.Client/Client/Transport/IProtocolChannel.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using System;
-using System.Collections;
-
-namespace Apache.Qpid.Client.Transport
-{
-    public interface IProtocolChannel : IProtocolWriter
-    {
-        void Read();
-        IAsyncResult BeginRead(AsyncCallback callback, object state);
-        void EndRead(IAsyncResult result);
-    }
-}
diff --git a/qpid/dotnet/Qpid.Client/Client/Transport/IProtocolWriter.cs b/qpid/dotnet/Qpid.Client/Client/Transport/IProtocolWriter.cs
deleted file mode 100644
index 592dff3a19..0000000000
--- a/qpid/dotnet/Qpid.Client/Client/Transport/IProtocolWriter.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using Apache.Qpid.Framing;
-
-namespace Apache.Qpid.Client.Transport
-{
-    public interface IProtocolWriter
-    {
-        void Write(IDataBlock o);
-    }
-}
diff --git a/qpid/dotnet/Qpid.Client/Client/Transport/IStreamFilter.cs b/qpid/dotnet/Qpid.Client/Client/Transport/IStreamFilter.cs
deleted file mode 100644
index 7195b3ab04..0000000000
--- a/qpid/dotnet/Qpid.Client/Client/Transport/IStreamFilter.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-/*

- *

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- *

- */

-using System.IO;

-

-namespace Apache.Qpid.Client.Transport

-{

-   /// <summary>

-   /// Defines a way to introduce an arbitrary filtering

-   /// stream into the stream chain managed by <see cref="IoHandler"/>

-   /// </summary>

-   public interface IStreamFilter

-   {

-      /// <summary>

-      /// Creates a new filtering stream on top of another

-      /// </summary>

-      /// <param name="lowerStream">Next stream on the stack</param>

-      /// <returns>A new filtering stream</returns>

-      Stream CreateFilterStream(Stream lowerStream);

-   }

-}

diff --git a/qpid/dotnet/Qpid.Client/Client/Transport/ITransport.cs b/qpid/dotnet/Qpid.Client/Client/Transport/ITransport.cs
deleted file mode 100644
index 693a9a9534..0000000000
--- a/qpid/dotnet/Qpid.Client/Client/Transport/ITransport.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using Apache.Qpid.Client.Qms;
-using Apache.Qpid.Client.Protocol;
-
-namespace Apache.Qpid.Client.Transport
-{
-    public interface ITransport : IConnectionCloser
-    {
-        void Connect(IBrokerInfo broker, AMQConnection connection);
-        string LocalEndpoint { get; }
-        IProtocolWriter ProtocolWriter { get; }
-    }
-}
diff --git a/qpid/dotnet/Qpid.Client/Client/Transport/IoHandler.cs b/qpid/dotnet/Qpid.Client/Client/Transport/IoHandler.cs
deleted file mode 100644
index 556f9631b3..0000000000
--- a/qpid/dotnet/Qpid.Client/Client/Transport/IoHandler.cs
+++ /dev/null
@@ -1,321 +0,0 @@
-/*

- *

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- *

- */

-using System;

-using System.IO;

-using System.Threading;

-using log4net;

-using Apache.Qpid.Buffer;

-using Apache.Qpid.Client.Protocol;

-

-namespace Apache.Qpid.Client.Transport

-{

-   /// <summary>

-   /// Responsible for reading and writing

-   /// ByteBuffers from/to network streams, and handling

-   /// the stream filters

-   /// </summary>

-   public class IoHandler : IByteChannel, IDisposable

-   {

-      private static readonly ILog _log = LogManager.GetLogger(typeof(IoHandler));

-      private const int DEFAULT_BUFFER_SIZE = 32 * 1024;

-

-      private Stream _topStream;

-      private IProtocolListener _protocolListener;

-      private int _readBufferSize;

-

-      public int ReadBufferSize

-      {

-         get { return _readBufferSize; }

-         set { _readBufferSize = value; }

-      }

-

-      /// <summary>

-      /// Initialize a new instance

-      /// </summary>

-      /// <param name="stream">Underlying network stream</param>

-      /// <param name="protocolListener">Protocol listener to report exceptions to</param>

-      public IoHandler(Stream stream, IProtocolListener protocolListener)

-      {

-         if ( stream == null )

-            throw new ArgumentNullException("stream");

-         if ( protocolListener == null )

-            throw new ArgumentNullException("protocolListener");

-

-         // initially, the stream at the top of the filter 

-         // chain is the underlying network stream

-         _topStream = stream;

-         _protocolListener = protocolListener;

-         _readBufferSize = DEFAULT_BUFFER_SIZE;

-      }

-

-      /// <summary>

-      /// Adds a new filter on the top of the chain

-      /// </summary>

-      /// <param name="filter">Stream filter to put on top of the chain</param>

-      /// <remarks>

-      /// This should *only* be called during initialization. We don't

-      /// support changing the filter change after the first read/write

-      /// has been done and it's not thread-safe to boot!

-      /// </remarks>

-      public void AddFilter(IStreamFilter filter)

-      {

-         _topStream = filter.CreateFilterStream(_topStream);

-      }

-

-      #region IByteChannel Implementation

-      //

-      // IByteChannel Implementation

-      //

-

-      /// <summary>

-      /// Read a <see cref="ByteBuffer"/> from the underlying 

-      /// network stream and any configured filters 

-      /// </summary>

-      /// <returns>A ByteBuffer, if available</returns>

-      public ByteBuffer Read()

-      {

-         byte[] bytes = AllocateBuffer();

-

-         int numOctets = _topStream.Read(bytes, 0, bytes.Length);

-

-         return WrapByteArray(bytes, numOctets);

-      }

-

-      /// <summary>

-      /// Begin an asynchronous read operation

-      /// </summary>

-      /// <param name="callback">Callback method to call when read operation completes</param>

-      /// <param name="state">State object</param>

-      /// <returns>An <see cref="System.IAsyncResult"/> object</returns>

-      public IAsyncResult BeginRead(AsyncCallback callback, object state)

-      {

-         byte[] bytes = AllocateBuffer();

-         ReadData rd = new ReadData(callback, state, bytes);

-         

-         // only put a callback if the caller wants one.

-         AsyncCallback myCallback = null;

-         if ( callback != null )

-            myCallback = new AsyncCallback(OnAsyncReadDone);

-

-         IAsyncResult result = _topStream.BeginRead(

-            bytes, 0, bytes.Length, myCallback,rd

-            );

-         return new WrappedAsyncResult(result, bytes);

-      }

-

-      /// <summary>

-      /// End an asynchronous read operation

-      /// </summary>

-      /// <param name="result">The <see cref="System.IAsyncResult"/> object returned from <see cref="BeginRead"/></param>

-      /// <returns>The <see cref="ByteBuffer"/> read</returns>

-      public ByteBuffer EndRead(IAsyncResult result)

-      {

-         WrappedAsyncResult theResult = (WrappedAsyncResult)result;

-         int bytesRead = _topStream.EndRead(theResult.InnerResult);

-         return WrapByteArray(theResult.Buffer, bytesRead);

-      }

-

-      /// <summary>

-      /// Write a <see cref="ByteBuffer"/> to the underlying network 

-      /// stream, going through any configured filters

-      /// </summary>

-      /// <param name="buffer"></param>

-      public void Write(ByteBuffer buffer)

-      {

-         try

-         {

-            _topStream.Write(buffer.Array, buffer.Position, buffer.Limit); // FIXME

-         } catch ( Exception e )

-         {

-            _log.Error("Write caused exception", e);

-            _protocolListener.OnException(e);

-         }

-      }

-

-      /// <summary>

-      /// Begin an asynchronous write operation

-      /// </summary>

-      /// <param name="buffer">Buffer to write</param>

-      /// <param name="callback">A callback to call when the operation completes</param>

-      /// <param name="state">State object</param>

-      /// <returns>An <see cref="System.IAsyncResult"/> object</returns>

-      public IAsyncResult BeginWrite(ByteBuffer buffer, AsyncCallback callback, object state)

-      {

-         try 

-         {

-            return _topStream.BeginWrite(

-               buffer.Array, buffer.Position, buffer.Limit,

-               callback, state

-               );

-         } catch ( Exception e )

-         {

-            _log.Error("BeginWrite caused exception", e);

-            // not clear if an exception here should be propagated? we still

-            // need to propagate it upwards anyway!

-            _protocolListener.OnException(e);

-            throw;

-         }

-      }

-

-      /// <summary>

-      /// End an asynchronous write operation

-      /// </summary>

-      /// <param name="result">The <see cref="System.IAsyncResult"/> object returned by <see cref="BeginWrite"/></param>

-      public void EndWrite(IAsyncResult result)

-      {

-         try

-         {

-            _topStream.EndWrite(result);

-         } catch ( Exception e )

-         {

-            _log.Error("EndWrite caused exception", e);

-            // not clear if an exception here should be propagated? 

-            _protocolListener.OnException(e);

-            //throw;

-         }

-      }

-      #endregion // IByteChannel Implementation

-

-      #region IDisposable Implementation

-      //

-      // IDisposable Implementation

-      //

-

-      public void Dispose()

-      {

-         if ( _topStream != null )

-         {

-            _topStream.Close();

-         }

-      }

-

-      #endregion // IDisposable Implementation

-

-      #region Private and Helper Classes/Methods

-      //

-      // Private and Helper Classes/Methods

-      //

-

-      private byte[] AllocateBuffer()

-      {

-         return new byte[ReadBufferSize];

-      }

-

-      private static ByteBuffer WrapByteArray(byte[] bytes, int size)

-      {

-         ByteBuffer byteBuffer = ByteBuffer.Wrap(bytes);

-         byteBuffer.Limit = size;

-         byteBuffer.Flip();

-

-         return byteBuffer;

-      }

-

-

-      private static void OnAsyncReadDone(IAsyncResult result)

-      {

-         ReadData rd = (ReadData) result.AsyncState;

-         IAsyncResult wrapped = new WrappedAsyncResult(result, rd.Buffer);

-         rd.Callback(wrapped);

-      }

-

-      class ReadData

-      {

-         private object _state;

-         private AsyncCallback _callback;

-         private byte[] _buffer;

-

-         public object State

-         {

-            get { return _state; }

-         }

-

-         public AsyncCallback Callback

-         {

-            get { return _callback; }

-         }

-

-         public byte[] Buffer

-         {

-            get { return _buffer; }

-         }

-

-         public ReadData(AsyncCallback callback, object state, byte[] buffer)

-         {

-            _callback = callback;

-            _state = state;

-            _buffer = buffer;

-         }

-      }

-

-      class WrappedAsyncResult : IAsyncResult

-      {

-         private IAsyncResult _innerResult;

-         private byte[] _buffer;

-

-         #region IAsyncResult Properties

-         //

-         // IAsyncResult Properties

-         //

-         public bool IsCompleted

-         {

-            get { return _innerResult.IsCompleted; }

-         }

-

-         public WaitHandle AsyncWaitHandle

-         {

-            get { return _innerResult.AsyncWaitHandle; }

-         }

-

-         public object AsyncState

-         {

-            get { return _innerResult.AsyncState; }

-         }

-

-         public bool CompletedSynchronously

-         {

-            get { return _innerResult.CompletedSynchronously; }

-         }

-         #endregion // IAsyncResult Properties

-

-         public IAsyncResult InnerResult

-         {

-            get { return _innerResult; }

-         }

-         public byte[] Buffer

-         {

-            get { return _buffer; }

-         }

-

-         public WrappedAsyncResult(IAsyncResult result, byte[] buffer)

-         {

-            if ( result == null )

-               throw new ArgumentNullException("result");

-            if ( buffer == null )

-               throw new ArgumentNullException("buffer");

-

-            _innerResult = result;

-            _buffer = buffer;

-         }

-      }

-

-      #endregion // Private and Helper Classes/Methods

-   }

-}

diff --git a/qpid/dotnet/Qpid.Client/Client/Transport/ProtocolDecoderOutput.cs b/qpid/dotnet/Qpid.Client/Client/Transport/ProtocolDecoderOutput.cs
deleted file mode 100644
index 357aab0f45..0000000000
--- a/qpid/dotnet/Qpid.Client/Client/Transport/ProtocolDecoderOutput.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-/*

- *

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- *

- */

-using System;

-using System.Threading;

-using Apache.Qpid.Client.Protocol;

-using Apache.Qpid.Codec;

-using Apache.Qpid.Framing;

-using log4net;

-

-namespace Apache.Qpid.Client.Transport

-{

-   /// <summary>

-   /// <see cref="IProtocolDecoderOutput"/> implementation that forwards

-   /// each <see cref="IDataBlock"/> as it is decoded to the

-   /// protocol listener

-   /// </summary>

-   internal class ProtocolDecoderOutput : IProtocolDecoderOutput

-   {

-      private IProtocolListener _protocolListener;

-      static readonly ILog _protocolTraceLog = LogManager.GetLogger("Qpid.Client.ProtocolChannel.Tracing");

-

-      public ProtocolDecoderOutput(IProtocolListener protocolListener)

-      {

-         if ( protocolListener == null )

-            throw new ArgumentNullException("protocolListener");

-

-         _protocolListener = protocolListener;

-      }

-

-      public void Write(object message)

-      {

-         IDataBlock block = message as IDataBlock;

-         if ( block != null )

-         {

-            _protocolTraceLog.Debug(String.Format("READ {0}", block));

-            _protocolListener.OnMessage(block);

-         }

-      }

-   }

-} // namespace Apache.Qpid.Client.Transport

-

-

diff --git a/qpid/dotnet/Qpid.Client/Client/Transport/SingleProtocolEncoderOutput.cs b/qpid/dotnet/Qpid.Client/Client/Transport/SingleProtocolEncoderOutput.cs
deleted file mode 100644
index a1aa889ba0..0000000000
--- a/qpid/dotnet/Qpid.Client/Client/Transport/SingleProtocolEncoderOutput.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using System;
-using Apache.Qpid.Buffer;
-using Apache.Qpid.Codec;
-
-namespace Apache.Qpid.Client.Transport
-{
-    public class SingleProtocolEncoderOutput : IProtocolEncoderOutput
-    {
-        public ByteBuffer buffer;
-
-        public void Write(ByteBuffer buf)
-        {
-            if (buffer != null)
-            {
-                throw new InvalidOperationException("{0} does not allow the writing of more than one buffer");
-            }
-            buffer = buf;
-        }
-    }
-}
diff --git a/qpid/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/BlockingSocketTransport.cs b/qpid/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/BlockingSocketTransport.cs
deleted file mode 100644
index 8a16f9a675..0000000000
--- a/qpid/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/BlockingSocketTransport.cs
+++ /dev/null
@@ -1,150 +0,0 @@
-/*

- *

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- *

- */

-using System;

-using System.Collections;

-using System.IO;

-using System.Threading;

-using Apache.Qpid.Client.Qms;

-using Apache.Qpid.Client.Protocol;

-using Apache.Qpid.Codec;

-using Apache.Qpid.Framing;

-

-namespace Apache.Qpid.Client.Transport.Socket.Blocking

-{

-   /// <summary>

-   /// TCP Socket transport supporting both

-   /// SSL and non-SSL connections.

-   /// </summary>

-   public class BlockingSocketTransport : ITransport

-   {

-      // Configuration variables.

-      IProtocolListener _protocolListener;

-

-      // Runtime variables.

-      private ISocketConnector _connector;

-      private IoHandler _ioHandler;

-      private AmqpChannel _amqpChannel;

-      private ManualResetEvent _stopEvent;

-

-      public IProtocolWriter ProtocolWriter

-      {

-         get { return _amqpChannel; }

-      }

-      public string LocalEndpoint

-      {

-         get { return _connector.LocalEndpoint; }

-      }

-

-      

-      /// <summary>

-      /// Connect to the specified broker

-      /// </summary>

-      /// <param name="broker">The broker to connect to</param>

-      /// <param name="connection">The AMQ connection</param>

-      public void Connect(IBrokerInfo broker, AMQConnection connection)

-      {

-         _stopEvent = new ManualResetEvent(false);

-         _protocolListener = connection.ProtocolListener;

-

-         _ioHandler = MakeBrokerConnection(broker, connection);

-         // todo: get default read size from config!

-

-         IProtocolDecoderOutput decoderOutput =

-            new ProtocolDecoderOutput(_protocolListener);

-         _amqpChannel = 

-            new AmqpChannel(new ByteChannel(_ioHandler), decoderOutput);

-

-         // post an initial async read

-         _amqpChannel.BeginRead(new AsyncCallback(OnAsyncReadDone), this);

-      }

-

-      /// <summary>

-      /// Close the broker connection

-      /// </summary>

-      public void Close()

-      {

-         StopReading();

-         CloseBrokerConnection();

-      }

-

-      private void StopReading()

-      {

-         _stopEvent.Set();

-      }

-

-      private void CloseBrokerConnection()

-      {

-         if ( _ioHandler != null )

-         {

-            _ioHandler.Dispose();

-            _ioHandler = null;

-         }

-         if ( _connector != null )

-         {

-            _connector.Dispose();

-            _connector = null;

-         }

-      }

-

-      private IoHandler MakeBrokerConnection(IBrokerInfo broker, AMQConnection connection)

-      {

-         if ( broker.UseSSL )

-         {

-            _connector = new SslSocketConnector();

-         } else

-         {

-            _connector = new SocketConnector();

-         }

-

-         Stream stream = _connector.Connect(broker);

-         return new IoHandler(stream, connection.ProtocolListener);

-      }

-

-      private void OnAsyncReadDone(IAsyncResult result)

-      {

-         try

-         {

-            _amqpChannel.EndRead(result);

-

-            bool stopping = _stopEvent.WaitOne(0, false);

-            if ( !stopping )

-               _amqpChannel.BeginRead(new AsyncCallback(OnAsyncReadDone), null);

-         } catch ( Exception e )

-         {

-            // ignore any errors during closing

-            bool stopping = _stopEvent.WaitOne(0, false);

-            if ( !stopping )

-               _protocolListener.OnException(e);

-         }

-      }

-

-      #region IProtocolDecoderOutput Members

-

-      public void Write(object message)

-      {

-         _protocolListener.OnMessage((IDataBlock)message);

-      }

-

-      #endregion

-   }

-}

-

-

diff --git a/qpid/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/ByteChannel.cs b/qpid/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/ByteChannel.cs
deleted file mode 100644
index 077f69541f..0000000000
--- a/qpid/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/ByteChannel.cs
+++ /dev/null
@@ -1,92 +0,0 @@
-/*

- *

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- *

- */

-using System;

-using log4net;

-using Apache.Qpid.Buffer;

-

-namespace Apache.Qpid.Client.Transport.Socket.Blocking

-{

-    class ByteChannel : IByteChannel

-    {

-        // Warning: don't use this log for regular logging.

-        private static readonly ILog _ioTraceLog = LogManager.GetLogger("Qpid.Client.ByteChannel.Tracing");

-

-       private IByteChannel _lowerChannel;

-        

-        public ByteChannel(IByteChannel lowerChannel)

-        {

-            _lowerChannel = lowerChannel;

-        }

-

-        public ByteBuffer Read()

-        {

-            ByteBuffer result = _lowerChannel.Read();

-

-            // TODO: Move into decorator.

-            if (_ioTraceLog.IsDebugEnabled)

-            {

-                _ioTraceLog.Debug(String.Format("READ {0}", result));

-            }

-            

-            return result;

-        }

-

-        public IAsyncResult BeginRead(AsyncCallback callback, object state)

-        {

-           return _lowerChannel.BeginRead(callback, state);

-        }

-

-        public ByteBuffer EndRead(IAsyncResult result)

-        {

-           ByteBuffer buffer = _lowerChannel.EndRead(result);

-           if ( _ioTraceLog.IsDebugEnabled )

-           {

-              _ioTraceLog.Debug(String.Format("READ {0}", buffer));

-           }

-           return buffer;

-        }

-

-        public void Write(ByteBuffer buffer)

-        {

-            // TODO: Move into decorator.

-            if (_ioTraceLog.IsDebugEnabled)

-            {

-                _ioTraceLog.Debug(String.Format("WRITE {0}", buffer));

-            }

-

-            _lowerChannel.Write(buffer);

-        }

-     

-        public IAsyncResult BeginWrite(ByteBuffer buffer, AsyncCallback callback, object state)

-        {

-           if ( _ioTraceLog.IsDebugEnabled )

-           {

-              _ioTraceLog.Debug(String.Format("WRITE {0}", buffer));

-           }

-           return _lowerChannel.BeginWrite(buffer, callback, state);

-        }

-

-        public void EndWrite(IAsyncResult result)

-        {

-           _lowerChannel.EndWrite(result);

-        }

-     }

-}

diff --git a/qpid/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/ISocketConnector.cs b/qpid/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/ISocketConnector.cs
deleted file mode 100644
index 3d5d2898cf..0000000000
--- a/qpid/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/ISocketConnector.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-/*

- *

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- *

- */

-using System;

-using System.IO;

-using Apache.Qpid.Client.Qms;

-

-namespace Apache.Qpid.Client.Transport.Socket.Blocking

-{

-   interface ISocketConnector : IDisposable

-   {

-      string LocalEndpoint { get; }

-      Stream Connect(IBrokerInfo broker);

-   }

-}

-

-

diff --git a/qpid/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/SocketConnector.cs b/qpid/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/SocketConnector.cs
deleted file mode 100644
index 83f7287e9b..0000000000
--- a/qpid/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/SocketConnector.cs
+++ /dev/null
@@ -1,71 +0,0 @@
-/*

- *

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- *

- */

-using System.IO;

-using System.Net;

-using System.Net.Sockets;

-using Apache.Qpid.Client.Qms;

-

-namespace Apache.Qpid.Client.Transport.Socket.Blocking

-{

-   /// <summary>

-   /// Implements a TCP connection over regular sockets.

-   /// </summary>

-   class SocketConnector : ISocketConnector

-   {

-      private MyTcpClient _tcpClient;

-

-      public string LocalEndpoint

-      {

-         get { return _tcpClient.LocalEndpoint.ToString(); }

-      }

-

-      public Stream Connect(IBrokerInfo broker)

-      {

-         _tcpClient = new MyTcpClient(broker.Host, broker.Port);

-         return _tcpClient.GetStream();

-      }

-

-      public void Dispose()

-      {

-         if ( _tcpClient != null )

-         {

-            _tcpClient.Close();

-            _tcpClient = null;

-         }

-      }

-

-      class MyTcpClient : TcpClient

-      {

-         public MyTcpClient(string host, int port)

-            : base(host, port)

-         {

-         }

-

-         public EndPoint LocalEndpoint

-         {

-            get { return Client.LocalEndPoint; }

-         }

-      }

-

-   }

-}

-

-

diff --git a/qpid/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/SslSocketConnector.cs b/qpid/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/SslSocketConnector.cs
deleted file mode 100644
index 708edde48c..0000000000
--- a/qpid/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/SslSocketConnector.cs
+++ /dev/null
@@ -1,107 +0,0 @@
-/*

- *

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- *

- */

-using System.IO;

-using System.Net;

-using log4net;

-using Apache.Qpid.Client.Qms;

-using Org.Mentalis.Security.Ssl;

-using MCertificate = Org.Mentalis.Security.Certificates.Certificate;

-using MCertificateChain = Org.Mentalis.Security.Certificates.CertificateChain;

-

-namespace Apache.Qpid.Client.Transport.Socket.Blocking

-{

-   /// <summary>

-   /// Implements a TLS v1.0 connection using the Mentalis.org library

-   /// </summary>

-   /// <remarks>

-   /// It would've been easier to implement this at the StreamFilter

-   /// level, but unfortunately the Mentalis library doesn't support

-   /// a passthrough SSL stream class and is tied directly

-   /// to socket-like classes.

-   /// </remarks>

-   class SslSocketConnector : ISocketConnector

-   {

-      private static ILog _logger = LogManager.GetLogger(typeof(SslSocketConnector));

-      private MyTcpClient _tcpClient;

-

-      public string LocalEndpoint

-      {

-         get { return _tcpClient.LocalEndpoint.ToString(); }

-      }

-

-      public Stream Connect(IBrokerInfo broker)

-      {

-         MCertificate cert = GetClientCert(broker);

-         SecurityOptions options = new SecurityOptions(

-            SecureProtocol.Tls1, cert, ConnectionEnd.Client

-            );

-         if ( broker.SslOptions != null 

-            && broker.SslOptions.IgnoreValidationErrors )

-         {

-            _logger.Warn("Ignoring any certificate validation errors during SSL handshake...");

-            options.VerificationType = CredentialVerification.None;

-         }

-

-         _tcpClient = new MyTcpClient(broker.Host, broker.Port, options);

-         return _tcpClient.GetStream();

-      }

-

-      public void Dispose()

-      {

-         if ( _tcpClient != null )

-         {

-            _tcpClient.Close();

-            _tcpClient = null;

-         }

-      }

-

-      private static MCertificate GetClientCert(IBrokerInfo broker)

-      {

-         // if a client certificate is configured, 

-         // use that to enable mutual authentication

-         MCertificate cert = null;

-         if ( broker.SslOptions != null 

-            && broker.SslOptions.ClientCertificate != null )

-         {

-            cert = MCertificate.CreateFromX509Certificate(

-               broker.SslOptions.ClientCertificate

-               );

-            _logger.DebugFormat("Using Client Certificate for SSL '{0}'", cert.ToString(true));

-         }

-         return cert;

-      }

-

-      class MyTcpClient : SecureTcpClient

-      {

-         public MyTcpClient(string host, int port, SecurityOptions options)

-            : base(host, port, options)

-         {

-         }

-

-         public EndPoint LocalEndpoint

-         {

-            get { return Client.LocalEndPoint; }

-         }

-

-      }

-

-   }

-}

diff --git a/qpid/dotnet/Qpid.Client/Client/Util/FlowControlQueue.cs b/qpid/dotnet/Qpid.Client/Client/Util/FlowControlQueue.cs
deleted file mode 100644
index 87bb2a2859..0000000000
--- a/qpid/dotnet/Qpid.Client/Client/Util/FlowControlQueue.cs
+++ /dev/null
@@ -1,98 +0,0 @@
-/*

- *

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- *

- */

-using System;

-using System.Collections;

-using System.Text;

-using System.Threading;

-using Apache.Qpid.Collections;

-using Apache.Qpid.Common;

-

-namespace Apache.Qpid.Client.Util

-{

-   internal delegate void ThresholdMethod(int currentCount);

-

-   /// <summary>

-   /// Basic bounded queue used to implement prefetching.

-   /// Notice we do the callbacks here asynchronously to

-   /// avoid adding more complexity to the channel impl.

-   /// </summary>

-   internal class FlowControlQueue

-   {

-      private BlockingQueue _queue = new LinkedBlockingQueue();

-      private int _itemCount;

-      private int _lowerBound;

-      private int _upperBound;

-      private ThresholdMethod _underThreshold;

-      private ThresholdMethod _overThreshold;

-

-      public FlowControlQueue(

-         int lowerBound, 

-         int upperBound,

-         ThresholdMethod underThreshold,

-         ThresholdMethod overThreshold

-         )

-      {

-         _lowerBound = lowerBound;

-         _upperBound = upperBound;

-         _underThreshold = underThreshold;

-         _overThreshold = overThreshold;

-      }

-

-      public void Enqueue(object item)

-      {

-         _queue.EnqueueBlocking(item);

-         int count = Interlocked.Increment(ref _itemCount);

-         if ( _overThreshold != null )

-         {

-            if ( count == _upperBound )

-            {

-               _overThreshold.BeginInvoke(

-                  count, new AsyncCallback(OnAsyncCallEnd), 

-                  _overThreshold

-                  );

-            }

-         }

-      }

-

-      public object Dequeue()

-      {

-         object item = _queue.DequeueBlocking();

-         int count = Interlocked.Decrement(ref _itemCount);

-         if ( _underThreshold != null )

-         {

-            if ( count == _lowerBound )

-            {

-               _underThreshold.BeginInvoke(

-                  count, new AsyncCallback(OnAsyncCallEnd),

-                  _underThreshold

-                  );

-            }

-         }

-         return item;

-      }

-

-      private void OnAsyncCallEnd(IAsyncResult res)

-      {

-         ThresholdMethod method = (ThresholdMethod)res.AsyncState;

-         method.EndInvoke(res);

-      }

-   }

-}

diff --git a/qpid/dotnet/Qpid.Client/Properties/AssemblyInfo.cs b/qpid/dotnet/Qpid.Client/Properties/AssemblyInfo.cs
deleted file mode 100644
index 8722a02db9..0000000000
--- a/qpid/dotnet/Qpid.Client/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using System.Reflection;
-using System.Runtime.InteropServices;
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("Apache.Qpid.Client")]
-[assembly: AssemblyDescription("Qpid Client API implementation")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Apache Qpid")]
-[assembly: AssemblyProduct("Apache.Qpid.Client")]
-[assembly: AssemblyCopyright("Copyright (c) 2006 The Apache Software Foundation")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("380cb124-07a8-40c2-b67d-69a0d94cb620")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Revision and Build Numbers 
-// by using the '*' as shown below:
-[assembly: AssemblyVersion("0.5.*")]
diff --git a/qpid/dotnet/Qpid.Client/Qpid.Client.csproj b/qpid/dotnet/Qpid.Client/Qpid.Client.csproj
deleted file mode 100644
index 9294d76764..0000000000
--- a/qpid/dotnet/Qpid.Client/Qpid.Client.csproj
+++ /dev/null
@@ -1,163 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <PropertyGroup>

-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ProductVersion>8.0.50727</ProductVersion>

-    <SchemaVersion>2.0</SchemaVersion>

-    <ProjectGuid>{68987C05-3768-452C-A6FC-6BA1D372852F}</ProjectGuid>

-    <OutputType>Library</OutputType>

-    <AppDesignerFolder>Properties</AppDesignerFolder>

-    <RootNamespace>Apache.Qpid.Client</RootNamespace>

-    <AssemblyName>Apache.Qpid.Client</AssemblyName>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

-    <DebugSymbols>true</DebugSymbols>

-    <DebugType>full</DebugType>

-    <Optimize>false</Optimize>

-    <OutputPath>..\bin\net-2.0\debug\</OutputPath>

-    <DefineConstants>DEBUG;TRACE</DefineConstants>

-    <ErrorReport>prompt</ErrorReport>

-    <WarningLevel>4</WarningLevel>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

-    <DebugType>pdbonly</DebugType>

-    <Optimize>true</Optimize>

-    <OutputPath>..\bin\net-2.0\release\</OutputPath>

-    <DefineConstants>TRACE</DefineConstants>

-    <ErrorReport>prompt</ErrorReport>

-    <WarningLevel>4</WarningLevel>

-  </PropertyGroup>

-  <ItemGroup>

-    <Reference Include="log4net, Version=1.2.0.30714, Culture=neutral, PublicKeyToken=500ffcafb14f92df">

-      <SpecificVersion>False</SpecificVersion>

-      <HintPath>..\Qpid.Common\lib\log4net\log4net.dll</HintPath>

-    </Reference>

-    <Reference Include="Org.Mentalis.Security, Version=1.0.13.716, Culture=neutral, PublicKeyToken=085a8f6006888436">

-      <SpecificVersion>False</SpecificVersion>

-      <HintPath>..\Qpid.Common\lib\seclib-1.0.0\Org.Mentalis.Security.dll</HintPath>

-    </Reference>

-    <Reference Include="System" />

-    <Reference Include="System.Data" />

-    <Reference Include="System.Xml" />

-  </ItemGroup>

-  <ItemGroup>

-    <Compile Include="Client\AmqBrokerInfo.cs" />

-    <Compile Include="Client\AMQConnection.cs" />

-    <Compile Include="Client\AMQConnectionException.cs" />

-    <Compile Include="Client\AMQDestination.cs" />

-    <Compile Include="Client\AmqChannel.cs" />

-    <Compile Include="Client\AMQAuthenticationException.cs" />

-    <Compile Include="Client\AMQNoConsumersException.cs" />

-    <Compile Include="Client\AMQNoRouteException.cs" />

-    <Compile Include="Client\Configuration\AuthenticationConfigurationSectionHandler.cs" />

-    <Compile Include="Client\Handler\QueueDeleteOkMethodHandler.cs" />

-    <Compile Include="Client\Handler\QueuePurgeOkMethodHandler.cs" />

-    <Compile Include="Client\Protocol\DefaultTimeouts.cs" />

-    <Compile Include="Client\SslOptions.cs" />

-    <Compile Include="Client\Message\QpidHeaders.cs" />

-    <Compile Include="Client\QpidConnectionInfo.cs" />

-    <Compile Include="Client\BasicMessageConsumer.cs" />

-    <Compile Include="Client\BasicMessageProducer.cs" />

-    <Compile Include="Client\Closeable.cs" />

-    <Compile Include="Client\ConnectionTuneParameters.cs" />

-    <Compile Include="Client\Failover\FailoverException.cs" />

-    <Compile Include="Client\Failover\FailoverHandler.cs" />

-    <Compile Include="Client\Failover\FailoverState.cs" />

-    <Compile Include="Client\Failover\FailoverSupport.cs" />

-    <Compile Include="Client\Handler\BasicDeliverMethodHandler.cs" />

-    <Compile Include="Client\Handler\BasicReturnMethodHandler.cs" />

-    <Compile Include="Client\Handler\ChannelCloseMethodHandler.cs" />

-    <Compile Include="Client\Handler\ConnectionCloseMethodHandler.cs" />

-    <Compile Include="Client\Handler\ConnectionCloseOkHandler.cs" />

-    <Compile Include="Client\Handler\ConnectionOpenOkMethodHandler.cs" />

-    <Compile Include="Client\Handler\ConnectionRedirectMethodHandler.cs" />

-    <Compile Include="Client\Handler\ConnectionSecureMethodHandler.cs" />

-    <Compile Include="Client\Handler\ConnectionStartMethodHandler.cs" />

-    <Compile Include="Client\Handler\ConnectionTuneMethodHandler.cs" />

-    <Compile Include="Client\Message\AbstractQmsMessage.cs" />

-    <Compile Include="Client\Message\AMQMessage.cs" />

-    <Compile Include="Client\Message\AMQMessageFactory.cs" />

-    <Compile Include="Client\Message\IMessageFactory.cs" />

-    <Compile Include="Client\Message\MessageFactoryRegistry.cs" />

-    <Compile Include="Client\Message\UnexpectedBodyReceivedException.cs" />

-    <Compile Include="Client\Message\UnprocessedMessage.cs" />

-    <Compile Include="Client\Message\QpidBytesMessage.cs" />

-    <Compile Include="Client\Message\QpidBytesMessageFactory.cs" />

-    <Compile Include="Client\Message\QpidTextMessage.cs" />

-    <Compile Include="Client\Message\QpidTextMessageFactory.cs" />

-    <Compile Include="Client\Protocol\AMQMethodEvent.cs" />

-    <Compile Include="Client\Protocol\AMQProtocolListener.cs" />

-    <Compile Include="Client\Protocol\AMQProtocolSession.cs" />

-    <Compile Include="Client\Protocol\Listener\BlockingMethodFrameListener.cs" />

-    <Compile Include="Client\Protocol\Listener\IAMQMethodListener.cs" />

-    <Compile Include="Client\Protocol\IConnectionCloser.cs" />

-    <Compile Include="Client\Protocol\ProtocolWriter.cs" />

-    <Compile Include="Client\Protocol\IProtocolListener.cs" />

-    <Compile Include="Client\Security\CallbackHandlerRegistry.cs" />

-    <Compile Include="Client\Security\IAMQCallbackHandler.cs" />

-    <Compile Include="Client\Security\UsernamePasswordCallbackHandler.cs" />

-    <Compile Include="Client\State\AMQState.cs" />

-    <Compile Include="Client\State\AMQStateChangedEvent.cs" />

-    <Compile Include="Client\State\AMQStateManager.cs" />

-    <Compile Include="Client\State\IAMQStateListener.cs" />

-    <Compile Include="Client\State\IllegalStateTransitionException.cs" />

-    <Compile Include="Client\State\IStateAwareMethodListener.cs" />

-    <Compile Include="Client\State\IStateListener.cs" />

-    <Compile Include="Client\Protocol\Listener\SpecificMethodFrameListener.cs" />

-    <Compile Include="Client\State\StateWaiter.cs" />

-    <Compile Include="Client\Transport\AmqpChannel.cs" />

-    <Compile Include="Client\Transport\AMQProtocolProvider.cs" />

-    <Compile Include="Client\Transport\IStreamFilter.cs" />

-    <Compile Include="Client\Transport\IoHandler.cs" />

-    <Compile Include="Client\Transport\IByteChannel.cs" />

-    <Compile Include="Client\Transport\IProtocolChannel.cs" />

-    <Compile Include="Client\Transport\IProtocolWriter.cs" />

-    <Compile Include="Client\Transport\ITransport.cs" />

-    <Compile Include="Client\Transport\ProtocolDecoderOutput.cs" />

-    <Compile Include="Client\Transport\SingleProtocolEncoderOutput.cs" />

-    <Compile Include="Client\Transport\Socket\Blocking\BlockingSocketTransport.cs" />

-    <Compile Include="Client\Transport\Socket\Blocking\ByteChannel.cs" />

-    <Compile Include="Client\Transport\Socket\Blocking\SslSocketConnector.cs" />

-    <Compile Include="Client\Transport\Socket\Blocking\SocketConnector.cs" />

-    <Compile Include="Client\Transport\Socket\Blocking\ISocketConnector.cs" />

-    <Compile Include="Client\Util\FlowControlQueue.cs" />

-    <Compile Include="Properties\AssemblyInfo.cs" />

-    <Compile Include="qms\BrokerInfo.cs" />

-    <Compile Include="qms\ConnectionInfo.cs" />

-    <Compile Include="qms\FailoverPolicy.cs" />

-    <Compile Include="qms\failover\FailoverMethod.cs" />

-    <Compile Include="qms\failover\FailoverRoundRobin.cs" />

-    <Compile Include="qms\failover\FailoverSingleServer.cs" />

-    <Compile Include="qms\UrlSyntaxException.cs" />

-  </ItemGroup>

-  <ItemGroup>

-    <ProjectReference Include="..\Qpid.Buffer\Qpid.Buffer.csproj">

-      <Project>{44384DF2-B0A4-4580-BDBC-EE4BAA87D995}</Project>

-      <Name>Qpid.Buffer</Name>

-    </ProjectReference>

-    <ProjectReference Include="..\Qpid.Codec\Qpid.Codec.csproj">

-      <Project>{22D0D0C2-77AF-4DE3-B456-7FF3893F9F88}</Project>

-      <Name>Qpid.Codec</Name>

-    </ProjectReference>

-    <ProjectReference Include="..\Qpid.Messaging\Qpid.Messaging.csproj">

-      <Project>{6688F826-C58E-4C1B-AA1F-22AFAB4B7D07}</Project>

-      <Name>Qpid.Messaging</Name>

-    </ProjectReference>

-    <ProjectReference Include="..\Qpid.Common\Qpid.Common.csproj">

-      <Project>{77064C42-24D2-4CEB-9EA2-0EF481A43205}</Project>

-      <Name>Qpid.Common</Name>

-    </ProjectReference>

-    <ProjectReference Include="..\Qpid.Sasl\Qpid.Sasl.csproj">

-      <Project>{1465B0EE-6452-42A6-AB73-B2F9EABEEE75}</Project>

-      <Name>Qpid.Sasl</Name>

-    </ProjectReference>

-  </ItemGroup>

-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

-       Other similar extension points exist, see Microsoft.Common.targets.

-  <Target Name="BeforeBuild">

-  </Target>

-  <Target Name="AfterBuild">

-  </Target>

-  -->

-</Project>

diff --git a/qpid/dotnet/Qpid.Client/default.build b/qpid/dotnet/Qpid.Client/default.build
deleted file mode 100644
index 14e457203e..0000000000
--- a/qpid/dotnet/Qpid.Client/default.build
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0"?>
-<project name="Apache.Qpid.Client" default="build">
-    <!--
-		Properties that come from master build file
-		- build.dir: root directory for build
-		- build.debug: true if building debug release
-		- build.defines: variables to define during build
-    -->
-
-    <target name="build">
-        <csc target="library" 
-				define="${build.defines}" 
-				debug="${build.debug}" 
-				output="${build.dir}/${project::get-name()}.dll">
-			
-			<sources>
-			   <include name="**/*.cs" />
-         </sources>
-         <references>
-            <include name="${build.dir}/log4net.dll" />	
-            <include name="${build.dir}/Apache.Qpid.Buffer.dll" />	
-            <include name="${build.dir}/Apache.Qpid.Sasl.dll" />	
-            <include name="${build.dir}/Apache.Qpid.Codec.dll" />	
-            <include name="${build.dir}/Apache.Qpid.Common.dll" />	
-            <include name="${build.dir}/Apache.Qpid.Messaging.dll" />	
-            <include name="${build.dir}/Org.Mentalis.Security.dll" />
-         </references>
-        </csc>
-    </target>
-</project>
-
diff --git a/qpid/dotnet/Qpid.Client/qms/BrokerInfo.cs b/qpid/dotnet/Qpid.Client/qms/BrokerInfo.cs
deleted file mode 100644
index 93c00af6e0..0000000000
--- a/qpid/dotnet/Qpid.Client/qms/BrokerInfo.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using System;
-
-namespace Apache.Qpid.Client.Qms
-{
-    /// <summary>
-    /// Know URL option names.
-    /// <seealso cref="IConnectionInfo"/>
-    /// </summary>
-    public class BrokerInfoConstants
-    {
-        public const String OPTIONS_RETRY = "retries";
-        public const String OPTIONS_SSL = ConnectionUrlConstants.OPTIONS_SSL;
-        public const String OPTIONS_CONNECT_TIMEOUT = "connecttimeout";
-        public const int DEFAULT_PORT = 5672;
-        public const String DEFAULT_TRANSPORT = "tcp";
-
-        public readonly string URL_FORMAT_EXAMPLE =
-                "<transport>://<hostname>[:<port Default=\"" + DEFAULT_PORT + "\">][?<option>='<value>'[,<option>='<value>']]";
-
-        public const long DEFAULT_CONNECT_TIMEOUT = 30000L;
-    }
-    
-    public interface IBrokerInfo
-    {
-        string Host { get; set; }
-        int Port { get; set; }
-        string Transport { get; set; }
-        bool UseSSL { get; set; }
-        long Timeout { get; set; }
-        SslOptions SslOptions { get; }
-        
-        String GetOption(string key);
-        void SetOption(string key, string value);
-    }
-}
diff --git a/qpid/dotnet/Qpid.Client/qms/ConnectionInfo.cs b/qpid/dotnet/Qpid.Client/qms/ConnectionInfo.cs
deleted file mode 100644
index 4d3f7698b5..0000000000
--- a/qpid/dotnet/Qpid.Client/qms/ConnectionInfo.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using System.Collections;
-
-namespace Apache.Qpid.Client.Qms
-{
-    class ConnectionUrlConstants 
-    {
-        public const string AMQ_PROTOCOL = "amqp";
-        public const string OPTIONS_BROKERLIST = "brokerlist";
-        public const string OPTIONS_FAILOVER = "failover";
-        public const string OPTIONS_FAILOVER_CYCLE = "cyclecount";
-        public const string OPTIONS_SSL = "ssl";
-    }
-
-    /// <summary>
-    /// Connection URL format
-    /// amqp://[user:pass@][clientid]/virtualhost?brokerlist='tcp://host:port?option=\'value\'&amp;option=\'value\';vm://:3/virtualpath?option=\'value\''&amp;failover='method?option=\'value\'&amp;option='value''"
-    /// Options are of course optional except for requiring a single broker in the broker list.
-    /// The option seperator is defined to be either '&amp;' or ','
-    /// </summary>
-    public interface IConnectionInfo
-    {
-        string AsUrl();
-
-        string FailoverMethod { get; set; }
-        string ClientName { get; set; }
-        string Username { get; set; }
-        string Password { get; set; }
-        string VirtualHost { get; set; }
-        string GetFailoverOption(string key);
-        
-        int BrokerCount { get; }
-
-        IBrokerInfo GetBrokerInfo(int index);
-
-        void AddBrokerInfo(IBrokerInfo broker);
-
-        IList GetAllBrokerInfos();
-
-        string GetOption(string key);
-
-        void SetOption(string key, string value);
-    }
-}
diff --git a/qpid/dotnet/Qpid.Client/qms/FailoverPolicy.cs b/qpid/dotnet/Qpid.Client/qms/FailoverPolicy.cs
deleted file mode 100644
index d5d1e8d8ac..0000000000
--- a/qpid/dotnet/Qpid.Client/qms/FailoverPolicy.cs
+++ /dev/null
@@ -1,315 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using System;
-using System.Text;
-using log4net;
-using Apache.Qpid.Client.Qms.Failover;
-
-namespace Apache.Qpid.Client.Qms
-{
-    public class FailoverPolicy
-    {
-        private static readonly ILog _logger = LogManager.GetLogger(typeof(FailoverPolicy));
-
-        private const long MINUTE = 60000L;
-
-        private const long DEFAULT_METHOD_TIMEOUT = 1 * MINUTE;
-        private const long DEFAULT_FAILOVER_TIMEOUT = 4 * MINUTE;
-
-        private IFailoverMethod[] _methods = new IFailoverMethod[1];
-
-        private int _currentMethod;
-
-        private int _methodsRetries;
-
-        private int _currentRetry;
-
-        private bool _timing;
-
-        private long _lastMethodTime;
-        private long _lastFailTime;
-
-        public FailoverPolicy(IConnectionInfo connectionInfo)
-        {
-            IFailoverMethod method;
-
-            //todo This should be integrated in to the connection url when it supports
-            // multiple strategies.
-
-            _methodsRetries = 0;
-
-            if (connectionInfo.FailoverMethod == null)
-            {
-                if (connectionInfo.BrokerCount > 1)
-                {
-                    method = new FailoverRoundRobin(connectionInfo);
-                }
-                else
-                {
-                    method = new FailoverSingleServer(connectionInfo);
-                }
-            }
-            else
-            {
-                string failoverMethod = connectionInfo.FailoverMethod;
-
-    /*
-                if (failoverMethod.equals(FailoverMethod.RANDOM))
-                {
-                    //todo write a random connection Failover
-                }
-    */
-                if (failoverMethod.Equals(FailoverMethodConstants.ROUND_ROBIN))
-                {
-                    method = new FailoverRoundRobin(connectionInfo);
-                }
-                else
-                {
-                    throw new NotImplementedException("Dynamic loading of FailoverMethods not yet implemented.");
-//                    try
-//                    {
-//                        Type[] constructorSpec = {ConnectionInfo.class};
-//                        Object [] params = {connectionInfo};
-//
-//                        method = (FailoverMethod) ClassLoader.getSystemClassLoader().
-//                                loadClass(failoverMethod).
-//                                getConstructor(constructorSpec).newInstance(params);
-//                    }
-//                    catch (Exception cnfe)
-//                    {
-//                        throw new IllegalArgumentException("Unknown failover method:" + failoverMethod);
-//                    }
-                }
-            }
-
-            if (method == null)
-            {
-                throw new ArgumentException("Unknown failover method specified.");
-            }
-
-            reset();
-
-            _methods[_currentMethod] = method;
-        }
-
-        public FailoverPolicy(IFailoverMethod method) : this(method, 0)
-        {
-        }
-
-        public FailoverPolicy(IFailoverMethod method, int retries)
-        {
-            _methodsRetries = retries;
-
-            reset();
-
-            _methods[_currentMethod] = method;
-        }
-
-        private void reset()
-        {
-            _currentMethod = 0;
-            _currentRetry = 0;
-            _timing = false;
-
-        }
-
-        public bool FailoverAllowed()
-        {
-            bool failoverAllowed;
-
-            if (_timing)
-            {
-                long now = CurrentTimeMilliseconds();
-
-                if ((now - _lastMethodTime) >= DEFAULT_METHOD_TIMEOUT)
-                {
-                    _logger.Info("Failover method timeout");
-                    _lastMethodTime = now;
-
-                    if (!nextMethod())
-                    {
-                        return false;
-                    }
-
-
-                }
-                else if ((now - _lastFailTime) >= DEFAULT_FAILOVER_TIMEOUT)
-                {
-                    _logger.Info("Failover timeout");
-                    return false;
-                }
-                else
-                {
-                    _lastMethodTime = now;
-                }
-            }
-            else
-            {
-                _timing = true;
-                _lastMethodTime = CurrentTimeMilliseconds();
-                _lastFailTime = _lastMethodTime;
-            }
-
-
-            if (_methods[_currentMethod].FailoverAllowed())
-            {
-                failoverAllowed = true;
-            }
-            else
-            {
-                if (_currentMethod < (_methods.Length - 1))
-                {
-                    nextMethod();
-                    _logger.Info("Changing method to " + _methods[_currentMethod].MethodName);
-                    return FailoverAllowed();
-                }
-                else
-                {
-                    return cycleMethods();
-                }
-            }
-
-            return failoverAllowed;
-        }
-
-        private static long CurrentTimeMilliseconds()
-        {
-            return DateTime.Now.Ticks / TimeSpan.TicksPerMillisecond;
-        }
-
-        private bool nextMethod()
-        {
-            if (_currentMethod < (_methods.Length - 1))
-            {
-                _currentMethod++;
-                _methods[_currentMethod].Reset();
-                return true;
-            }
-            else
-            {
-                return cycleMethods();
-            }
-        }
-
-        private bool cycleMethods()
-        {
-            if (_currentRetry < _methodsRetries)
-            {
-                _currentRetry++;
-
-                _currentMethod = 0;
-
-                _logger.Info("Retrying methods starting with " + _methods[_currentMethod].MethodName);
-                _methods[_currentMethod].Reset();
-                return FailoverAllowed();
-            }
-            else
-            {
-                _logger.Debug("All failover methods exhausted");
-                return false;
-            }
-        }
-
-        /**
-         * Notification that connection was successful.
-         */
-        public void attainedConnection()
-        {
-            _currentRetry = 0;
-
-            _methods[_currentMethod].AttainedConnection();
-
-            _timing = false;
-        }
-
-        public IBrokerInfo GetCurrentBrokerInfo()
-        {
-            return _methods[_currentMethod].GetCurrentBrokerInfo();
-        }
-
-        public IBrokerInfo GetNextBrokerInfo()
-        {
-            return _methods[_currentMethod].GetNextBrokerDetails();
-        }
-
-        public void setBroker(IBrokerInfo broker)
-        {
-            _methods[_currentMethod].SetBroker(broker);
-        }
-
-        public void addMethod(IFailoverMethod method)
-        {
-            int len = _methods.Length + 1;
-            IFailoverMethod[] newMethods = new IFailoverMethod[len];
-            _methods.CopyTo(newMethods, 0);
-//            System.arraycopy(_methods, 0, newMethods, 0, _methods.length);
-            int index = len - 1;
-            newMethods[index] = method;
-            _methods = newMethods;
-        }
-
-        public void setMethodRetries(int retries)
-        {
-            _methodsRetries = retries;
-        }
-
-        public IFailoverMethod getCurrentMethod()
-        {
-            if (_currentMethod >= 0 && _currentMethod < (_methods.Length - 1))
-            {
-                return _methods[_currentMethod];
-            }
-            else
-            {
-                return null;
-            }
-        }
-
-        public String toString()
-        {
-            StringBuilder sb = new StringBuilder();
-
-            sb.Append("Failover Policy:\n");
-
-            if (FailoverAllowed())
-            {
-                sb.Append("Failover allowed\n");
-            }
-            else
-            {
-                sb.Append("Failover not allowed\n");
-            }
-
-            sb.Append("Failover policy methods\n");
-            for (int i = 0; i < _methods.Length; i++)
-            {
-
-                if (i == _currentMethod)
-                {
-                    sb.Append(">");
-                }
-                sb.Append(_methods[i].ToString());
-            }
-
-            return sb.ToString();
-        }
-    }
-}
diff --git a/qpid/dotnet/Qpid.Client/qms/UrlSyntaxException.cs b/qpid/dotnet/Qpid.Client/qms/UrlSyntaxException.cs
deleted file mode 100644
index ab3de325d4..0000000000
--- a/qpid/dotnet/Qpid.Client/qms/UrlSyntaxException.cs
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using System;
-using System.Runtime.Serialization;
-using System.Text;
-
-namespace Apache.Qpid.Client.Qms
-{
-    [Serializable]
-    public class UrlSyntaxException : UriFormatException
-    {
-        private string _url;
-        private int _index;
-        private int _length;
-
-        public int GetIndex()
-        {
-            return _index;
-        }
-
-        public UrlSyntaxException(String input, String reason)
-            : this(input, reason, -1)
-        {
-        }
-
-        private UrlSyntaxException(string input, string reason, int index)
-            :
-            this(input, reason, index, input.Length)
-        {
-        }
-
-        public UrlSyntaxException(String url, String error, int index, int length)
-            : base(error)
-        {
-            _url = url;
-            _index = index;
-            _length = length;
-        }
-
-        protected UrlSyntaxException(SerializationInfo info, StreamingContext ctxt)
-           : base(info, ctxt)
-        {
-            _url = info.GetString("Url");
-            _index = info.GetInt32("Index");
-            _length = info.GetInt32("Length");
-        }
-
-        public override void GetObjectData(SerializationInfo info, StreamingContext context)
-        {
-            base.GetObjectData(info, context);
-            info.AddValue("Url", _url);
-            info.AddValue("Index", _index);
-            info.AddValue("Length", _length);
-        }
-
-        private static String getPositionString(int index, int length)
-        {
-            StringBuilder sb = new StringBuilder(index + 1);
-
-            for (int i = 0; i < index; i++)
-            {
-                sb.Append(" ");
-            }
-
-            if (length > -1)
-            {
-                for (int i = 0; i < length; i++)
-                {
-                    sb.Append('^');
-                }
-            }
-
-            return sb.ToString();
-        }
-
-
-        public String toString()
-        {
-            StringBuilder sb = new StringBuilder();
-
-//            sb.Append(getReason());
-
-            if (_index > -1)
-            {
-                if (_length != -1)
-                {
-                    sb.Append(" between indicies ");
-                    sb.Append(_index);
-                    sb.Append(" and ");
-                    sb.Append(_length);
-                }
-                else
-                {
-                    sb.Append(" at index ");
-                    sb.Append(_index);
-                }
-            }
-
-            sb.Append(" ");
-            if (_index != -1)
-            {
-                sb.Append("\n");
-            }
-
-            sb.Append(_url);
-
-            if (_index != -1)
-            {
-                sb.Append("\n");
-                sb.Append(getPositionString(_index, _length));
-            }
-
-            return sb.ToString();
-        }
-    }
-}
diff --git a/qpid/dotnet/Qpid.Client/qms/failover/FailoverMethod.cs b/qpid/dotnet/Qpid.Client/qms/failover/FailoverMethod.cs
deleted file mode 100644
index f32b275e84..0000000000
--- a/qpid/dotnet/Qpid.Client/qms/failover/FailoverMethod.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using System;
-
-namespace Apache.Qpid.Client.Qms.Failover
-{
-    public class FailoverMethodConstants
-    {
-        public const String ROUND_ROBIN = "roundrobin";
-        public const String RANDOM = "random";
-    }
-
-    public interface IFailoverMethod
-    {
-        /// <summary>
-        /// The name of this method for display purposes.
-        /// </summary>
-        String MethodName { get; }
-        
-        /// <summary>
-        /// Reset the Failover to initial conditions
-        /// </summary>
-        void Reset();
-
-        /// <summary>
-        /// Check if failover is possible for this method
-        /// </summary>
-        /// <returns>true if failover is allowed</returns>
-        bool FailoverAllowed();
-
-        /// <summary>
-        /// Notification to the Failover method that a connection has been attained.
-        /// </summary>
-        void AttainedConnection();
-
-        /// <summary>
-        /// If there is no current BrokerInfo the null will be returned.
-        /// </summary>
-        /// <returns>The current BrokerDetail value to use</returns>
-        IBrokerInfo GetCurrentBrokerInfo();
-
-        /// <summary>
-        /// Move to the next BrokerInfo if one is available.
-        /// </summary>
-        /// <returns>the next BrokerDetail or null if there is none.</returns>
-        IBrokerInfo GetNextBrokerDetails();
-
-        /// <summary>
-        /// Set the currently active broker to be the new value.
-        /// </summary>
-        /// <param name="broker">The new BrokerDetail value</param>
-        void SetBroker(IBrokerInfo broker);
-
-        /// <summary>
-        /// Set the retries for this method
-        /// </summary>
-        /// <param name="maxRetries">the maximum number of time to retry this Method</param>
-        void SetRetries(int maxRetries);
-    }
-}
diff --git a/qpid/dotnet/Qpid.Client/qms/failover/FailoverRoundRobin.cs b/qpid/dotnet/Qpid.Client/qms/failover/FailoverRoundRobin.cs
deleted file mode 100644
index 8103940fb4..0000000000
--- a/qpid/dotnet/Qpid.Client/qms/failover/FailoverRoundRobin.cs
+++ /dev/null
@@ -1,255 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using System;
-using System.Text;
-using log4net;
-
-namespace Apache.Qpid.Client.Qms.Failover
-{
-    public class FailoverRoundRobin : IFailoverMethod
-    {
-        private static readonly ILog _logger = LogManager.GetLogger(typeof(FailoverRoundRobin));
-
-        /** The default number of times to cycle through all servers */
-        public const int DEFAULT_CYCLE_RETRIES = 0;
-        /** The default number of times to retry each server */
-        public const int DEFAULT_SERVER_RETRIES = 0;
-
-        /**
-         * The index into the hostDetails array of the broker to which we are connected
-         */
-        private int _currentBrokerIndex = -1;
-
-        /**
-         * The number of times to retry connecting for each server
-         */
-        private int _serverRetries;
-
-        /**
-         * The current number of retry attempts made
-         */
-        private int _currentServerRetry;
-
-        /**
-         *  The number of times to cycle through the servers
-         */
-        private int _cycleRetries;
-
-        /**
-         * The current number of cycles performed.
-         */
-        private int _currentCycleRetries;
-
-        /**
-         * Array of BrokerDetail used to make connections.
-         */
-        private IConnectionInfo _connectionDetails;
-
-        public FailoverRoundRobin(IConnectionInfo connectionDetails)
-        {
-            if (!(connectionDetails.BrokerCount > 0))
-            {
-                throw new ArgumentException("At least one broker details must be specified.");
-            }
-
-            _connectionDetails = connectionDetails;
-
-            //There is no current broker at startup so set it to -1.
-            _currentBrokerIndex = -1;
-
-            String cycleRetries = _connectionDetails.GetFailoverOption(ConnectionUrlConstants.OPTIONS_FAILOVER_CYCLE);
-
-            if (cycleRetries != null)
-            {
-                try
-                {
-                    _cycleRetries = int.Parse(cycleRetries);
-                }
-                catch (FormatException)
-                {
-                    _cycleRetries = DEFAULT_CYCLE_RETRIES;
-                }
-            }
-
-            _currentCycleRetries = 0;
-
-            _serverRetries = 0;
-            _currentServerRetry = -1;
-        }
-
-        public void Reset()
-        {
-            _currentBrokerIndex = 0;
-            _currentCycleRetries = 0;
-            _currentServerRetry = -1;
-        }
-
-        public bool FailoverAllowed()
-        {
-            return ((_currentCycleRetries < _cycleRetries)
-                   || (_currentServerRetry < _serverRetries)
-                   || (_currentBrokerIndex < (_connectionDetails.BrokerCount - 1)));
-        }
-
-        public void AttainedConnection()
-        {
-            _currentCycleRetries = 0;
-            _currentServerRetry = -1;
-        }
-
-        public IBrokerInfo GetCurrentBrokerInfo()
-        {
-            if (_currentBrokerIndex == -1)
-            {
-                return null;
-            }
-
-            return _connectionDetails.GetBrokerInfo(_currentBrokerIndex);
-        }
-
-        public IBrokerInfo GetNextBrokerDetails()
-        {
-            if (_currentBrokerIndex == (_connectionDetails.BrokerCount - 1))
-            {
-                if (_currentServerRetry < _serverRetries)
-                {
-                    if (_currentBrokerIndex == -1)
-                    {
-                        _currentBrokerIndex = 0;
-
-                        SetBroker(_connectionDetails.GetBrokerInfo(_currentBrokerIndex ));
-
-                        _logger.Info("First Run using " + _connectionDetails.GetBrokerInfo(_currentBrokerIndex));
-                    }
-                    else
-                    {
-                        _logger.Info("Retrying " + _connectionDetails.GetBrokerInfo(_currentBrokerIndex));
-                    }
-
-                    _currentServerRetry++;
-                }
-                else
-                {
-                    _currentCycleRetries++;
-                    //failed to connect to first broker
-                    _currentBrokerIndex = 0;
-
-                    SetBroker(_connectionDetails.GetBrokerInfo(_currentBrokerIndex ));
-
-                    // This is zero rather than -1 as we are already retrieving the details.
-                    _currentServerRetry = 0;
-                }
-                //else - should force client to stop as max retries has been reached.
-            }
-            else
-            {
-                if (_currentServerRetry < _serverRetries)
-                {
-                    if (_currentBrokerIndex == -1)
-                    {
-                        _currentBrokerIndex = 0;
-
-                        SetBroker(_connectionDetails.GetBrokerInfo(_currentBrokerIndex ));
-
-                        _logger.Info("First Run using " + _connectionDetails.GetBrokerInfo(_currentBrokerIndex));
-                    }
-                    else
-                    {
-                        _logger.Info("Retrying " + _connectionDetails.GetBrokerInfo(_currentBrokerIndex));
-                    }
-                    _currentServerRetry++;
-                }
-                else
-                {
-                    _currentBrokerIndex++;
-
-                     SetBroker(_connectionDetails.GetBrokerInfo(_currentBrokerIndex ));
-                    // This is zero rather than -1 as we are already retrieving the details.
-                    _currentServerRetry = 0;
-                }
-            }
-
-            return _connectionDetails.GetBrokerInfo(_currentBrokerIndex);
-        }
-
-        public void SetBroker(IBrokerInfo broker)
-        {
-            _connectionDetails.AddBrokerInfo(broker);
-
-            int index = _connectionDetails.GetAllBrokerInfos().IndexOf(broker);
-
-            String serverRetries = broker.GetOption(BrokerInfoConstants.OPTIONS_RETRY);
-
-            if (serverRetries != null)
-            {
-                try
-                {
-                    _serverRetries = int.Parse(serverRetries);
-                }
-                catch (FormatException)
-                {
-                    _serverRetries = DEFAULT_SERVER_RETRIES;
-                }
-            }
-
-            _currentServerRetry = -1;
-            _currentBrokerIndex = index;
-        }
-
-        public void SetRetries(int maxRetries)
-        {
-            _cycleRetries = maxRetries;
-        }
-
-        public String MethodName
-        {
-            get { return "Cycle Servers"; }
-        }
-
-        public override string ToString()
-        {
-            StringBuilder sb = new StringBuilder();
-
-            sb.Append(GetType().Name).Append("\n");
-
-            sb.Append("Broker count: ").Append(_connectionDetails.BrokerCount);
-            sb.Append("\ncurrent broker index: ").Append(_currentBrokerIndex);
-
-            sb.Append("\nCycle Retries: ").Append(_cycleRetries);
-            sb.Append("\nCurrent Cycle:").Append(_currentCycleRetries);
-            sb.Append("\nServer Retries:").Append(_serverRetries);
-            sb.Append("\nCurrent Retry:").Append(_currentServerRetry);
-            sb.Append("\n");
-
-            for(int i=0; i < _connectionDetails.BrokerCount ; i++)
-            {
-                if (i == _currentBrokerIndex)
-                {
-                    sb.Append(">");
-                }
-                sb.Append(_connectionDetails.GetBrokerInfo(i));
-                sb.Append("\n");
-            }
-
-            return sb.ToString();
-        }
-    }
-}
diff --git a/qpid/dotnet/Qpid.Client/qms/failover/FailoverSingleServer.cs b/qpid/dotnet/Qpid.Client/qms/failover/FailoverSingleServer.cs
deleted file mode 100644
index 5e502b897e..0000000000
--- a/qpid/dotnet/Qpid.Client/qms/failover/FailoverSingleServer.cs
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using System;
-
-namespace Apache.Qpid.Client.Qms.Failover
-{
-    public class FailoverSingleServer : IFailoverMethod
-    {
-        /** The default number of times to rety a conection to this server */
-        public const int DEFAULT_SERVER_RETRIES = 1;
-
-        /**
-         * The details of the Single Server
-         */
-        private IBrokerInfo _brokerDetail;
-
-        /**
-         * The number of times to retry connecting to the sever
-         */
-        private int _retries;
-
-        /**
-         * The current number of attempts made to the server
-         */
-        private int _currentRetries;
-
-
-        public FailoverSingleServer(IConnectionInfo connectionDetails)
-        {
-            if (connectionDetails.BrokerCount > 0)
-            {
-                SetBroker(connectionDetails.GetBrokerInfo(0));
-            }
-            else
-            {
-                throw new ArgumentException("BrokerInfo details required for connection.");
-            }
-        }
-
-        public FailoverSingleServer(IBrokerInfo brokerDetail)
-        {
-            SetBroker(brokerDetail);
-        }
-
-        public void Reset()
-        {
-            _currentRetries = -1;
-        }
-
-        public bool FailoverAllowed()
-        {
-            return _currentRetries < _retries;
-        }
-
-        public void AttainedConnection()
-        {
-            Reset();
-        }
-
-        public IBrokerInfo GetCurrentBrokerInfo()
-        {
-           return _brokerDetail;
-        }
-
-        public IBrokerInfo GetNextBrokerDetails()
-        {
-            if (_currentRetries == _retries)
-            {
-                return null;
-            }
-            else
-            {
-                if (_currentRetries < _retries)
-                {
-                    _currentRetries ++;
-                }
-
-                return _brokerDetail;
-            }
-        }
-
-        public void SetBroker(IBrokerInfo broker)
-        {
-            if (broker == null)
-            {
-                throw new ArgumentException("BrokerInfo details cannot be null");
-            }
-            _brokerDetail = broker;
-
-            String retries = broker.GetOption(BrokerInfoConstants.OPTIONS_RETRY);
-            if (retries != null)
-            {
-                try
-                {
-                    _retries = int.Parse(retries);
-                }
-                catch (FormatException)
-                {
-                    _retries = DEFAULT_SERVER_RETRIES;
-                }
-            }
-            else
-            {
-                _retries = DEFAULT_SERVER_RETRIES;
-            }
-
-            Reset();
-        }
-
-        public void SetRetries(int retries)
-        {
-            _retries = retries;
-        }
-
-        public String MethodName
-        {
-            get { return "Single Server"; }
-        }
-
-        public String toString()
-        {
-            return "SingleServer:\n"+
-                    "Max Retries:"+_retries+
-                    "\nCurrent Retry:"+_currentRetries+
-                    "\n"+_brokerDetail+"\n";
-        }
-
-    }
-}
diff --git a/qpid/dotnet/Qpid.Codec/CumulativeProtocolDecoder.cs b/qpid/dotnet/Qpid.Codec/CumulativeProtocolDecoder.cs
deleted file mode 100644
index 6cfd75c851..0000000000
--- a/qpid/dotnet/Qpid.Codec/CumulativeProtocolDecoder.cs
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using System;
-using log4net;
-using Apache.Qpid.Buffer;
-
-namespace Apache.Qpid.Codec
-{
-   public abstract class CumulativeProtocolDecoder : IProtocolDecoder
-   {
-      static ILog _logger = LogManager.GetLogger(typeof(CumulativeProtocolDecoder));
-
-      ByteBuffer _remaining;
-
-      /// <summary>
-      /// Creates a new instance with the 4096 bytes initial capacity of
-      /// cumulative buffer.
-      /// </summary>
-      protected CumulativeProtocolDecoder()
-      {
-         _remaining = AllocateBuffer();
-      }
-
-      /// <summary>
-      /// Cumulates content of <tt>in</tt> into internal buffer and forwards
-      /// decoding request to {@link #doDecode(IoSession, ByteBuffer, ProtocolDecoderOutput)}.
-      /// <tt>doDecode()</tt> is invoked repeatedly until it returns <tt>false</tt>
-      /// and the cumulative buffer is compacted after decoding ends.
-      /// </summary>
-      /// <exception cref="Exception">
-      /// if your <tt>doDecode()</tt> returned <tt>true</tt> not consuming the cumulative buffer.
-      /// </exception>
-      public void Decode(ByteBuffer input, IProtocolDecoderOutput output)
-      {
-         if ( _remaining.Position != 0 ) // If there were remaining undecoded bytes
-         {
-            DecodeRemainingAndInput(input, output);
-         } else
-         {
-            DecodeInput(input, output);
-         }
-      }
-
-      private void DecodeInput(ByteBuffer input, IProtocolDecoderOutput output)
-      {
-         _logger.Debug(string.Format("DecodeInput: input {0}", input.Remaining));
-         // Just decode the input buffer and remember any remaining undecoded bytes.
-         try
-         {
-            DecodeAll(input, output);
-         } finally
-         {
-            if ( input.HasRemaining )
-            {
-               _remaining.Put(input);
-            }
-         }
-      }
-
-      private void DecodeRemainingAndInput(ByteBuffer input, IProtocolDecoderOutput output)
-      {
-         _logger.Debug(string.Format("DecodeRemainingAndInput: input {0}, remaining {1}", input.Remaining, _remaining.Position));
-         // replace the _remainder buffer, so that we can leave the 
-         // original one alone. Necessary because some consumer splice
-         // the buffer and only consume it until later, causing
-         // a race condition if we compact it too soon.
-         ByteBuffer newRemainding = AllocateBuffer();
-         ByteBuffer temp = _remaining;
-         _remaining = newRemainding;
-         temp.Put(input);
-         temp.Flip();
-         try
-         {
-            DecodeAll(temp, output);
-         } finally
-         {
-            if ( temp.Remaining > 0 )
-               _remaining.Put(temp);
-         }
-      }
-
-      private void DecodeAll(ByteBuffer buf, IProtocolDecoderOutput output)
-      {
-         for ( ; ; )
-         {
-            int oldPos = buf.Position;
-            bool decoded = DoDecode(buf, output);
-            if ( decoded )
-            {
-               if ( buf.Position == oldPos )
-               {
-                  throw new Exception(
-                      "doDecode() can't return true when buffer is not consumed.");
-               }
-
-               if ( !buf.HasRemaining )
-               {
-                  break;
-               }
-            } else
-            {
-               break;
-            }
-         }
-      }
-
-      /// <summary>
-      /// Implement this method to consume the specified cumulative buffer and
-      /// decode its content into message(s). 
-      /// </summary>
-      /// <param name="input">the cumulative buffer</param>
-      /// <param name="output">decoder output</param>
-      /// <returns>
-      /// <tt>true</tt> if and only if there's more to decode in the buffer
-      /// and you want to have <tt>doDecode</tt> method invoked again.
-      /// Return <tt>false</tt> if remaining data is not enough to decode,
-      /// then this method will be invoked again when more data is cumulated.
-      /// </returns>
-      /// <exception cref="Exception">If cannot decode</exception>
-      protected abstract bool DoDecode(ByteBuffer input, IProtocolDecoderOutput output);
-
-      public void Dispose()
-      {
-         _remaining = null;
-      }
-
-      private ByteBuffer AllocateBuffer()
-      {
-         ByteBuffer buffer = ByteBuffer.Allocate(4096);
-         buffer.IsAutoExpand = true;
-         return buffer;
-      }
-   }
-}
diff --git a/qpid/dotnet/Qpid.Codec/Demux/DemuxingProtocolCodecFactory.cs b/qpid/dotnet/Qpid.Codec/Demux/DemuxingProtocolCodecFactory.cs
deleted file mode 100644
index 78276202d6..0000000000
--- a/qpid/dotnet/Qpid.Codec/Demux/DemuxingProtocolCodecFactory.cs
+++ /dev/null
@@ -1,387 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using System;
-using System.Collections;
-using Apache.Qpid.Buffer;
-
-namespace Apache.Qpid.Codec.Demux
-{
-    public class DemuxingProtocolCodecFactory : IProtocolCodecFactory
-    {
-        private ArrayList _decoderFactories = new ArrayList();
-        private ArrayList _encoderFactories = new ArrayList();
-        
-        public void Register(Type encoderOrDecoderClass)
-        {
-            if (encoderOrDecoderClass == null)
-            {
-                throw new ArgumentNullException("encoderOrDecoderClass");
-            }
-
-            bool registered = false;
-            if (typeof(IMessageEncoder).IsAssignableFrom(encoderOrDecoderClass))
-            {
-                Register(new DefaultConstructorMessageEncoderFactory(encoderOrDecoderClass));
-                registered = true;
-            }
-            
-            if (typeof(IMessageDecoder).IsAssignableFrom(encoderOrDecoderClass))
-            {
-                Register(new DefaultConstructorMessageDecoderFactory(encoderOrDecoderClass));
-                registered = true;
-            }
-            
-            if (!registered)
-            {
-                throw new ArgumentException("Unregisterable type: " + encoderOrDecoderClass);
-            }
-        }
-        
-        public void Register(IMessageEncoder encoder)
-        {
-            Register(new SingletonMessageEncoderFactory(encoder));
-        }
-        
-        public void Register(IMessageEncoderFactory factory)
-        {
-            if (factory == null)
-            {
-                throw new ArgumentNullException("factory");
-            }
-
-            _encoderFactories.Add(factory);
-        }
-        
-        public void Register(IMessageDecoder decoder)
-        {
-            Register(new SingletonMessageDecoderFactory(decoder));
-        }
-        
-        public void Register(IMessageDecoderFactory factory)
-        {
-            if (factory == null)
-            {
-                throw new ArgumentNullException("factory");
-            }
-            _decoderFactories.Add(factory);
-        }
-        
-        public IProtocolEncoder Encoder
-        {
-            get
-            {
-                return new ProtocolEncoderImpl(this);
-            }
-        }
-        
-        public IProtocolDecoder Decoder
-        {
-            get
-            {
-                return new ProtocolDecoderImpl(this);
-            }            
-        }
-        
-        protected void DisposeCodecResources()
-        {
-            // Do nothing by default
-        }
-
-        private class ProtocolEncoderImpl : IProtocolEncoder
-        {
-            private readonly Hashtable _encoders = new Hashtable();
-
-            private DemuxingProtocolCodecFactory _enclosing;
-
-            public ProtocolEncoderImpl(DemuxingProtocolCodecFactory enclosing)
-            {
-                _enclosing = enclosing;
-                ArrayList encoderFactories = enclosing._encoderFactories;
-                for (int i = encoderFactories.Count - 1; i >= 0; i--)
-                {
-                    IMessageEncoder encoder = ((IMessageEncoderFactory)encoderFactories[i]).NewEncoder();
-                    foreach (Type type in encoder.MessageTypes.Keys)
-                    {
-                        _encoders[type] = encoder;
-                    }
-                }
-            }
-
-            public void Encode(object message, IProtocolEncoderOutput output)
-            {
-                Type type = message.GetType();
-                IMessageEncoder encoder = FindEncoder(type);
-                if (encoder == null)
-                {
-                    throw new ProtocolEncoderException("Unexpected message type: " + type);
-                }
-
-                encoder.Encode(message, output);
-            }
-
-            private IMessageEncoder FindEncoder(Type type)
-            {
-                IMessageEncoder encoder = (IMessageEncoder)_encoders[type];
-                if (encoder == null)
-                {
-                    encoder = FindEncoder(type, new Hashtable());
-                }
-
-                return encoder;
-            }
-
-            private IMessageEncoder FindEncoder(Type type, Hashtable triedClasses)
-            {
-                IMessageEncoder encoder;
-
-                if (triedClasses.Contains(type))
-                {
-                    return null;
-                }
-                triedClasses[type] = 1;
-
-                encoder = (IMessageEncoder)_encoders[type];
-                if (encoder == null)
-                {
-                    encoder = FindEncoder(type, triedClasses);
-                    if (encoder != null)
-                    {
-                        return encoder;
-                    }
-
-                    Type[] interfaces = type.GetInterfaces();
-                    for (int i = 0; i < interfaces.Length; i++)
-                    {
-                        encoder = FindEncoder(interfaces[i], triedClasses);
-                        if (encoder != null)
-                        {
-                            return encoder;
-                        }
-                    }
-
-                    return null;
-                }
-                else
-                    return encoder;
-            }
-
-            public void Dispose()
-            {
-                _enclosing.DisposeCodecResources();
-            }
-        }
-        
-        private class ProtocolDecoderImpl : CumulativeProtocolDecoder
-        {
-            private readonly IMessageDecoder[] _decoders;
-            private IMessageDecoder _currentDecoder;
-            private DemuxingProtocolCodecFactory _enclosing;
-            
-            public ProtocolDecoderImpl(DemuxingProtocolCodecFactory enclosing)
-            {
-                _enclosing = enclosing;
-                ArrayList decoderFactories = _enclosing._decoderFactories;
-                _decoders = new IMessageDecoder[decoderFactories.Count];
-                for (int i = decoderFactories.Count - 1; i >= 0; i--)
-                {
-                    _decoders[i] = ((IMessageDecoderFactory) decoderFactories[i]).NewDecoder();
-                }
-            }
-
-            protected override bool DoDecode(ByteBuffer input, IProtocolDecoderOutput output)
-            {
-                MessageDecoderResult result;
-                if (_currentDecoder == null)
-                {
-                    IMessageDecoder[] decoders = _decoders;
-                    int undecodables = 0;
-                
-                    for (int i = decoders.Length - 1; i >= 0; i --) 
-                    {
-                        IMessageDecoder decoder = decoders[i];
-                        int limit = input.Limit;
-                        int pos = input.Position;
-                        
-                        try
-                        {
-                            result = decoder.Decodable(input);
-                        }
-                        finally
-                        {
-                            input.Position = pos;
-                            input.Limit = limit;
-                        }
-                        
-                        if (result == MessageDecoderResult.OK)
-                        {
-                            _currentDecoder = decoder;
-                            break;
-                        }
-                        else if(result == MessageDecoderResult.NOT_OK)
-                        {
-                            undecodables ++;
-                        }
-                        else if (result != MessageDecoderResult.NEED_DATA)
-                        {
-                            throw new Exception("Unexpected decode result (see your decodable()): " + result);
-                        }
-                    }
-                    
-                    if (undecodables == _decoders.Length)
-                    {
-                        // Throw an exception if all decoders cannot decode data.
-                        input.Position = input.Limit; // Skip data
-                        throw new ProtocolDecoderException(
-                            "No appropriate message decoder: " + input.GetHexDump());
-                    }
-                    
-                    if (_currentDecoder == null)
-                    {
-                        // Decoder is not determined yet (i.e. we need more data)
-                        return false;
-                    }
-                }
-                
-                result = _currentDecoder.Decode(input, output);
-                if (result == MessageDecoderResult.OK)
-                {
-                    _currentDecoder = null;
-                    return true;
-                }
-                else if (result == MessageDecoderResult.NEED_DATA)
-                {
-                    return false;
-                }
-                else if (result == MessageDecoderResult.NOT_OK) 
-                {
-                    throw new ProtocolDecoderException("Message decoder returned NOT_OK.");
-                }
-                else
-                {
-                    throw new Exception("Unexpected decode result (see your decode()): " + result);
-                }
-            }
-        }
-        
-        private class SingletonMessageEncoderFactory : IMessageEncoderFactory
-        {
-            private readonly IMessageEncoder _encoder;
-            
-            public SingletonMessageEncoderFactory(IMessageEncoder encoder)
-            {
-                if (encoder == null)
-                {
-                    throw new ArgumentNullException("encoder");
-                }
-                _encoder = encoder;
-            }
-
-            public IMessageEncoder NewEncoder()
-            {
-                return _encoder;
-            }
-        }
-        
-        private class SingletonMessageDecoderFactory : IMessageDecoderFactory
-        {
-            private readonly IMessageDecoder _decoder;
-            
-            public SingletonMessageDecoderFactory(IMessageDecoder decoder)
-            {
-                if (decoder == null)
-                {
-                    throw new ArgumentNullException("decoder");
-                }
-                _decoder = decoder;
-            }
-
-            public IMessageDecoder NewDecoder()
-            {
-                return _decoder;
-            }
-        }
-        
-        private class DefaultConstructorMessageEncoderFactory : IMessageEncoderFactory
-        {
-            private readonly Type _encoderClass;
-            
-            public DefaultConstructorMessageEncoderFactory(Type encoderClass)
-            {
-                if (encoderClass == null)
-                {
-                    throw new ArgumentNullException("encoderClass");
-                }
-                
-                if(!typeof(IMessageEncoder).IsAssignableFrom(encoderClass))
-                {
-                    throw new ArgumentException("encoderClass is not assignable to MessageEncoder");
-                }
-                _encoderClass = encoderClass;
-            }
-
-            public IMessageEncoder NewEncoder()
-            {
-                try
-                {
-                    return (IMessageEncoder) Activator.CreateInstance(_encoderClass);
-                }
-                catch (Exception e)
-                {
-                    throw new Exception( "Failed to create a new instance of " + _encoderClass, e);
-                }
-            }
-        }
-
-        private class DefaultConstructorMessageDecoderFactory : IMessageDecoderFactory
-        {
-            private readonly Type _decoderClass;
-            
-            public DefaultConstructorMessageDecoderFactory(Type decoderClass)
-            {
-                if (decoderClass == null)
-                {
-                    throw new ArgumentNullException("decoderClass");
-                }
-                
-                if(!typeof(IMessageDecoder).IsAssignableFrom(decoderClass))
-                {
-                    throw new ArgumentException("decoderClass is not assignable to MessageDecoder");
-                }
-                _decoderClass = decoderClass;
-            }
-
-            public IMessageDecoder NewDecoder()
-            {
-                try
-                {
-                    return (IMessageDecoder) Activator.CreateInstance(_decoderClass);
-                }
-                catch (Exception e)
-                {
-                    throw new Exception("Failed to create a new instance of " + _decoderClass, e);
-                }
-            }
-        }
-    }
-}
-
-
-
diff --git a/qpid/dotnet/Qpid.Codec/Demux/IMessageDecoder.cs b/qpid/dotnet/Qpid.Codec/Demux/IMessageDecoder.cs
deleted file mode 100644
index 5892673440..0000000000
--- a/qpid/dotnet/Qpid.Codec/Demux/IMessageDecoder.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using System;
-using Apache.Qpid.Buffer;
-
-namespace Apache.Qpid.Codec.Demux
-{
-    public interface IMessageDecoder
-    {
-        /// <summary>
-        /// Checks the specified buffer is decodable by this decoder.
-        /// </summary>
-        /// <param name="buffer">The buffer to read data from.</param>
-        /// <returns>
-        /// OK if this decoder can decode the specified buffer.
-        /// NOT_OK if this decoder cannot decode the specified buffer.
-        /// if more data is required to determine if the
-        /// specified buffer is decodable ({@link #OK}) or not decodable
-        /// {@link #NOT_OK}.</returns>             
-        MessageDecoderResult Decodable(ByteBuffer buffer);
-
-        /// <summary>
-        /// Decodes binary or protocol-specific content into higher-level message objects.
-        /// MINA invokes {@link #decode(IoSession, ByteBuffer, ProtocolDecoderOutput)}
-        /// method with read data, and then the decoder implementation puts decoded
-        /// messages into {@link ProtocolDecoderOutput}.
-        /// </summary>
-        /// <returns>
-        /// {@link #OK} if you finished decoding messages successfully.
-        /// {@link #NEED_DATA} if you need more data to finish decoding current message.
-        /// {@link #NOT_OK} if you cannot decode current message due to protocol specification violation.
-        /// </returns>
-        /// <exception cref="Exception">if the read data violated protocol specification </exception>     
-        MessageDecoderResult Decode(ByteBuffer buffer, IProtocolDecoderOutput output);
-    }
-}
-
-
diff --git a/qpid/dotnet/Qpid.Codec/Demux/IMessageDecoderFactory.cs b/qpid/dotnet/Qpid.Codec/Demux/IMessageDecoderFactory.cs
deleted file mode 100644
index 9e333d670f..0000000000
--- a/qpid/dotnet/Qpid.Codec/Demux/IMessageDecoderFactory.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-namespace Apache.Qpid.Codec.Demux
-{
-    public interface IMessageDecoderFactory
-    {
-        /// <summary>
-        /// Creates a new message decoder.
-        /// </summary>
-        IMessageDecoder NewDecoder();
-    }
-}
-
-
diff --git a/qpid/dotnet/Qpid.Codec/Demux/IMessageEncoder.cs b/qpid/dotnet/Qpid.Codec/Demux/IMessageEncoder.cs
deleted file mode 100644
index 75ae23592b..0000000000
--- a/qpid/dotnet/Qpid.Codec/Demux/IMessageEncoder.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using System;
-using System.Collections;
-
-namespace Apache.Qpid.Codec.Demux
-{
-    public interface IMessageEncoder
-    {
-        /// <summary>
-        /// Returns the set of message classes this encoder can encode.
-        /// </summary>
-        Hashtable MessageTypes
-        {
-            get;
-        }
-
-        /// <summary>
-        /// Encodes higher-level message objects into binary or protocol-specific data.
-        /// MINA invokes {@link #encode(IoSession, Object, ProtocolEncoderOutput)}
-        /// method with message which is popped from the session write queue, and then
-        /// the encoder implementation puts encoded {@link ByteBuffer}s into
-        /// {@link ProtocolEncoderOutput}.
-        /// </summary>
-        /// <exception cref="Exception">if the message violated protocol specification</exception>
-        void Encode(Object message, IProtocolEncoderOutput output);
-    }
-}
-
-
diff --git a/qpid/dotnet/Qpid.Codec/Demux/IMessageEncoderFactory.cs b/qpid/dotnet/Qpid.Codec/Demux/IMessageEncoderFactory.cs
deleted file mode 100644
index 3001d1a963..0000000000
--- a/qpid/dotnet/Qpid.Codec/Demux/IMessageEncoderFactory.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-namespace Apache.Qpid.Codec.Demux
-{
-    public interface IMessageEncoderFactory
-    {
-        /// <summary>
-        /// Creates a new message encoder.
-        /// </summary>
-        IMessageEncoder NewEncoder();
-    }
-}
-
-
diff --git a/qpid/dotnet/Qpid.Codec/Demux/MessageDecoderResult.cs b/qpid/dotnet/Qpid.Codec/Demux/MessageDecoderResult.cs
deleted file mode 100644
index ab01864bc0..0000000000
--- a/qpid/dotnet/Qpid.Codec/Demux/MessageDecoderResult.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-namespace Apache.Qpid.Codec.Demux
-{
-    public enum MessageDecoderResult
-    {
-        OK, NOT_OK, NEED_DATA
-    }
-}
-
-
diff --git a/qpid/dotnet/Qpid.Codec/IProtocolCodecFactory.cs b/qpid/dotnet/Qpid.Codec/IProtocolCodecFactory.cs
deleted file mode 100644
index a26b91b16c..0000000000
--- a/qpid/dotnet/Qpid.Codec/IProtocolCodecFactory.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-namespace Apache.Qpid.Codec
-{
-    public interface IProtocolCodecFactory
-    {
-        IProtocolEncoder Encoder
-        {
-            get;
-        }
-
-        IProtocolDecoder Decoder
-        {
-            get;
-        }
-    }
-}
-
-
diff --git a/qpid/dotnet/Qpid.Codec/IProtocolDecoder.cs b/qpid/dotnet/Qpid.Codec/IProtocolDecoder.cs
deleted file mode 100644
index 3cccb0f7da..0000000000
--- a/qpid/dotnet/Qpid.Codec/IProtocolDecoder.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using System;
-using Apache.Qpid.Buffer;
-
-namespace Apache.Qpid.Codec
-{
-    public interface IProtocolDecoder : IDisposable
-    {
-        /// <summary>
-        /// Decodes binary or protocol-specific content into higher-level message objects.
-        /// MINA invokes {@link #decode(IoSession, ByteBuffer, ProtocolDecoderOutput)}
-        /// method with read data, and then the decoder implementation puts decoded
-        /// messages into {@link ProtocolDecoderOutput}.
-        /// </summary>
-        /// <param name="input"></param>
-        /// <param name="output"></param>
-        /// <exception cref="Exception">if the read data violated protocol specification</exception>
-        void Decode(ByteBuffer input, IProtocolDecoderOutput output);
-    }
-}
-
-
diff --git a/qpid/dotnet/Qpid.Codec/IProtocolDecoderOutput.cs b/qpid/dotnet/Qpid.Codec/IProtocolDecoderOutput.cs
deleted file mode 100644
index 77a1aea9db..0000000000
--- a/qpid/dotnet/Qpid.Codec/IProtocolDecoderOutput.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-namespace Apache.Qpid.Codec
-{
-    public interface IProtocolDecoderOutput
-    {
-        /// <summary>
-        /// Callback for {@link ProtocolDecoder} to generate decoded messages.
-        /// {@link ProtocolDecoder} must call {@link #write(Object)} for each
-        /// decoded messages.
-        /// </summary>
-        /// <param name="message">the decoded message</param>
-        void Write(object message);
-    }
-}
-
-
diff --git a/qpid/dotnet/Qpid.Codec/IProtocolEncoder.cs b/qpid/dotnet/Qpid.Codec/IProtocolEncoder.cs
deleted file mode 100644
index a16f2ad9d6..0000000000
--- a/qpid/dotnet/Qpid.Codec/IProtocolEncoder.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using System;
-
-namespace Apache.Qpid.Codec
-{
-    public interface IProtocolEncoder : IDisposable
-    {
-        /// <summary>
-        /// Encodes higher-level message objects into binary or protocol-specific data.
-        /// MINA invokes {@link #encode(IoSession, Object, ProtocolEncoderOutput)}
-        /// method with message which is popped from the session write queue, and then
-        /// the encoder implementation puts encoded {@link ByteBuffer}s into
-        /// {@link ProtocolEncoderOutput}.
-        /// </summary>
-        /// <param name="message"></param>
-        /// <param name="output"></param>
-        /// <exception cref="Exception">if the message violated protocol specification</exception>
-        void Encode(Object message, IProtocolEncoderOutput output);
-    }
-}
-
-
diff --git a/qpid/dotnet/Qpid.Codec/IProtocolEncoderOutput.cs b/qpid/dotnet/Qpid.Codec/IProtocolEncoderOutput.cs
deleted file mode 100644
index 70f9be38dc..0000000000
--- a/qpid/dotnet/Qpid.Codec/IProtocolEncoderOutput.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using Apache.Qpid.Buffer;
-
-namespace Apache.Qpid.Codec
-{
-    public interface IProtocolEncoderOutput
-    {
-        /// <summary>
-        /// Callback for {@link ProtocolEncoder} to generate encoded
-        /// {@link ByteBuffer}s. {@link ProtocolEncoder} must call
-        /// {@link #write(ByteBuffer)} for each decoded messages.
-        /// </summary>
-        /// <param name="buf">the buffer which contains encoded data</param>
-        void Write(ByteBuffer buf);
-    }
-}
-
-
diff --git a/qpid/dotnet/Qpid.Codec/Properties/AssemblyInfo.cs b/qpid/dotnet/Qpid.Codec/Properties/AssemblyInfo.cs
deleted file mode 100644
index aa1d6a662e..0000000000
--- a/qpid/dotnet/Qpid.Codec/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using System.Reflection;
-using System.Runtime.InteropServices;
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("Apache.Qpid.Codec")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Apache Qpid")]
-[assembly: AssemblyProduct("Apache.Qpid.Codec")]
-[assembly: AssemblyCopyright("Copyright (c) 2006 The Apache Software Foundation")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("8bfe84f8-cd88-48f7-b0d2-0010411a14e5")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Revision and Build Numbers 
-// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/qpid/dotnet/Qpid.Codec/ProtocolCodecException.cs b/qpid/dotnet/Qpid.Codec/ProtocolCodecException.cs
deleted file mode 100644
index 49678d2c11..0000000000
--- a/qpid/dotnet/Qpid.Codec/ProtocolCodecException.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using System;
-using System.Runtime.Serialization;
-
-namespace Apache.Qpid.Codec
-{
-    [Serializable]
-    public class ProtocolCodecException : Exception
-    {
-        public ProtocolCodecException() : base()
-        {            
-        }
-        
-        public ProtocolCodecException(string message) : base(message)
-        {            
-        }
-        
-        public ProtocolCodecException(Exception cause) : base("Codec Exception", cause)
-        {            
-        }
-
-        protected ProtocolCodecException(SerializationInfo info, StreamingContext ctxt)
-           : base(info, ctxt)
-        {
-        }
-    }
-}
-
-
-
diff --git a/qpid/dotnet/Qpid.Codec/ProtocolDecoderException.cs b/qpid/dotnet/Qpid.Codec/ProtocolDecoderException.cs
deleted file mode 100644
index 8e7e6da145..0000000000
--- a/qpid/dotnet/Qpid.Codec/ProtocolDecoderException.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using System;
-using System.Runtime.Serialization;
-
-namespace Apache.Qpid.Codec
-{
-    [Serializable]
-    public class ProtocolDecoderException : ProtocolCodecException
-    {
-        private string _hexdump;
-        
-        public ProtocolDecoderException() : base()
-        {            
-        }
-        
-        public ProtocolDecoderException(string message) : base(message)
-        {            
-        }
-        
-        public ProtocolDecoderException(Exception cause) : base(cause)
-        {            
-        }
-
-        protected ProtocolDecoderException(SerializationInfo info, StreamingContext ctxt)
-           : base(info, ctxt)
-        {
-           _hexdump = info.GetString("HexDump");
-        }
-
-        public string HexDump
-        {
-            get
-            {
-                return _hexdump;
-            }
-            set
-            {
-                _hexdump = value;
-            }
-        }
-
-       public override void GetObjectData(SerializationInfo info, StreamingContext context)
-       {
-          base.GetObjectData(info, context);
-          info.AddValue("HexDump", _hexdump);
-       }
-    }
-}
-
-
-
diff --git a/qpid/dotnet/Qpid.Codec/ProtocolEncoderException.cs b/qpid/dotnet/Qpid.Codec/ProtocolEncoderException.cs
deleted file mode 100644
index ac565a308b..0000000000
--- a/qpid/dotnet/Qpid.Codec/ProtocolEncoderException.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using System;
-using System.Runtime.Serialization;
-
-namespace Apache.Qpid.Codec
-{
-    [Serializable]
-    public class ProtocolEncoderException : ProtocolCodecException
-    {
-        public ProtocolEncoderException() : base()
-        {            
-        }
-        
-        public ProtocolEncoderException(string message) : base(message)
-        {            
-        }
-        
-        public ProtocolEncoderException(Exception cause) : base(cause)
-        {            
-        }
-
-        protected ProtocolEncoderException(SerializationInfo info, StreamingContext ctxt)
-           : base(info, ctxt)
-        {
-        }
-    }
-}
-
-
-
diff --git a/qpid/dotnet/Qpid.Codec/Qpid.Codec.csproj b/qpid/dotnet/Qpid.Codec/Qpid.Codec.csproj
deleted file mode 100644
index ebe4681397..0000000000
--- a/qpid/dotnet/Qpid.Codec/Qpid.Codec.csproj
+++ /dev/null
@@ -1,73 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <PropertyGroup>

-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ProductVersion>8.0.50727</ProductVersion>

-    <SchemaVersion>2.0</SchemaVersion>

-    <ProjectGuid>{22D0D0C2-77AF-4DE3-B456-7FF3893F9F88}</ProjectGuid>

-    <OutputType>Library</OutputType>

-    <AppDesignerFolder>Properties</AppDesignerFolder>

-    <RootNamespace>Apache.Qpid.Codec</RootNamespace>

-    <AssemblyName>Apache.Qpid.Codec</AssemblyName>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

-    <DebugSymbols>true</DebugSymbols>

-    <DebugType>full</DebugType>

-    <Optimize>false</Optimize>

-    <OutputPath>..\bin\net-2.0\debug\</OutputPath>

-    <DefineConstants>DEBUG;TRACE</DefineConstants>

-    <ErrorReport>prompt</ErrorReport>

-    <WarningLevel>4</WarningLevel>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

-    <DebugType>pdbonly</DebugType>

-    <Optimize>true</Optimize>

-    <OutputPath>..\bin\net-2.0\release\</OutputPath>

-    <DefineConstants>TRACE</DefineConstants>

-    <ErrorReport>prompt</ErrorReport>

-    <WarningLevel>4</WarningLevel>

-  </PropertyGroup>

-  <ItemGroup>

-    <Reference Include="log4net, Version=1.2.0.30714, Culture=neutral, PublicKeyToken=500ffcafb14f92df">

-      <SpecificVersion>False</SpecificVersion>

-      <HintPath>..\Qpid.Common\lib\log4net\log4net.dll</HintPath>

-    </Reference>

-    <Reference Include="System" />

-    <Reference Include="System.Data" />

-    <Reference Include="System.Xml" />

-  </ItemGroup>

-  <ItemGroup>

-    <Compile Include="CumulativeProtocolDecoder.cs" />

-    <Compile Include="Demux\DemuxingProtocolCodecFactory.cs" />

-    <Compile Include="Demux\IMessageDecoder.cs" />

-    <Compile Include="Demux\IMessageDecoderFactory.cs" />

-    <Compile Include="Demux\IMessageEncoder.cs" />

-    <Compile Include="Demux\IMessageEncoderFactory.cs" />

-    <Compile Include="Demux\MessageDecoderResult.cs" />

-    <Compile Include="IProtocolCodecFactory.cs" />

-    <Compile Include="IProtocolDecoder.cs" />

-    <Compile Include="IProtocolDecoderOutput.cs" />

-    <Compile Include="IProtocolEncoder.cs" />

-    <Compile Include="IProtocolEncoderOutput.cs" />

-    <Compile Include="ProtocolCodecException.cs" />

-    <Compile Include="ProtocolDecoderException.cs" />

-    <Compile Include="ProtocolEncoderException.cs" />

-    <Compile Include="Support\SimpleProtocolDecoderOutput.cs" />

-    <Compile Include="Support\SimpleProtocolEncoderOutput.cs" />

-    <Compile Include="Properties\AssemblyInfo.cs" />

-  </ItemGroup>

-  <ItemGroup>

-    <ProjectReference Include="..\Qpid.Buffer\Qpid.Buffer.csproj">

-      <Project>{44384DF2-B0A4-4580-BDBC-EE4BAA87D995}</Project>

-      <Name>Qpid.Buffer</Name>

-    </ProjectReference>

-  </ItemGroup>

-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

-       Other similar extension points exist, see Microsoft.Common.targets.

-  <Target Name="BeforeBuild">

-  </Target>

-  <Target Name="AfterBuild">

-  </Target>

-  -->

-</Project>

diff --git a/qpid/dotnet/Qpid.Codec/Support/SimpleProtocolDecoderOutput.cs b/qpid/dotnet/Qpid.Codec/Support/SimpleProtocolDecoderOutput.cs
deleted file mode 100644
index 0a4ff10ff0..0000000000
--- a/qpid/dotnet/Qpid.Codec/Support/SimpleProtocolDecoderOutput.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using System.Collections;
-
-namespace Apache.Qpid.Codec.Support
-{
-    public class SimpleProtocolDecoderOutput : IProtocolDecoderOutput
-    {
-        private readonly Queue _messageQueue = new Queue();
-        
-        public Queue MessageQueue
-        {
-            get
-            {
-                return _messageQueue;
-            }
-        }
-        
-        public void Write(object message)
-        {
-            _messageQueue.Enqueue(message);
-        }            
-    }
-}
-
-
diff --git a/qpid/dotnet/Qpid.Codec/Support/SimpleProtocolEncoderOutput.cs b/qpid/dotnet/Qpid.Codec/Support/SimpleProtocolEncoderOutput.cs
deleted file mode 100644
index 2e4224ef98..0000000000
--- a/qpid/dotnet/Qpid.Codec/Support/SimpleProtocolEncoderOutput.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using System.Collections;
-using Apache.Qpid.Buffer;
-
-namespace Apache.Qpid.Codec.Support
-{
-    public abstract class SimpleProtocolEncoderOutput : IProtocolEncoderOutput
-    {
-        private readonly Queue _bufferQueue = new Queue();
-        
-        public Queue BufferQueue
-        {
-            get
-            {
-                return _bufferQueue;
-            }
-        }
-        
-        public void Write(ByteBuffer buf)
-        {
-            _bufferQueue.Enqueue(buf);
-        }       
-    }
-}
diff --git a/qpid/dotnet/Qpid.Codec/default.build b/qpid/dotnet/Qpid.Codec/default.build
deleted file mode 100644
index db9e8d1166..0000000000
--- a/qpid/dotnet/Qpid.Codec/default.build
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0"?>

-<project name="Apache.Qpid.Codec" default="build">

-    <!--

-		Properties that come from master build file

-		- build.dir: root directory for build

-		- build.debug: true if building debug release

-		- build.defines: variables to define during build

-    -->

-

-    <target name="build">

-        <csc target="library" 

-				define="${build.defines}" 

-				debug="${build.debug}" 

-				output="${build.dir}/${project::get-name()}.dll">

-			

-			<sources>

-			   <include name="**/*.cs" />

-         </sources>

-         <references>

-            <include name="${build.dir}/log4net.dll" />	

-            <include name="${build.dir}/Apache.Qpid.Buffer.dll" />	

-         </references>

-        </csc>

-    </target>

-</project>

-

diff --git a/qpid/dotnet/Qpid.Common.Tests/Properties/AssemblyInfo.cs b/qpid/dotnet/Qpid.Common.Tests/Properties/AssemblyInfo.cs
deleted file mode 100644
index 32dcae60ae..0000000000
--- a/qpid/dotnet/Qpid.Common.Tests/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.InteropServices;
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("Apache.Qpid.Common.Tests")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Apache Qpid")]
-[assembly: AssemblyProduct("Apache.Qpid.Common.Tests")]
-[assembly: AssemblyCopyright("Copyright (c) 2006 The Apache Software Foundation")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("2c0d906c-375d-4b04-8ad0-a22fcb4e7337")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Revision and Build Numbers 
-// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/qpid/dotnet/Qpid.Common.Tests/Qpid.Common.Tests.csproj b/qpid/dotnet/Qpid.Common.Tests/Qpid.Common.Tests.csproj
deleted file mode 100644
index b51faf92c7..0000000000
--- a/qpid/dotnet/Qpid.Common.Tests/Qpid.Common.Tests.csproj
+++ /dev/null
@@ -1,65 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <PropertyGroup>

-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ProductVersion>8.0.50727</ProductVersion>

-    <SchemaVersion>2.0</SchemaVersion>

-    <ProjectGuid>{F83624B0-762B-4D82-900D-FF4C1B36E36E}</ProjectGuid>

-    <OutputType>Library</OutputType>

-    <AppDesignerFolder>Properties</AppDesignerFolder>

-    <RootNamespace>Apache.Qpid.Tests</RootNamespace>

-    <AssemblyName>Apache.Qpid.Common.Tests</AssemblyName>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

-    <DebugSymbols>true</DebugSymbols>

-    <DebugType>full</DebugType>

-    <Optimize>false</Optimize>

-    <OutputPath>..\bin\net-2.0\debug\</OutputPath>

-    <DefineConstants>DEBUG;TRACE</DefineConstants>

-    <ErrorReport>prompt</ErrorReport>

-    <WarningLevel>4</WarningLevel>

-    <UseVSHostingProcess>true</UseVSHostingProcess>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

-    <DebugType>pdbonly</DebugType>

-    <Optimize>true</Optimize>

-    <OutputPath>..\bin\net-2.0\release\</OutputPath>

-    <DefineConstants>TRACE</DefineConstants>

-    <ErrorReport>prompt</ErrorReport>

-    <WarningLevel>4</WarningLevel>

-  </PropertyGroup>

-  <ItemGroup>

-    <Reference Include="nunit.framework, Version=2.2.6.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77">

-      <SpecificVersion>False</SpecificVersion>

-      <HintPath>..\Qpid.Client.Tests\lib\nunit\nunit.framework.dll</HintPath>

-    </Reference>

-    <Reference Include="System" />

-    <Reference Include="System.Data" />

-    <Reference Include="System.Xml" />

-  </ItemGroup>

-  <ItemGroup>

-    <Compile Include="Properties\AssemblyInfo.cs" />

-    <Compile Include="Qpid\Collections\TestConsumerProducerQueue.cs" />

-    <Compile Include="Qpid\Collections\TestLinkedHashtable.cs" />

-    <Compile Include="Qpid\Framing\TestEncodingUtils.cs" />

-    <Compile Include="Qpid\Framing\TestAMQType.cs" />

-  </ItemGroup>

-  <ItemGroup>

-    <ProjectReference Include="..\Qpid.Buffer\Qpid.Buffer.csproj">

-      <Project>{44384DF2-B0A4-4580-BDBC-EE4BAA87D995}</Project>

-      <Name>Qpid.Buffer</Name>

-    </ProjectReference>

-    <ProjectReference Include="..\Qpid.Common\Qpid.Common.csproj">

-      <Project>{77064C42-24D2-4CEB-9EA2-0EF481A43205}</Project>

-      <Name>Qpid.Common</Name>

-    </ProjectReference>

-  </ItemGroup>

-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

-       Other similar extension points exist, see Microsoft.Common.targets.

-  <Target Name="BeforeBuild">

-  </Target>

-  <Target Name="AfterBuild">

-  </Target>

-  -->

-</Project>

diff --git a/qpid/dotnet/Qpid.Common.Tests/Qpid/Collections/TestConsumerProducerQueue.cs b/qpid/dotnet/Qpid.Common.Tests/Qpid/Collections/TestConsumerProducerQueue.cs
deleted file mode 100644
index 03ed999999..0000000000
--- a/qpid/dotnet/Qpid.Common.Tests/Qpid/Collections/TestConsumerProducerQueue.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-/*

- *

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- *

- */

-using System;

-using System.Collections;

-using System.Text;

-using System.Threading;

-using NUnit.Framework;

-using Apache.Qpid.Collections;

-

-namespace Apache.Qpid.Collections.Tests

-{

-    [TestFixture]

-    public class TestConsumerProducerQueue

-    {

-       private ConsumerProducerQueue _queue;

-

-       [SetUp]

-       public void SetUp()

-       {

-          _queue = new ConsumerProducerQueue();

-       }

-

-       [Test]

-       public void CanDequeueWithInifiniteWait()

-       {

-          Thread producer = new Thread(new ThreadStart(ProduceFive));

-          producer.Start();

-          for ( int i = 0; i < 5; i++ )

-          {

-             object item = _queue.Dequeue();

-             Assert.IsNotNull(item);

-          }

-       }

-

-       [Test]

-       public void ReturnsNullOnDequeueTimeout()

-       {

-          // queue is empty

-          Assert.IsNull(_queue.Dequeue(500));

-       }

-

-       [Test]

-       public void DequeueTillEmpty()

-       {

-          _queue.Enqueue(1);

-          _queue.Enqueue(2);

-          _queue.Enqueue(3);

-          Assert.AreEqual(1, _queue.Dequeue());

-          Assert.AreEqual(2, _queue.Dequeue());

-          Assert.AreEqual(3, _queue.Dequeue());

-          // no messages in queue, will timeout

-          Assert.IsNull(_queue.Dequeue(500));

-       }

-

-

-       private void ProduceFive()

-       {

-          Thread.Sleep(1000);

-          _queue.Enqueue("test item 1");

-          _queue.Enqueue("test item 2");

-          _queue.Enqueue("test item 3");

-          Thread.Sleep(0);

-          _queue.Enqueue("test item 4");

-          _queue.Enqueue("test item 5");

-       }

-    }

-}

diff --git a/qpid/dotnet/Qpid.Common.Tests/Qpid/Collections/TestLinkedHashtable.cs b/qpid/dotnet/Qpid.Common.Tests/Qpid/Collections/TestLinkedHashtable.cs
deleted file mode 100644
index dbbc98a2e6..0000000000
--- a/qpid/dotnet/Qpid.Common.Tests/Qpid/Collections/TestLinkedHashtable.cs
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using System;
-using System.Collections;
-using System.Text;
-using NUnit.Framework;
-
-namespace Apache.Qpid.Collections
-{
-    [TestFixture]
-    public class TestLinkedHashtable
-    {
-        [Test]
-        public void Test1()
-        {
-            LinkedHashtable table = new LinkedHashtable();
-            table["Super"] = "Ayr";
-            table["Ayr"] = "United";
-            table["Fred"] = "Wilma";
-            table["Dumbarton"] = "Gubbed";
-            dumpDictionary(table);
-
-            Console.WriteLine("\nRemoving XXX (non-existant)");
-            table.Remove("XXX");
-            dumpDictionary(table);
-
-            Console.WriteLine("\nRemoving Fred");
-            table.Remove("Fred");
-            dumpDictionary(table);
-
-            Console.WriteLine("\nMoving Dumbarton to head");
-            table.MoveToHead("Dumbarton");
-            dumpDictionary(table);
-        }
-
-        private static void dumpDictionary(LinkedHashtable table)
-        {
-            foreach (DictionaryEntry o in table)
-            {
-                Console.WriteLine(string.Format("Item: key={0} value={1}", o.Key, o.Value));
-            }
-            
-            Console.WriteLine("keys are " + InspectCollection(table.Keys));
-            Console.WriteLine("values are " + InspectCollection(table.Values));
-        }
-
-        static string InspectCollection(ICollection collection)
-        {
-            StringBuilder sb = null;
-            foreach (object o in collection)
-            {
-                if (sb == null)
-                {
-                    sb = new StringBuilder(o.ToString());
-                }
-                else
-                {
-                    sb.Append(", ");
-                    sb.Append(o.ToString());
-                }
-            }
-            return sb.ToString();
-        }
-    }
-}
diff --git a/qpid/dotnet/Qpid.Common.Tests/Qpid/Framing/TestAMQType.cs b/qpid/dotnet/Qpid.Common.Tests/Qpid/Framing/TestAMQType.cs
deleted file mode 100644
index ab4cb4409c..0000000000
--- a/qpid/dotnet/Qpid.Common.Tests/Qpid/Framing/TestAMQType.cs
+++ /dev/null
@@ -1,270 +0,0 @@
-/*

- *

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- *

- */

-using System;

-using NUnit.Framework;

-using Apache.Qpid.Buffer;

-using Apache.Qpid.Framing;

-

-namespace Apache.Qpid.Framing.Tests

-{

-    [TestFixture]

-    public class TestAMQType

-    {

-

-       #region LONG_STRING tests

-       [Test]

-       public void LONG_STRING_ReadWrite()

-       {

-          AMQType type = AMQType.LONG_STRING;

-          ByteBuffer buffer = ByteBuffer.Allocate(0x1000);

-          const string VALUE = "simple string 1";

-

-          type.WriteToBuffer(VALUE, buffer);

-          buffer.Flip();

-          buffer.Rewind();

-          AMQTypedValue value = AMQTypedValue.ReadFromBuffer(buffer);

-          Assert.AreEqual(VALUE, value.Value);

-       }

-       #endregion // LONG_STRING tests

-

-       #region UINT32 tests

-       [Test]

-       public void UINT32_CanGetEncodingSize()

-       {

-          AMQType type = AMQType.UINT32;

-          Assert.AreEqual(4, type.GetEncodingSize(1234443));

-       }

-

-       [Test]

-       public void UINT32_ToNativeValue()

-       {

-          AMQType type = AMQType.UINT32;

-          Assert.AreEqual(1, type.ToNativeValue(1));

-          Assert.AreEqual(1, type.ToNativeValue((short)1));

-          Assert.AreEqual(1, type.ToNativeValue((byte)1));

-          Assert.AreEqual(1, type.ToNativeValue("1"));

-

-          try

-          {

-             Assert.AreEqual(1, type.ToNativeValue("adasdads"));

-             Assert.Fail("Invalid format allowed");

-          } catch ( FormatException )

-          {

-          }

-       }

-

-       [Test]

-       public void UINT32_ReadWrite()

-       {

-          AMQType type = AMQType.UINT32;

-          ByteBuffer buffer = ByteBuffer.Allocate(0x1000);

-          const uint VALUE = 0xFFEEDDCC;

-

-          type.WriteToBuffer(VALUE, buffer);

-          buffer.Flip();

-          buffer.Rewind();

-          AMQTypedValue value = AMQTypedValue.ReadFromBuffer(buffer);

-          Assert.AreEqual(VALUE, value.Value);

-       }

-       #endregion // UINT32 Tests

-

-       #region VOID Tests

-       [Test]

-       public void VOID_CanGetEncodingSize()

-       {

-          AMQType type = AMQType.VOID;

-          Assert.AreEqual(0, type.GetEncodingSize(null));

-       }

-

-       [Test]

-       public void VOID_ToNativeValue()

-       {

-          AMQType type = AMQType.VOID;

-          Assert.IsNull(type.ToNativeValue(null));

-

-          try

-          {

-             type.ToNativeValue("asdasd");

-             Assert.Fail("converted invalid value");

-          } catch (FormatException)

-          {

-          }

-       }

-

-       [Test]

-       public void VOID_ReadWrite()

-       {

-          AMQType type = AMQType.VOID;

-          ByteBuffer buffer = ByteBuffer.Allocate(0x1000);

-

-          type.WriteToBuffer(null, buffer);

-          buffer.Flip();

-          buffer.Rewind();

-          AMQTypedValue value = AMQTypedValue.ReadFromBuffer(buffer);

-          Assert.AreEqual(null, value.Value);

-       }

-

-       #endregion // VOID Tests

-

-       #region BOOLEAN Tests

-       [Test]

-       public void BOOLEAN_CanGetEncodingSize()

-       {

-          AMQType type = AMQType.BOOLEAN;

-          Assert.AreEqual(1, type.GetEncodingSize(true));

-       }

-

-       [Test]

-       public void BOOLEAN_ToNativeValue()

-       {

-          AMQType type = AMQType.BOOLEAN;

-          Assert.AreEqual(true, type.ToNativeValue(true));

-          Assert.AreEqual(false, type.ToNativeValue("false"));

-

-          try

-          {

-             type.ToNativeValue("asdasd");

-             Assert.Fail("converted invalid value");

-          } catch ( FormatException )

-          {

-          }

-       }

-

-       [Test]

-       public void BOOLEAN_ReadWrite()

-       {

-          AMQType type = AMQType.BOOLEAN;

-          ByteBuffer buffer = ByteBuffer.Allocate(0x1000);

-

-          type.WriteToBuffer(true, buffer);

-          buffer.Flip();

-          buffer.Rewind();

-          AMQTypedValue value = AMQTypedValue.ReadFromBuffer(buffer);

-          Assert.AreEqual(true, value.Value);

-       }

-       #endregion // BOOLEAN Tests

-

-       #region INT16 tests

-       [Test]

-       public void INT16_ReadWrite()

-       {

-          AMQType type = AMQType.INT16;

-          ByteBuffer buffer = ByteBuffer.Allocate(0x1000);

-          const short VALUE = -32765;

-

-          type.WriteToBuffer(VALUE, buffer);

-          buffer.Flip();

-          buffer.Rewind();

-          AMQTypedValue value = AMQTypedValue.ReadFromBuffer(buffer);

-          Assert.AreEqual(VALUE, value.Value);

-       }

-       //public void UINT16_ReadWrite()

-       //{

-       //   AMQType type = AMQType.UINT16;

-       //   ByteBuffer buffer = ByteBuffer.Allocate(0x1000);

-       //   const ushort VALUE = 64321;

-

-       //   type.WriteToBuffer(VALUE, buffer);

-       //   buffer.Flip();

-       //   buffer.Rewind();

-       //   AMQTypedValue value = AMQTypedValue.ReadFromBuffer(buffer);

-       //   Assert.AreEqual(VALUE, value.Value);

-       //}

-       #endregion // INT16 Tests

-

-       #region INT32 tests

-       [Test]

-       public void INT32_ReadWrite()

-       {

-          AMQType type = AMQType.INT32;

-          ByteBuffer buffer = ByteBuffer.Allocate(0x1000);

-          const int VALUE = -39273563;

-

-          type.WriteToBuffer(VALUE, buffer);

-          buffer.Flip();

-          buffer.Rewind();

-          AMQTypedValue value = AMQTypedValue.ReadFromBuffer(buffer);

-          Assert.AreEqual(VALUE, value.Value);

-       }

-       #endregion // INT32 Tests

-

-       #region INT64 tests

-       [Test]

-       public void INT64_ReadWrite()

-       {

-          AMQType type = AMQType.INT64;

-          ByteBuffer buffer = ByteBuffer.Allocate(0x1000);

-          const long VALUE = -(2^43+1233123);

-

-          type.WriteToBuffer(VALUE, buffer);

-          buffer.Flip();

-          buffer.Rewind();

-          AMQTypedValue value = AMQTypedValue.ReadFromBuffer(buffer);

-          Assert.AreEqual(VALUE, value.Value);

-       }

-       [Test]

-       public void UINT64_ReadWrite()

-       {

-          AMQType type = AMQType.UINT64;

-          ByteBuffer buffer = ByteBuffer.Allocate(0x1000);

-          const ulong VALUE = (2 ^ 61 + 1233123);

-

-          type.WriteToBuffer(VALUE, buffer);

-          buffer.Flip();

-          buffer.Rewind();

-          AMQTypedValue value = AMQTypedValue.ReadFromBuffer(buffer);

-          Assert.AreEqual(VALUE, value.Value);

-       }

-       #endregion // INT64 Tests

-

-       #region FLOAT tests

-       [Test]

-       public void FLOAT_ReadWrite()

-       {

-          AMQType type = AMQType.FLOAT;

-          ByteBuffer buffer = ByteBuffer.Allocate(0x1000);

-          const float VALUE = 1.2345000E-035f;

-

-          type.WriteToBuffer(VALUE, buffer);

-          buffer.Flip();

-          buffer.Rewind();

-          AMQTypedValue value = AMQTypedValue.ReadFromBuffer(buffer);

-          Assert.AreEqual(VALUE, value.Value);

-       }

-       #endregion // FLOAT Tests

-

-       #region DOUBLE tests

-       [Test]

-       public void DOUBLE_ReadWrite()

-       {

-          AMQType type = AMQType.DOUBLE;

-          ByteBuffer buffer = ByteBuffer.Allocate(0x1000);

-          const double VALUE = 1.2345000E-045;

-

-          type.WriteToBuffer(VALUE, buffer);

-          buffer.Flip();

-          buffer.Rewind();

-          AMQTypedValue value = AMQTypedValue.ReadFromBuffer(buffer);

-          Assert.AreEqual(VALUE, value.Value);

-       }

-       #endregion // FLOAT Tests

-    }

-}

diff --git a/qpid/dotnet/Qpid.Common.Tests/Qpid/Framing/TestEncodingUtils.cs b/qpid/dotnet/Qpid.Common.Tests/Qpid/Framing/TestEncodingUtils.cs
deleted file mode 100644
index 720d7697d3..0000000000
--- a/qpid/dotnet/Qpid.Common.Tests/Qpid/Framing/TestEncodingUtils.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-/*

- *

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- *

- */

-using System;

-using NUnit.Framework;

-using Apache.Qpid.Buffer;

-using Apache.Qpid.Framing;

-

-namespace Apache.Qpid.Framing.Tests

-{

-    [TestFixture]

-    public class TestEncodingUtils

-    {

-       [Test]

-       public void CanReadLongAsShortString()

-       {

-          ByteBuffer buffer = ByteBuffer.Allocate(0x1000);

-          EncodingUtils.WriteShortStringBytes(buffer, "98878122");

-          buffer.Flip();

-          long value = EncodingUtils.ReadLongAsShortString(buffer);

-          Assert.AreEqual(98878122, value);

-       }

-       [Test]

-       public void CanReadLongAsShortStringNegative()

-       {

-          ByteBuffer buffer = ByteBuffer.Allocate(0x1000);

-          EncodingUtils.WriteShortStringBytes(buffer, "-98878122");

-          buffer.Flip();

-          long value = EncodingUtils.ReadLongAsShortString(buffer);

-          Assert.AreEqual(-98878122, value);

-       }

-       [Test]

-       public void CanReadLongAsShortStringEmpty()

-       {

-          ByteBuffer buffer = ByteBuffer.Allocate(0x1000);

-          EncodingUtils.WriteShortStringBytes(buffer, "");

-          buffer.Flip();

-          long value = EncodingUtils.ReadLongAsShortString(buffer);

-          Assert.AreEqual(0, value);

-       }

-

-    }

-}

diff --git a/qpid/dotnet/Qpid.Common.Tests/default.build b/qpid/dotnet/Qpid.Common.Tests/default.build
deleted file mode 100644
index 00658bdbe2..0000000000
--- a/qpid/dotnet/Qpid.Common.Tests/default.build
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0"?>

-<project name="Apache.Qpid.Common" default="test">

-

-   <target name="build">

-        <csc target="library" 

-			define="${build.defines}" 

-			warnaserror="true" debug="${build.debug}" 

-         output="${build.dir}/${project::get-name()}.Tests.dll">

-			

-            <sources>

-                <include name="**/*.cs" />

-            </sources>

-            <references>

-               <include name="${build.dir}/log4net.dll" />

-               <include name="${build.dir}/nunit.framework.dll" />

-               <include name="${build.dir}/${project::get-name()}.dll" />

-               <include name="${build.dir}/Apache.Qpid.Codec.dll" />

-               <include name="${build.dir}/Apache.Qpid.Messaging.dll" />

-               <include name="${build.dir}/Apache.Qpid.Buffer.dll" />

-            </references>

-            

-        </csc>

-    </target>

-    <target name="test" depends="build">

-         <nunit2>

-            <formatter type="${nant.formatter}" usefile="false" />

-            <test assemblyname="${build.dir}/${project::get-name()}.Tests.dll" />

-         </nunit2>

-    </target>

-</project>

-

diff --git a/qpid/dotnet/Qpid.Common/AMQChannelClosedException.cs b/qpid/dotnet/Qpid.Common/AMQChannelClosedException.cs
deleted file mode 100644
index 98c6966cd1..0000000000
--- a/qpid/dotnet/Qpid.Common/AMQChannelClosedException.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-using System;
-using System.Runtime.Serialization;
-
-namespace Apache.Qpid
-{
-    [Serializable]
-    public class AMQChannelClosedException : AMQException
-    {
-        public AMQChannelClosedException(int errorCode, string message)
-            : base(errorCode, message)
-        {
-        }
-
-        protected AMQChannelClosedException(SerializationInfo info, StreamingContext ctxt)
-           : base(info, ctxt)
-        {
-        }
-    }
-}
diff --git a/qpid/dotnet/Qpid.Common/AMQConnectionClosedException.cs b/qpid/dotnet/Qpid.Common/AMQConnectionClosedException.cs
deleted file mode 100644
index f3bc387a5c..0000000000
--- a/qpid/dotnet/Qpid.Common/AMQConnectionClosedException.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-using System;
-using System.Runtime.Serialization;
-
-namespace Apache.Qpid
-{
-    [Serializable]
-    public class AMQConnectionClosedException : AMQException
-    {
-        public AMQConnectionClosedException(int errorCode, string message)
-            : base(errorCode, message)
-        {
-        }
-
-        protected AMQConnectionClosedException(SerializationInfo info, StreamingContext ctxt)
-           : base(info, ctxt)
-        {
-        }
-    }
-}
diff --git a/qpid/dotnet/Qpid.Common/AMQDisconnectedException.cs b/qpid/dotnet/Qpid.Common/AMQDisconnectedException.cs
deleted file mode 100644
index b5c4d544cd..0000000000
--- a/qpid/dotnet/Qpid.Common/AMQDisconnectedException.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-using System;
-using System.Runtime.Serialization;
-
-namespace Apache.Qpid
-{
-    [Serializable]
-    public class AMQDisconnectedException : AMQException
-    {
-        public AMQDisconnectedException(int errorCode, string message)
-            : base(errorCode, message)
-        {
-        }
-        
-        public AMQDisconnectedException(string message)
-            : base(message)
-        {            
-        }
-
-        protected AMQDisconnectedException(SerializationInfo info, StreamingContext ctxt)
-           : base(info, ctxt)
-        {
-        }
-    }
-}
diff --git a/qpid/dotnet/Qpid.Common/AMQException.cs b/qpid/dotnet/Qpid.Common/AMQException.cs
deleted file mode 100644
index f9f7158a26..0000000000
--- a/qpid/dotnet/Qpid.Common/AMQException.cs
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using System;
-using System.Runtime.Serialization;
-using log4net;
-
-namespace Apache.Qpid
-{
-    /// <summary>
-    /// The generic AMQ exception.
-    /// </summary>
-    [Serializable]
-    public class AMQException : Exception
-    {
-        private int _errorCode;
-
-        public AMQException(string message)
-            : base(message)
-        {
-        }
-
-        public AMQException(string message, Exception innerException)
-            : base(message, innerException)
-        {
-        }
-
-        public AMQException(int errorCode, string message)
-            : base(message)
-        {
-            _errorCode = errorCode;
-        }
-
-        public AMQException(int errorCode, string message, Exception innerException)
-            : base(message, innerException)
-        {
-            _errorCode = errorCode;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="T:AMQException"/> class, with a logger that will
-        /// be used to output log information upon construction. This saves having to log separately.
-        /// </summary>
-        /// <param name="logger">The logger.</param>
-        /// <param name="message">The message.</param>
-        public AMQException(ILog logger, string message)
-            : base(message)
-        {
-            logger.Error(message);
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="T:AMQException"/> class, with a logger that will
-        /// be used to output log information upon construction. This saves having to log separately.
-        /// </summary>
-        /// <param name="logger">The logger.</param>
-        /// <param name="message">The message.</param>
-        /// <param name="innerException">The root cause</param>
-        public AMQException(ILog logger, string message, Exception innerException)
-            : base(message, innerException)
-        {
-            logger.Error(message, innerException);
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="T:AMQException"/> class, with a logger that will
-        /// be used to output log information upon construction. This saves having to log separately.
-        /// </summary>
-        /// <param name="logger">The logger.</param>
-        /// <param name="message">The message.</param>
-        /// <param name="errorCode">The AMQ error code. See RFC 006 for details of error codes</param>
-        public AMQException(ILog logger, int errorCode, string message)
-            : this(errorCode, message)
-        {
-            logger.Error(message);
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="T:AMQException"/> class, with a logger that will
-        /// be used to output log information upon construction. This saves having to log separately.
-        /// </summary>
-        /// <param name="logger">The logger.</param>
-        /// <param name="message">The message.</param>
-        /// <param name="errorCode">The AMQ error code. See RFC 006 for details of error codes</param>
-        /// <param name="innerException">The root cause</param>
-        public AMQException(ILog logger, int errorCode, string message, Exception innerException)
-            : this(errorCode, message, innerException)
-        {
-            logger.Error(message, innerException);
-        }
-
-        /// <summary>
-        /// Serialization Constructor
-        /// </summary>
-        /// <param name="info">SerializationInfo object</param>
-        /// <param name="ctxt">StreamingContext object</param>
-        protected AMQException(SerializationInfo info, StreamingContext ctxt)
-           : base(info, ctxt)
-        {
-           _errorCode = info.GetInt32("ErrorCode");
-        }
-
-        /// <summary>
-        /// ISerializable implementation of GetObjectData()
-        /// </summary>
-        /// <param name="info">SerializationInfo object</param>
-        /// <param name="ctxt">StreamingContext object</param>
-        public override void GetObjectData(SerializationInfo info, StreamingContext context)
-        {
-            base.GetObjectData(info, context);
-            info.AddValue("ErrorCode", _errorCode);
-        }
-
-
-        /// <summary>
-        /// Gets or sets the error code. See RFC 006 for details of error codes.
-        /// </summary>
-        /// <value>The error code.</value>
-        public int ErrorCode
-        {
-            get
-            {
-                return _errorCode;
-            }
-            set
-            {
-                _errorCode = value;
-            }
-        }
-
-    }
-}
diff --git a/qpid/dotnet/Qpid.Common/AMQInvalidArgumentException.cs b/qpid/dotnet/Qpid.Common/AMQInvalidArgumentException.cs
deleted file mode 100644
index 0fb4ddae99..0000000000
--- a/qpid/dotnet/Qpid.Common/AMQInvalidArgumentException.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-/*

- *

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- *

- */

-

-using System;

-using System.Runtime.Serialization;

-

-using Apache.Qpid.Protocol;

-

-namespace Apache.Qpid

-{

-   /// <summary>

-   /// Thrown when an invalid argument was supplied to the broker

-   /// </summary>

-   [Serializable]

-   public class AMQInvalidArgumentException : AMQException

-   {

-      public AMQInvalidArgumentException(string message)

-         : base(AMQConstant.INVALID_ARGUMENT.Code, message, null)

-      {

-      }

-

-      protected AMQInvalidArgumentException(SerializationInfo info, StreamingContext ctxt)

-         : base(info, ctxt)

-      {

-      }

-

-   }

-}

diff --git a/qpid/dotnet/Qpid.Common/AMQInvalidRoutingKeyException.cs b/qpid/dotnet/Qpid.Common/AMQInvalidRoutingKeyException.cs
deleted file mode 100644
index 3f8dead94d..0000000000
--- a/qpid/dotnet/Qpid.Common/AMQInvalidRoutingKeyException.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-/*

- *

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- *

- */

-

-using System;

-using System.Runtime.Serialization;

-

-using Apache.Qpid.Protocol;

-

-namespace Apache.Qpid

-{

-   /// <summary>

-   /// Thrown when an invalid routing key was sent to the broker

-   /// </summary>

-   [Serializable]

-   public class AMQInvalidRoutingKeyException : AMQException

-   {

-      public AMQInvalidRoutingKeyException(string message)

-         : base(AMQConstant.INVALID_ROUTING_KEY.Code, message, null)

-      {

-      }

-

-      protected AMQInvalidRoutingKeyException(SerializationInfo info, StreamingContext ctxt)

-         : base(info, ctxt)

-      {

-      }

-

-   }

-}

diff --git a/qpid/dotnet/Qpid.Common/AMQUndeliveredException.cs b/qpid/dotnet/Qpid.Common/AMQUndeliveredException.cs
deleted file mode 100644
index 70ad86c8a3..0000000000
--- a/qpid/dotnet/Qpid.Common/AMQUndeliveredException.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-using System;
-using System.Runtime.Serialization;
-
-namespace Apache.Qpid
-{
-    /// <summary>
-    /// Thrown when a message has been bounced by the broker, indicating it could not be delivered.
-    /// </summary>
-    [Serializable]
-    public class AMQUndeliveredException : AMQException
-    {
-        // TODO: Warning, no guarantee that the value stored here is serializable!
-        private object _bounced;
-        
-        public AMQUndeliveredException(int errorCode, string message, object bounced)
-            : base(errorCode, message)
-        {
-            _bounced = bounced;
-        }
-
-        protected AMQUndeliveredException(SerializationInfo info, StreamingContext ctxt)
-           : base(info, ctxt)
-        {
-           _bounced = info.GetValue("bounced", typeof(object));
-        }
-
-        public override void GetObjectData(SerializationInfo info, StreamingContext context)
-        {
-           base.GetObjectData(info, context);
-           info.AddValue("bounced", _bounced);
-        }
-
-        public object GetUndeliveredMessage()
-        {
-            return _bounced;
-        }
-    }
-}
diff --git a/qpid/dotnet/Qpid.Common/AssemblySettings.cs b/qpid/dotnet/Qpid.Common/AssemblySettings.cs
deleted file mode 100644
index 888de692e8..0000000000
--- a/qpid/dotnet/Qpid.Common/AssemblySettings.cs
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using System;
-using System.Collections;
-using System.Configuration;
-using System.IO;
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Xml;
-using log4net;
-
-namespace Apache.Qpid.Common
-{
-    /// <summary>
-    ///
-    /// Mike Woodring
-    /// Bear Canyon Consulting LLC
-    /// http://www.bearcanyon.com
-    ///
-    /// AssemblySettings usage:
-    ///
-    /// If you know the keys you're after, the following is probably
-    /// the most convenient:
-    ///
-    ///      AssemblySettings settings = new AssemblySettings();
-    ///      string someSetting1 = settings["someKey1"];
-    ///      string someSetting2 = settings["someKey2"];
-    ///
-    /// If you want to enumerate over the settings (or just as an
-    /// alternative approach), you can do this too:
-    ///
-    ///      IDictionary settings = AssemblySettings.GetConfig();
-    ///
-    ///      foreach( DictionaryEntry entry in settings )
-    ///      {
-    ///          // Use entry.Key or entry.Value as desired...
-    ///      }
-    ///
-    /// In either of the above two scenarios, the calling assembly
-    /// (the one that called the constructor or GetConfig) is used
-    /// to determine what file to parse and what the name of the
-    /// settings collection element is.  For example, if the calling
-    /// assembly is c:\foo\bar\TestLib.dll, then the configuration file
-    /// that's parsed is c:\foo\bar\TestLib.dll.config, and the
-    /// configuration section that's parsed must be named <assemblySettings>.
-    ///
-    /// To retrieve the configuration information for an arbitrary assembly,
-    /// use the overloaded constructor or GetConfig method that takes an
-    /// Assembly reference as input.
-    ///
-    /// If your assembly is being automatically downloaded from a web
-    /// site by an "href-exe" (an application that's run directly from a link
-    /// on a web page), then the enclosed web.config shows the mechanism
-    /// for allowing the AssemblySettings library to download the
-    /// configuration files you're using for your assemblies (while not
-    /// allowing web.config itself to be downloaded).
-    ///
-    /// If the assembly you are trying to use this with is installed in, and loaded
-    /// from, the GAC then you'll need to place the config file in the GAC directory where
-    /// the assembly is installed.  On the first release of the CLR, this directory is
-    /// <windir>\assembly\gac\libName\verNum__pubKeyToken]]>.  For example,
-    /// the assembly "SomeLib, Version=1.2.3.4, Culture=neutral, PublicKeyToken=abcd1234"
-    /// would be installed to the c:\winnt\assembly\gac\SomeLib\1.2.3.4__abcd1234 diretory
-    /// (assuming the OS is installed in c:\winnt).  For future versions of the CLR, this
-    /// directory scheme may change, so you'll need to check the <code>CodeBase</code> property
-    /// of a GAC-loaded assembly in the debugger to determine the correct directory location.
-    ///
-    /// </summary>
-    public class AssemblySettings
-    {
-        private static readonly ILog _log = LogManager.GetLogger(typeof(AssemblySettings));
-
-        private IDictionary settings;
-
-        [MethodImpl(MethodImplOptions.NoInlining)]
-        public AssemblySettings()
-            : this(Assembly.GetCallingAssembly())
-        {
-        }
-
-        public AssemblySettings(Assembly asm)
-        {
-            settings = GetConfig(asm);
-        }
-
-        public string this[string key]
-        {
-            get
-            {
-                string settingValue = null;
-
-                if (settings != null)
-                {
-                    settingValue = settings[key] as string;
-                }
-
-                return (settingValue == null ? "" : settingValue);
-            }
-        }
-
-        public static IDictionary GetConfig()
-        {
-            return GetConfig(Assembly.GetCallingAssembly());
-        }
-
-        public static IDictionary GetConfig(Assembly asm)
-        {
-            // Open and parse configuration file for specified
-            // assembly, returning collection to caller for future
-            // use outside of this class.
-            string cfgFile = asm.CodeBase + ".config";
-            try
-            {
-                const string nodeName = "assemblySettings";
-                
-                XmlDocument doc = new XmlDocument();
-                doc.Load(new XmlTextReader(cfgFile));
-
-                XmlNodeList nodes = doc.GetElementsByTagName(nodeName);
-
-                foreach (XmlNode node in nodes)
-                {
-                    if (node.LocalName == nodeName)
-                    {
-                        DictionarySectionHandler handler = new DictionarySectionHandler();
-                        return (IDictionary)handler.Create(null, null, node);
-                    }
-                }
-            }
-            catch (FileNotFoundException)
-            {
-                _log.Warn("Assembly configuration file not found: " + cfgFile);
-            }
-            catch (Exception e)
-            {
-                _log.Warn("Failed to load .config file: " + cfgFile, e);
-            }
-
-            return null;
-        }
-    }
-}
diff --git a/qpid/dotnet/Qpid.Common/Collections/BlockingQueue.cs b/qpid/dotnet/Qpid.Common/Collections/BlockingQueue.cs
deleted file mode 100644
index dcfacf8474..0000000000
--- a/qpid/dotnet/Qpid.Common/Collections/BlockingQueue.cs
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using System;
-using System.Collections;
-
-namespace Apache.Qpid.Collections
-{
-    public abstract class BlockingQueue : Queue
-    {
-        /**
-         * Inserts the specified element into this queue if it is possible to do
-         * so immediately without violating capacity restrictions, returning
-         * <tt>true</tt> upon success and <tt>false</tt> if no space is currently
-         * available.  When using a capacity-restricted queue, this method is
-         * generally preferable to {@link #add}, which can fail to insert an
-         * element only by throwing an exception.
-         *
-         * @param e the element to add
-         * @return <tt>true</tt> if the element was added to this queue, else
-         *         <tt>false</tt>
-         * @throws ClassCastException if the class of the specified element
-         *         prevents it from being added to this queue
-         * @throws NullPointerException if the specified element is null
-         * @throws IllegalArgumentException if some property of the specified
-         *         element prevents it from being added to this queue
-         */
-        public abstract bool EnqueueNoThrow(Object e);
-
-        /**
-         * Inserts the specified element into this queue, waiting if necessary
-         * for space to become available.
-         *
-         * @param e the element to add
-         * @throws InterruptedException if interrupted while waiting
-         * @throws ClassCastException if the class of the specified element
-         *         prevents it from being added to this queue
-         * @throws NullPointerException if the specified element is null
-         * @throws IllegalArgumentException if some property of the specified
-         *         element prevents it from being added to this queue
-         */
-        public abstract void EnqueueBlocking(object e);                     
-
-        /**
-         * Retrieves and removes the head of this queue, waiting up to the
-         * specified wait time if necessary for an element to become available.
-         *
-         * @param timeout how long to wait before giving up, in units of
-         *        <tt>unit</tt>
-         * @param unit a <tt>TimeUnit</tt> determining how to interpret the
-         *        <tt>timeout</tt> parameter
-         * @return the head of this queue, or <tt>null</tt> if the
-         *         specified waiting time elapses before an element is available
-         * @throws InterruptedException if interrupted while waiting
-         */
-        public abstract object DequeueBlocking();            
-
-        /**
-         * Returns the number of additional elements that this queue can ideally
-         * (in the absence of memory or resource constraints) accept without
-         * blocking, or <tt>Integer.MAX_VALUE</tt> if there is no intrinsic
-         * limit.
-         *
-         * <p>Note that you <em>cannot</em> always tell if an attempt to insert
-         * an element will succeed by inspecting <tt>remainingCapacity</tt>
-         * because it may be the case that another thread is about to
-         * insert or remove an element.
-         *
-         * @return the remaining capacity
-         */
-        public abstract int RemainingCapacity
-        {
-            get;
-        }                        
-    }
-}
-
-
diff --git a/qpid/dotnet/Qpid.Common/Collections/ConsumerProducerQueue.cs b/qpid/dotnet/Qpid.Common/Collections/ConsumerProducerQueue.cs
deleted file mode 100644
index ea4526faaf..0000000000
--- a/qpid/dotnet/Qpid.Common/Collections/ConsumerProducerQueue.cs
+++ /dev/null
@@ -1,113 +0,0 @@
-/*

- *

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- *

- */

-using System;

-using System.Collections;

-using System.Threading;

-

-

-namespace Apache.Qpid.Collections

-{

-   /// <summary>

-   /// Simple FIFO queue to support multi-threaded consumer

-   /// and producers. It supports timeouts in dequeue operations.

-   /// </summary>

-   public sealed class ConsumerProducerQueue 

-   {

-      private Queue _queue = new Queue();

-      private WaitSemaphore _semaphore = new WaitSemaphore();

-

-      /// <summary>

-      /// Put an item into the tail of the queue

-      /// </summary>

-      /// <param name="item"></param>

-      public void Enqueue(object item)

-      {

-         lock ( _queue.SyncRoot )

-         {

-            _queue.Enqueue(item);

-            _semaphore.Increment();

-         }

-      }

-

-      /// <summary>

-      /// Wait indefinitely for an item to be available

-      /// on the queue.

-      /// </summary>

-      /// <returns>The object at the head of the queue</returns>

-      public object Dequeue()

-      {

-         return Dequeue(Timeout.Infinite);

-      }

-

-      /// <summary>

-      /// Wait up to the number of milliseconds specified

-      /// for an item to be available on the queue

-      /// </summary>

-      /// <param name="timeout">Number of milliseconds to wait</param>

-      /// <returns>The object at the head of the queue, or null 

-      /// if the timeout expires</returns>

-      public object Dequeue(long timeout)

-      {

-         if ( _semaphore.Decrement(timeout) )

-         {

-            lock ( _queue.SyncRoot )

-            {

-               return _queue.Dequeue();

-            }

-         }

-         return null;

-      }

-

-      #region Simple Semaphore

-      //

-      // Simple Semaphore

-      //

-

-      class WaitSemaphore

-      {

-         private int _count;

-         private AutoResetEvent _event = new AutoResetEvent(false);

-

-         public void Increment()

-         {

-            Interlocked.Increment(ref _count);

-            _event.Set();

-         }

-

-         public bool Decrement(long timeout)

-         {

-            if ( timeout > int.MaxValue )

-               throw new ArgumentOutOfRangeException("timeout", timeout, "Must be <= Int32.MaxValue");

-

-            int millis = (int) (timeout & 0x7FFFFFFF);

-            if ( Interlocked.Decrement(ref _count) > 0 )

-            {

-               // there are messages in queue, so no need to wait

-               return true;

-            } else

-            {

-               return _event.WaitOne(millis, false);

-            }

-         }

-      }

-      #endregion // Simple Semaphore

-   }

-}

diff --git a/qpid/dotnet/Qpid.Common/Collections/LinkedBlockingQueue.cs b/qpid/dotnet/Qpid.Common/Collections/LinkedBlockingQueue.cs
deleted file mode 100644
index be92576951..0000000000
--- a/qpid/dotnet/Qpid.Common/Collections/LinkedBlockingQueue.cs
+++ /dev/null
@@ -1,384 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using System;
-using System.Threading;
-
-namespace Apache.Qpid.Collections
-{
-    public class LinkedBlockingQueue : BlockingQueue
-    {             
-
-        /*
-         * A variant of the "two lock queue" algorithm.  The putLock gates
-         * entry to put (and offer), and has an associated condition for
-         * waiting puts.  Similarly for the takeLock.  The "count" field
-         * that they both rely on is maintained as an atomic to avoid
-         * needing to get both locks in most cases. Also, to minimize need
-         * for puts to get takeLock and vice-versa, cascading notifies are
-         * used. When a put notices that it has enabled at least one take,
-         * it signals taker. That taker in turn signals others if more
-         * items have been entered since the signal. And symmetrically for
-         * takes signalling puts. Operations such as remove(Object) and
-         * iterators acquire both locks.
-         */
-
-        /**
-         * Linked list node class
-         */
-        internal class Node
-        {
-            /** The item, volatile to ensure barrier separating write and read */
-            internal volatile Object item;
-            internal Node next;
-            internal Node(Object x) { item = x; }
-        }
-
-        /** The capacity bound, or Integer.MAX_VALUE if none */
-        private readonly int capacity;
-
-        /** Current number of elements */
-        private volatile int count = 0;
-
-        /** Head of linked list */
-        private Node head;
-
-        /** Tail of linked list */
-        private Node last;
-
-        /** Lock held by take, poll, etc */
-        private readonly object takeLock = new Object(); //new SerializableLock();
-
-        /** Lock held by put, offer, etc */
-        private readonly object putLock = new Object();//new SerializableLock();
-
-        /**
-         * Signals a waiting take. Called only from put/offer (which do not
-         * otherwise ordinarily lock takeLock.)
-         */
-        private void SignalNotEmpty()
-        {
-            lock (takeLock)
-            {
-                Monitor.Pulse(takeLock);
-            }
-        }
-
-        /**
-         * Signals a waiting put. Called only from take/poll.
-         */
-        private void SignalNotFull()
-        {
-            lock (putLock)
-            {
-                Monitor.Pulse(putLock);
-            }
-        }
-
-        /**
-         * Creates a node and links it at end of queue.
-         * @param x the item
-         */
-        private void Insert(Object x)
-        {
-            last = last.next = new Node(x);
-        }
-
-        /**
-         * Removes a node from head of queue,
-         * @return the node
-         */
-        private Object Extract()
-        {
-            Node first = head.next;
-            head = first;
-            Object x = first.item;
-            first.item = null;
-            return x;
-        }
-
-
-        /**
-         * Creates a <tt>LinkedBlockingQueue</tt> with a capacity of
-         * {@link Integer#MAX_VALUE}.
-         */
-        public LinkedBlockingQueue() : this(Int32.MaxValue)
-        {            
-        }
-
-        /**
-         * Creates a <tt>LinkedBlockingQueue</tt> with the given (fixed) capacity.
-         *
-         * @param capacity the capacity of this queue
-         * @throws IllegalArgumentException if <tt>capacity</tt> is not greater
-         *         than zero
-         */
-        public LinkedBlockingQueue(int capacity)
-        {
-            if (capacity <= 0) throw new ArgumentException("Capacity must be positive, was passed " + capacity);
-            this.capacity = capacity;
-            last = head = new Node(null);
-        }        
-
-        // this doc comment is overridden to remove the reference to collections
-        // greater in size than Integer.MAX_VALUE
-        /**
-         * Returns the number of elements in this queue.
-         *
-         * @return the number of elements in this queue
-         */
-        public int Size
-        {
-            get
-            {
-                return count;
-            }            
-        }
-
-        // this doc comment is a modified copy of the inherited doc comment,
-        // without the reference to unlimited queues.
-        /**
-         * Returns the number of additional elements that this queue can ideally
-         * (in the absence of memory or resource constraints) accept without
-         * blocking. This is always equal to the initial capacity of this queue
-         * less the current <tt>size</tt> of this queue.
-         *
-         * <p>Note that you <em>cannot</em> always tell if an attempt to insert
-         * an element will succeed by inspecting <tt>remainingCapacity</tt>
-         * because it may be the case that another thread is about to
-         * insert or remove an element.
-         */
-        public override int RemainingCapacity
-        {
-            get
-            {
-                return capacity - count;
-            }            
-        }
-
-        /**
-         * Inserts the specified element at the tail of this queue, waiting if
-         * necessary for space to become available.
-         *
-         * @throws InterruptedException {@inheritDoc}
-         * @throws NullPointerException {@inheritDoc}
-         */
-        public override void EnqueueBlocking(Object e)
-        {
-            if (e == null) throw new ArgumentNullException("Object must not be null");
-            // Note: convention in all put/take/etc is to preset
-            // local var holding count  negative to indicate failure unless set.
-            int c = -1;
-            lock (putLock) 
-            {
-                /*
-                 * Note that count is used in wait guard even though it is
-                 * not protected by lock. This works because count can
-                 * only decrease at this point (all other puts are shut
-                 * out by lock), and we (or some other waiting put) are
-                 * signalled if it ever changes from
-                 * capacity. Similarly for all other uses of count in
-                 * other wait guards.
-                 */                
-                while (count == capacity)
-                {
-                    Monitor.Wait(putLock);
-                }
-                
-                Insert(e);
-                lock(this)
-                {
-                    c = count++;
-                }
-                if (c + 1 < capacity)
-                {
-                    Monitor.Pulse(putLock);
-                }                    
-            }
-
-            if (c == 0)
-            {
-                SignalNotEmpty();
-            }
-        }
-        
-        /**
-         * Inserts the specified element at the tail of this queue if it is
-         * possible to do so immediately without exceeding the queue's capacity,
-         * returning <tt>true</tt> upon success and <tt>false</tt> if this queue
-         * is full.
-         * When using a capacity-restricted queue, this method is generally
-         * preferable to method {@link BlockingQueue#add add}, which can fail to
-         * insert an element only by throwing an exception.
-         *
-         * @throws NullPointerException if the specified element is null
-         */
-        public override bool EnqueueNoThrow(Object e)
-        {
-            if (e == null) throw new ArgumentNullException("e must not be null");
-            if (count == capacity)
-            {
-                return false;
-            }
-            int c = -1;
-            lock (putLock) 
-            {
-                if (count < capacity) 
-                {
-                    Insert(e);
-                    lock (this)
-                    {
-                        c = count++;
-                    }
-                    if (c + 1 < capacity)
-                    {
-                        Monitor.Pulse(putLock);
-                    }
-                }
-            }
-            if (c == 0)
-            {
-                SignalNotEmpty();
-            }
-            return c >= 0;
-        }
-
-        /**
-         * Retrieves and removes the head of this queue, waiting if necessary
-         * until an element becomes available.
-         *
-         * @return the head of this queue
-         * @throws InterruptedException if interrupted while waiting
-         */
-        public override Object DequeueBlocking()
-        {
-            Object x;
-            int c = -1;
-            lock (takeLock) 
-            {
-                
-                while (count == 0)
-                {
-                    Monitor.Wait(takeLock);
-                }
-                
-
-                x = Extract();
-                lock (this) { c = count--; }
-                if (c > 1)
-                {
-                    Monitor.Pulse(takeLock);
-                }
-            }
-            if (c == capacity)
-            {
-                SignalNotFull();
-            }
-            return x;
-        }
-        
-        public Object Poll()
-        {
-            if (count == 0)
-            {
-                return null;
-            }
-            Object x = null;
-            int c = -1;
-            lock (takeLock) 
-            {
-                if (count > 0) 
-                {
-                    x = Extract();
-                    lock (this) { c = count--; }
-                    if (c > 1)
-                    {
-                        Monitor.Pulse(takeLock);
-                    }
-                }
-            }
-            if (c == capacity)
-            {
-                SignalNotFull();
-            }
-            return x;
-        }
-
-
-        public override Object Peek()
-        {
-            if (count == 0)
-            {
-                return null;
-            }
-            lock (takeLock) 
-            {
-                Node first = head.next;
-                if (first == null)
-                {
-                    return null;
-                }
-                else
-                {
-                    return first.item;
-                }
-            }
-        }
-        
-        public override String ToString()
-        {
-            lock (putLock) 
-            {
-                lock (takeLock) 
-                {
-                    return base.ToString();
-                }
-            }
-        }
-
-        /**
-         * Atomically removes all of the elements from this queue.
-         * The queue will be empty after this call returns.
-         */
-        public override void Clear()
-        {
-            lock (putLock) 
-            {
-                lock (takeLock) 
-                {
-                    head.next = null;                
-                    last = head;
-                    int c;
-                    lock (this) 
-                    {
-                        c = count;
-                        count = 0;
-                    }
-                    if (c == capacity)
-                    {
-                        Monitor.PulseAll(putLock);
-                    }
-                }
-            }
-        }                       
-    }
-}
-
-
diff --git a/qpid/dotnet/Qpid.Common/Collections/LinkedHashtable.cs b/qpid/dotnet/Qpid.Common/Collections/LinkedHashtable.cs
deleted file mode 100644
index 10ab5c674d..0000000000
--- a/qpid/dotnet/Qpid.Common/Collections/LinkedHashtable.cs
+++ /dev/null
@@ -1,327 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using System;
-using System.Collections;
-
-namespace Apache.Qpid.Collections
-{
-    public class LinkedHashtable : IDictionary
-    {
-        /// <summary>
-        /// Maps from key to LinkedDictionaryEntry        
-        /// </summary>
-        private Hashtable _indexedValues = new Hashtable();
-
-        private LinkedDictionaryEntry _head;
-
-        private LinkedDictionaryEntry _tail;
-
-        private class LinkedDictionaryEntry
-        {
-            public LinkedDictionaryEntry _previous;
-            public LinkedDictionaryEntry _next;
-            internal DictionaryEntry _entry;
-
-            public LinkedDictionaryEntry(object key, object value)
-            {
-                _entry = new DictionaryEntry(key, value);
-            }
-        }
-
-        public object this[object key]
-        {
-            get
-            {
-                LinkedDictionaryEntry entry = (LinkedDictionaryEntry)_indexedValues[key];
-                if (entry == null)
-                {
-                    return null; // key not found
-                }
-                else
-                {
-                    return entry._entry.Value;
-                }
-            }
-
-            set
-            {
-                LinkedDictionaryEntry entry = (LinkedDictionaryEntry)_indexedValues[key];
-                if (entry == null)
-                {
-                    Add(key, value);
-                }
-                else
-                {
-                    entry._entry.Value = value;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Collect keys in linked order.
-        /// </summary>
-        public ICollection Keys
-        {
-            get
-            {
-                IList result = new ArrayList();
-                foreach (DictionaryEntry entry in this)
-                {
-                    result.Add(entry.Key);
-                }
-                return result;
-            }
-        }
-
-        /// <summary>
-        /// Collect values in linked order.
-        /// </summary>
-        public ICollection Values
-        {
-            get
-            {
-                IList result = new ArrayList();
-                foreach (DictionaryEntry entry in this)
-                {
-                    result.Add(entry.Value);
-                }
-                return result;
-            }
-        }
-
-        public bool IsReadOnly
-        {
-            get { return _indexedValues.IsReadOnly; }
-        }
-
-        public bool IsFixedSize
-        {
-            get { return _indexedValues.IsFixedSize; }
-        }
-
-        public bool Contains(object key)
-        {
-            return _indexedValues.Contains(key);
-        }
-
-        public void Add(object key, object value)
-        {
-            if (key == null) throw new ArgumentNullException("key");
-            
-            if (Contains(key))
-            {
-                throw new ArgumentException("LinkedHashtable already contains key. key=" + key);
-            }
-            
-            LinkedDictionaryEntry de = new LinkedDictionaryEntry(key, value);
-            if (_head == null)
-            {
-                _head = de;
-                _tail = de;
-            }
-            else
-            {
-                _tail._next = de;
-                de._previous = _tail;
-                _tail = de;
-            }
-            _indexedValues[key] = de;
-        }
-
-        public void Clear()
-        {
-            _indexedValues.Clear();
-        }
-
-        IDictionaryEnumerator IDictionary.GetEnumerator()
-        {
-            return new LHTEnumerator(this);
-        }
-
-        public void Remove(object key)
-        {
-            if (key == null) throw new ArgumentNullException("key");
-            
-            LinkedDictionaryEntry de = (LinkedDictionaryEntry)_indexedValues[key];
-            if (de == null) return; // key not found.
-            LinkedDictionaryEntry prev = de._previous;
-            if (prev == null)
-            {
-                _head = de._next;
-            }
-            else
-            {
-                prev._next = de._next;
-            }
-
-            LinkedDictionaryEntry next = de._next;
-            if (next == null)
-            {
-                _tail = de;
-            }
-            else
-            {
-                next._previous = de._previous;
-            }
-        }
-        
-        private LinkedDictionaryEntry Head
-        {
-            get
-            {
-                return _head;
-            }
-        }
-
-//        private LinkedDictionaryEntry Tail
-//        {
-//            get
-//            {
-//                return _tail;
-//            }
-//        }
-
-        private class LHTEnumerator : IDictionaryEnumerator
-        {
-            private LinkedHashtable _container;
-
-            private LinkedDictionaryEntry _current;
-
-            /// <summary>
-            /// Set once we have navigated off the end of the collection
-            /// </summary>
-            private bool _needsReset = false;
-
-            public LHTEnumerator(LinkedHashtable container)
-            {
-                _container = container;                
-            }
-
-            public object Current
-            {
-                get
-                {
-                    if (_current == null)
-                    {
-                        throw new Exception("Iterator before first element");
-                    }
-                    else
-                    {
-                        return _current._entry;
-                    }
-                }
-            }
-
-            public object Key
-            {
-                get { return _current._entry.Key; }
-            }
-
-            public object Value
-            {
-                get { return _current._entry.Value; }
-            }
-
-            public DictionaryEntry Entry
-            {
-                get
-                {
-                    return _current._entry;
-                }
-            }
-
-            public bool MoveNext()
-            {
-                if (_needsReset)
-                {
-                    return false;
-                }
-                else if (_current == null)
-                {
-                    _current = _container.Head;                    
-                }
-                else
-                {
-                    _current = _current._next;
-                }
-                _needsReset = (_current == null);
-                return !_needsReset;                
-            }
-
-            public void Reset()
-            {
-                _current = null;
-                _needsReset = false;
-            }
-        }
-
-        public void MoveToHead(object key)
-        {
-            LinkedDictionaryEntry de = (LinkedDictionaryEntry)_indexedValues[key];
-            if (de == null)
-            {
-                throw new ArgumentException("Key " + key + " not found");
-            }
-            // if the head is the element then there is nothing to do
-            if (_head == de)
-            {
-                return;
-            }
-            de._previous._next = de._next;
-            if (de._next != null)
-            {
-                de._next._previous = de._previous;
-            }
-            else
-            {
-                _tail = de._previous;
-            }
-            de._next = _head;
-            _head = de;
-            de._previous = null;
-        }
-
-        public void CopyTo(Array array, int index)
-        {
-            _indexedValues.CopyTo(array, index);
-        }
-
-        public int Count
-        {
-            get { return _indexedValues.Count; }
-        }
-
-        public object SyncRoot
-        {
-            get { return _indexedValues.SyncRoot; }
-        }
-
-        public bool IsSynchronized
-        {
-            get { return _indexedValues.IsSynchronized; }
-        }
-
-        public IEnumerator GetEnumerator()
-        {
-            return new LHTEnumerator(this);
-        }
-    }
-}
diff --git a/qpid/dotnet/Qpid.Common/Collections/SynchronousQueue.cs b/qpid/dotnet/Qpid.Common/Collections/SynchronousQueue.cs
deleted file mode 100644
index 3c12df6067..0000000000
--- a/qpid/dotnet/Qpid.Common/Collections/SynchronousQueue.cs
+++ /dev/null
@@ -1,375 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using System;
-using System.Threading;
-
-namespace Apache.Qpid.Collections
-{
-    public class SynchronousQueue : BlockingQueue
-    {
-        /// <summary>
-        /// Lock protecting both wait queues
-        /// </summary> 
-//        private readonly object _qlock = new object();
-        
-        /// <summary>
-        /// Queue holding waiting puts
-        /// </summary> 
-//        private readonly WaitQueue _waitingProducers;
-        
-        /// <summary>
-        /// Queue holding waiting takes
-        /// </summary> 
-//        private readonly WaitQueue _waitingConsumers;
-        
-        /**
-         * Queue to hold waiting puts/takes; specialized to Fifo/Lifo below.
-         * These queues have all transient fields, but are serializable
-         * in order to recover fairness settings when deserialized.
-         */
-        internal abstract class WaitQueue
-        {
-            /** Creates, adds, and returns node for x. */
-            internal abstract Node Enq(Object x);
-            /** Removes and returns node, or null if empty. */
-            internal abstract Node Deq();
-            /** Removes a cancelled node to avoid garbage retention. */
-            internal abstract void Unlink(Node node);
-            /** Returns true if a cancelled node might be on queue. */
-            internal abstract bool ShouldUnlink(Node node);
-        }
-
-        /**
-         * FIFO queue to hold waiting puts/takes.
-         */
-        sealed class FifoWaitQueue : WaitQueue
-        {            
-            private Node head;
-            private Node last;
-
-            internal override Node Enq(Object x)
-            {
-                Node p = new Node(x);
-                if (last == null)
-                {
-                    last = head = p;
-                }
-                else
-                {
-                    last = last.next = p;
-                }
-                return p;
-            }
-
-            internal override Node Deq()
-            {
-                Node p = head;
-                if (p != null)
-                {
-                    if ((head = p.next) == null)
-                    {
-                        last = null;
-                    }
-                    p.next = null;
-                }
-                return p;
-            }
-
-            internal override bool ShouldUnlink(Node node)
-            {
-                return (node == last || node.next != null);
-            }
-
-            internal override void Unlink(Node node)
-            {
-                Node p = head;
-                Node trail = null;
-                while (p != null)
-                {
-                    if (p == node)
-                    {
-                        Node next = p.next;
-                        if (trail == null)
-                        {
-                            head = next;
-                        }
-                        else
-                        {
-                            trail.next = next;
-                        }
-                        if (last == node)
-                        {
-                            last = trail;
-                        }
-                        break;
-                    }
-                    trail = p;
-                    p = p.next;
-                }
-            }
-        }
-
-        /**
-         * LIFO queue to hold waiting puts/takes.
-         */
-        sealed class LifoWaitQueue : WaitQueue
-        {        
-            private Node head;
-
-            internal override Node Enq(Object x)
-            {
-                return head = new Node(x, head);
-            }
-
-            internal override Node Deq()
-            {
-                Node p = head;
-                if (p != null)
-                {
-                    head = p.next;
-                    p.next = null;
-                }
-                return p;
-            }
-
-            internal override bool ShouldUnlink(Node node)
-            {
-                // Return false if already dequeued or is bottom node (in which
-                // case we might retain at most one garbage node)
-                return (node == head || node.next != null);
-            }
-
-            internal override void Unlink(Node node)
-            {
-                Node p = head;
-                Node trail = null;
-                while (p != null)
-                {
-                    if (p == node)
-                    {
-                        Node next = p.next;
-                        if (trail == null)
-                            head = next;
-                        else
-                            trail.next = next;
-                        break;
-                    }
-                    trail = p;
-                    p = p.next;
-                }
-            }
-        }
-
-        /**
-         * Nodes each maintain an item and handle waits and signals for
-         * getting and setting it. The class extends
-         * AbstractQueuedSynchronizer to manage blocking, using AQS state
-         *  0 for waiting, 1 for ack, -1 for cancelled.
-         */
-        sealed internal class Node
-        {            
-
-            /** Synchronization state value representing that node acked */
-            private const int ACK    =  1;
-            /** Synchronization state value representing that node cancelled */
-            private const int CANCEL = -1;
-
-            internal int state = 0;
-
-            /** The item being transferred */
-            internal Object item;
-            /** Next node in wait queue */
-            internal Node next;
-
-            /** Creates a node with initial item */
-            internal Node(Object x)
-            {
-                item = x;
-            }
-
-            /** Creates a node with initial item and next */
-            internal Node(Object x, Node n)
-            {
-                item = x;
-                next = n;
-            }
-
-            /**
-             * Takes item and nulls out field (for sake of GC)
-             *
-             * PRE: lock owned
-             */
-            private Object Extract()
-            {
-                Object x = item;
-                item = null;
-                return x;
-            }
-
-            /**
-             * Tries to cancel on interrupt; if so rethrowing,
-             * else setting interrupt state
-             *
-             * PRE: lock owned
-             */
-            /*private void checkCancellationOnInterrupt(InterruptedException ie)
-                throws InterruptedException
-            {
-                if (state == 0) {
-                    state = CANCEL;
-                    notify();
-                    throw ie;
-                }
-                Thread.currentThread().interrupt();
-            }*/
-
-            /**
-             * Fills in the slot created by the consumer and signal consumer to
-             * continue.
-             */
-            internal bool SetItem(Object x)            
-            {
-                lock (this)
-                {
-                    if (state != 0) return false;
-                    item = x;
-                    state = ACK;                    
-                    Monitor.Pulse(this);
-                    return true;
-                }
-            }
-
-            /**
-             * Removes item from slot created by producer and signal producer
-             * to continue.
-             */
-            internal Object GetItem()
-            {
-                if (state != 0) return null;
-                state = ACK;
-                Monitor.Pulse(this);
-                return Extract();
-            }
-
-            /**
-             * Waits for a consumer to take item placed by producer.
-             */
-            internal void WaitForTake() //throws InterruptedException {
-            {                
-                while (state == 0)
-                {
-                    Monitor.Wait(this);
-                }                
-            }
-
-            /**
-             * Waits for a producer to put item placed by consumer.
-             */
-            internal object WaitForPut()
-            {
-                lock (this)
-                {
-                    while (state == 0) Monitor.Wait(this);
-                } 
-                return Extract();
-            }
-
-            private bool Attempt(long nanos)
-            {
-                if (state != 0) return true;
-                if (nanos <= 0) {
-                    state = CANCEL;
-                    Monitor.Pulse(this);
-                    return false;
-                }
-                
-                while (true)
-                {
-                    Monitor.Wait(nanos);
-                    //TimeUnit.NANOSECONDS.timedWait(this, nanos);
-                    if (state != 0)
-                    {
-                        return true;
-                    }
-                        //nanos = deadline - Utils.nanoTime();
-                        //if (nanos <= 0)
-                    else
-                    {
-                        state = CANCEL;
-                        Monitor.Pulse(this);
-                        return false;
-                    }
-                }
-            }
-
-            /**
-             * Waits for a consumer to take item placed by producer or time out.
-             */
-            internal bool WaitForTake(long nanos)
-            {                
-                return Attempt(nanos);                
-            }
-
-            /**
-             * Waits for a producer to put item placed by consumer, or time out.
-             */
-            internal object WaitForPut(long nanos)
-            {
-                if (!Attempt(nanos))
-                {
-                    return null;
-                }
-                else
-                {
-                    return Extract();
-                }
-            }
-        }
-
-        public SynchronousQueue(bool strict)
-        {
-            // TODO !!!!
-        }
-        
-        public override bool EnqueueNoThrow(object e)
-        {
-            throw new NotImplementedException();
-        }
-
-        public override void EnqueueBlocking(object e)
-        {
-            throw new NotImplementedException();
-        }        
-
-        public override object DequeueBlocking()
-        {
-            throw new NotImplementedException();
-        }
-
-        public override int RemainingCapacity
-        {
-            get
-            {
-                throw new NotImplementedException();
-            }
-        }
-    }
-}
diff --git a/qpid/dotnet/Qpid.Common/Framing/AMQDataBlockDecoder.cs b/qpid/dotnet/Qpid.Common/Framing/AMQDataBlockDecoder.cs
deleted file mode 100644
index 7867650e50..0000000000
--- a/qpid/dotnet/Qpid.Common/Framing/AMQDataBlockDecoder.cs
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using System;
-using System.Collections;
-using log4net;
-using Apache.Qpid.Buffer;
-using Apache.Qpid.Codec;
-using Apache.Qpid.Codec.Demux;
-
-namespace Apache.Qpid.Framing
-{
-    public class AMQDataBlockDecoder : IMessageDecoder
-    {
-        private static ILog _logger = LogManager.GetLogger(typeof(AMQDataBlockDecoder));
-
-        private Hashtable _supportedBodies = new Hashtable();
-
-        private bool _disabled = false;
-
-        public AMQDataBlockDecoder()
-        {
-            _supportedBodies[AMQMethodBody.TYPE] = AMQMethodBodyFactory.GetInstance();
-            _supportedBodies[ContentHeaderBody.TYPE] = ContentHeaderBodyFactory.GetInstance();
-            _supportedBodies[ContentBody.TYPE] = ContentBodyFactory.GetInstance();
-            _supportedBodies[HeartbeatBody.TYPE] = new HeartbeatBodyFactory();
-        }
-        
-        public MessageDecoderResult Decodable(ByteBuffer input)
-        {
-            if (_disabled)
-            {
-                return MessageDecoderResult.NOT_OK;
-            }
-            // final +1 represents the command end which we know we must require even
-            // if there is an empty body
-            if (input.Remaining < 1)
-            {
-                return MessageDecoderResult.NEED_DATA;
-            }
-            byte type = input.GetByte();
-
-            // we have to check this isn't a protocol initiation frame here - we can't tell later on and we end up
-            // waiting for more data. This could be improved if MINA supported some kind of state awareness when decoding
-            if ((char)type == 'A')
-            {
-                _logger.Error("Received what appears to be a protocol initiation frame");
-                return MessageDecoderResult.NOT_OK;
-            }
-            // zero, channel, body size and end byte
-            if (input.Remaining < (1 + 2 + 4 + 1))
-            {
-                return MessageDecoderResult.NEED_DATA;
-            }
-
-            int channel = input.GetUInt16();
-            long bodySize = input.GetUInt32();            
-
-            // bodySize can be zero
-            if (type <= 0 || channel < 0 || bodySize < 0)
-            {
-                _logger.Error(String.Format("Error decoding frame: Type={0}, Channel={1}, BodySize={2}", type, channel, bodySize));                
-                return MessageDecoderResult.NOT_OK;
-            }
-
-            if (input.Remaining < (bodySize + 1))
-            {
-                return MessageDecoderResult.NEED_DATA;
-            }
-
-            if (IsSupportedFrameType(type))
-            {
-                if (_logger.IsDebugEnabled)
-                {
-                    // we have read 7 bytes so far, so output 7 + bodysize + 1 (for end byte) to get complete data block size
-                    // this logging statement is useful when looking at exactly what size of data is coming in/out
-                    // the broker
-                    _logger.Debug("Able to decode data block of size " + (bodySize + 8));
-                }
-                return MessageDecoderResult.OK;
-            }
-            else
-            {
-                return MessageDecoderResult.NOT_OK;
-            }
-        }
-
-        private bool IsSupportedFrameType(byte frameType)
-        {
-            bool result = _supportedBodies.ContainsKey(frameType);
-
-            if (!result)
-            {
-                _logger.Warn("AMQDataBlockDecoder does not handle frame type " + frameType);
-            }
-
-            return result;
-        }
-
-        protected Object CreateAndPopulateFrame(ByteBuffer input)
-        {
-            byte type = input.GetByte();
-            ushort channel = input.GetUInt16();
-            uint bodySize = input.GetUInt32();
-
-            IBodyFactory bodyFactory = (IBodyFactory)_supportedBodies[type];
-            if (bodyFactory == null)
-            {
-                throw new AMQFrameDecodingException("Unsupported body type: " + type);
-            }
-            AMQFrame frame = new AMQFrame();
-
-            frame.PopulateFromBuffer(input, channel, bodySize, bodyFactory);
-
-            byte marker = input.GetByte();
-            if (marker != 0xCE) {
-           		throw new FormatException("marker is not 0xCE"); 	
-            }
-            return frame;
-        }
-
-        public MessageDecoderResult Decode(ByteBuffer input, IProtocolDecoderOutput output)
-        {
-
-            output.Write(CreateAndPopulateFrame(input));
-
-            return MessageDecoderResult.OK;
-        }
-
-        public bool Disabled
-        {
-            set
-            {
-                _disabled = value;
-            }
-        }
-    }
-}
diff --git a/qpid/dotnet/Qpid.Common/Framing/AMQDataBlockEncoder.cs b/qpid/dotnet/Qpid.Common/Framing/AMQDataBlockEncoder.cs
deleted file mode 100644
index e2645c630e..0000000000
--- a/qpid/dotnet/Qpid.Common/Framing/AMQDataBlockEncoder.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using System.Collections;
-using log4net;
-using Apache.Qpid.Buffer;
-using Apache.Qpid.Codec;
-using Apache.Qpid.Codec.Demux;
-
-namespace Apache.Qpid.Framing
-{
-    public class AMQDataBlockEncoder : IMessageEncoder
-    {
-        private static ILog _logger = LogManager.GetLogger(typeof(AMQDataBlockEncoder));
-
-        private Hashtable _messageTypes;
-        
-        public AMQDataBlockEncoder()
-        {
-            _messageTypes = new Hashtable();
-            _messageTypes[typeof (IEncodableAMQDataBlock)] = 1;
-        }
-
-
-        public Hashtable MessageTypes
-        {
-            get
-            {
-                return _messageTypes;
-            }
-        }
-
-        public void Encode(object message, IProtocolEncoderOutput output)
-        {
-            IDataBlock frame = (IDataBlock) message;
-            int frameSize = (int)frame.Size; // TODO: sort out signed/unsigned
-            ByteBuffer buffer = ByteBuffer.Allocate(frameSize);
-            frame.WritePayload(buffer);
-            
-            if (_logger.IsDebugEnabled)
-            {                
-                _logger.Debug("Encoded frame byte-buffer is '" + ByteBufferHexDumper.GetHexDump(buffer) + "'");
-            }
-            buffer.Flip();
-            output.Write(buffer);
-        }
-    }
-}
diff --git a/qpid/dotnet/Qpid.Common/Framing/AMQFrame.cs b/qpid/dotnet/Qpid.Common/Framing/AMQFrame.cs
deleted file mode 100644
index 912be72d30..0000000000
--- a/qpid/dotnet/Qpid.Common/Framing/AMQFrame.cs
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using Apache.Qpid.Buffer;
-
-namespace Apache.Qpid.Framing
-{
-    public class AMQFrame : IDataBlock
-    {
-        private ushort _channel;
-
-        private IBody _bodyFrame;
-
-        public AMQFrame()
-        {            
-        }
-        
-        public AMQFrame(ushort channel, IBody bodyFrame)
-        {
-            _channel = channel;
-            _bodyFrame = bodyFrame;
-        }
-        
-        public ushort Channel
-        {
-            get
-            {
-                return _channel;
-            }
-            set
-            {
-                _channel = value;
-            }
-        }
-
-        public IBody BodyFrame
-        {
-            get
-            {
-                return _bodyFrame;
-            }
-            set
-            {
-                _bodyFrame = value;
-            }
-        }
-
-        #region IDataBlock Members
-
-        public uint Size
-        {
-            get
-            {
-                return (uint) (1 + 2 + 4 + _bodyFrame.Size + 1);
-            }
-        }
-
-        public void WritePayload(ByteBuffer buffer)
-        {
-            buffer.Put(_bodyFrame.BodyType);            
-            // TODO: how does channel get populated
-            buffer.Put(_channel);
-            buffer.Put(_bodyFrame.Size);
-            _bodyFrame.WritePayload(buffer);
-            buffer.Put((byte) 0xCE);
-        }
-
-        #endregion
-
-        /// <summary>
-        /// Populates the frame instance data from the supplied buffer.
-        /// </summary>
-        /// <param name="buffer">The buffer.</param>
-        /// <param name="channel">The channel.</param>
-        /// <param name="bodySize">Size of the body in bytes</param>
-        /// <param name="bodyFactory">The body factory.</param>
-        /// <exception cref="AMQFrameDecodingException">Thrown if the buffer cannot be decoded</exception>
-        public void PopulateFromBuffer(ByteBuffer buffer, ushort channel, uint bodySize, IBodyFactory bodyFactory)            
-        {
-            _channel = channel;
-            _bodyFrame = bodyFactory.CreateBody(buffer);
-            _bodyFrame.PopulateFromBuffer(buffer, bodySize);
-        }
-
-        public override string ToString()
-        {
-            return "Frame channelId: " + _channel + ", bodyFrame: " + _bodyFrame.ToString();
-        }
-    }
-}
diff --git a/qpid/dotnet/Qpid.Common/Framing/AMQFrameDecodingException.cs b/qpid/dotnet/Qpid.Common/Framing/AMQFrameDecodingException.cs
deleted file mode 100644
index cda8c84ecf..0000000000
--- a/qpid/dotnet/Qpid.Common/Framing/AMQFrameDecodingException.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using System;
-using System.Runtime.Serialization;
-using log4net;
-
-namespace Apache.Qpid.Framing
-{
-    /// <summary>
-    /// Thrown when a frame cannot be decoded. This generally indicates a mismatch between the broker and the
-    /// client.
-    /// </summary>
-    [Serializable]
-    public class AMQFrameDecodingException : AMQException
-    {
-        public AMQFrameDecodingException(string message)
-            : base(message)
-        {
-        }
-
-        public AMQFrameDecodingException(string message, Exception innerException)
-            : base(message, innerException)
-        {
-        }
-
-        public AMQFrameDecodingException(ILog logger, string message)
-            : base(logger, message)
-        {
-        }
-
-        public AMQFrameDecodingException(ILog logger, string message, Exception innerException)
-            : base(logger, message, innerException)
-        {
-        }
-
-        protected AMQFrameDecodingException(SerializationInfo info, StreamingContext ctxt)
-           : base(info, ctxt)
-        {
-        }
-    }
-}
diff --git a/qpid/dotnet/Qpid.Common/Framing/AMQMethodBody.cs b/qpid/dotnet/Qpid.Common/Framing/AMQMethodBody.cs
deleted file mode 100644
index a3c4337147..0000000000
--- a/qpid/dotnet/Qpid.Common/Framing/AMQMethodBody.cs
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using System;
-using Apache.Qpid.Buffer;
-
-namespace Apache.Qpid.Framing
-{
-    public abstract class AMQMethodBody : IBody
-    {
-        public const byte TYPE = 1;
-        
-        protected abstract uint BodySize
-        {
-            get;
-        }
-
-        protected abstract ushort Clazz
-        {
-            get;
-        }
-
-        protected abstract ushort Method
-        {
-            get;
-        }
-
-        protected abstract void WriteMethodPayload(ByteBuffer buffer);
-
-        public byte BodyType
-        {
-            get
-            {
-                return TYPE;
-            }
-        }
-
-        public uint Size
-        {
-            get
-            {
-                return (uint) (2 + 2 + BodySize);
-            }
-        }
-
-        public void WritePayload(ByteBuffer buffer)
-        {
-            buffer.Put(Clazz);
-            buffer.Put(Method);
-            WriteMethodPayload(buffer);
-        }
-
-        /// <summary>
-        /// Populates the method body by decoding the specified buffer
-        /// </summary>
-        /// <param name="buffer">The buffer to decode.</param>
-        /// <exception cref="AMQFrameDecodingException">If the buffer cannot be decoded</exception>
-        protected abstract void PopulateMethodBodyFromBuffer(ByteBuffer buffer);
-
-        /// <summary>
-        /// Populates this instance from a buffer of data.
-        /// </summary>
-        /// <param name="buffer">The buffer.</param>
-        /// <param name="size">The size.</param>
-        /// <exception cref="AMQFrameDecodingException">If the buffer contains data that cannot be decoded</exception>
-        public void PopulateFromBuffer(ByteBuffer buffer, uint size)
-        {
-            PopulateMethodBodyFromBuffer(buffer);
-        }
-
-        public override string ToString()
-        {
-            return String.Format("{0}{{ Class: {1} Method: {2} }}", GetType().Name, Clazz, Method);
-        }
-    }
-}
diff --git a/qpid/dotnet/Qpid.Common/Framing/AMQMethodBodyFactory.cs b/qpid/dotnet/Qpid.Common/Framing/AMQMethodBodyFactory.cs
deleted file mode 100644
index c1fd3f887a..0000000000
--- a/qpid/dotnet/Qpid.Common/Framing/AMQMethodBodyFactory.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using Apache.Qpid.Buffer;
-
-namespace Apache.Qpid.Framing
-{
-    public class AMQMethodBodyFactory : IBodyFactory
-    {
-        private static readonly AMQMethodBodyFactory _instance = new AMQMethodBodyFactory();
-
-        public static AMQMethodBodyFactory GetInstance()
-        {
-            return _instance;
-        }
-
-        /// <summary>
-        /// Creates the body.
-        /// </summary>
-        /// <param name="inbuf">The ByteBuffer containing data from the network</param>
-        /// <returns></returns>
-        /// <exception>AMQFrameDecodingException</exception>
-        public IBody CreateBody(ByteBuffer inbuf)
-        {
-           return MethodBodyDecoderRegistry.Get(inbuf.GetUInt16(), inbuf.GetUInt16());
-        }
-    }
-}
diff --git a/qpid/dotnet/Qpid.Common/Framing/AMQProtocolHeaderException.cs b/qpid/dotnet/Qpid.Common/Framing/AMQProtocolHeaderException.cs
deleted file mode 100644
index 379e5d00ba..0000000000
--- a/qpid/dotnet/Qpid.Common/Framing/AMQProtocolHeaderException.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-using System;
-using System.Runtime.Serialization;
-
-namespace Apache.Qpid.Framing
-{
-    [Serializable]
-    public class AMQProtocolHeaderException : AMQException
-    {
-        public AMQProtocolHeaderException(string message) : base(message)
-        {
-        }
-
-        protected AMQProtocolHeaderException(SerializationInfo info, StreamingContext ctxt)
-           : base(info, ctxt)
-        {
-        }
-    }
-}
diff --git a/qpid/dotnet/Qpid.Common/Framing/AMQType.cs b/qpid/dotnet/Qpid.Common/Framing/AMQType.cs
deleted file mode 100644
index 618ab31d32..0000000000
--- a/qpid/dotnet/Qpid.Common/Framing/AMQType.cs
+++ /dev/null
@@ -1,700 +0,0 @@
-/*

- *

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- *

- */

-using System;

-using System.Text;

-using Apache.Qpid.Buffer;

-

-namespace Apache.Qpid.Framing

-{

-   /// <summary>

-   /// Base class for the Field Table Type system.

-   /// Ported over from the Java AMQType enumeration

-   /// </summary>

-   public abstract class AMQType

-   {

-      private byte _identifier;

-

-      /// <summary>

-      /// Type code identifier for this type

-      /// </summary>

-      public byte Identifier

-      {

-         get { return _identifier; }

-      }

-

-      protected AMQType(char identifier)

-      {

-         _identifier = (byte)identifier;

-      }

-

-      /// <summary>

-      /// Create a new <see cref="AMQTypedValue"/> instance

-      /// </summary>

-      /// <param name="value">Value to initialize with</param>

-      /// <returns>A new typed value instance</returns>

-      public AMQTypedValue AsTypedValue(object value)

-      {

-         return new AMQTypedValue(this, ToNativeValue(value));

-      }

-

-      /// <summary>

-      /// Write the specified value to the buffer using the encoding

-      /// specified for this type

-      /// </summary>

-      /// <param name="value">Value to write</param>

-      /// <param name="buffer">Buffer to write to</param>

-      public void WriteToBuffer(object value, ByteBuffer buffer)

-      {

-         buffer.Put(Identifier);

-         WriteValueImpl(value, buffer);

-      }

-

-      public override string ToString()

-      {

-         return ((Char) Identifier).ToString();

-      }

-

-      /// <summary>

-      /// Get the encoding size for the specified value in this type format

-      /// </summary>

-      /// <param name="value">Value to find encoded size for</param>

-      /// <returns>The encoded size</returns>

-      public abstract uint GetEncodingSize(object value);

-      /// <summary>

-      /// Convert the specified value to this type

-      /// </summary>

-      /// <param name="value">Value to convert</param>

-      /// <returns>The converted value</returns>

-      public abstract object ToNativeValue(object value);

-

-      /// <summary>

-      /// Read a value from the specified buffer using the encoding for

-      /// this type

-      /// </summary>

-      /// <param name="buffer">Buffer to read from</param>

-      /// <returns>The value read</returns>

-      public abstract object ReadValueFromBuffer(ByteBuffer buffer);

-

-      protected abstract void WriteValueImpl(Object value, ByteBuffer buffer);

-

-

-      #region Known Types

-      //

-      // Known Types

-      //

-

-      // long string is not defined in the proposed specification,

-      // and the 'S' discriminator is left for unsigned short (16-bit) values

-      public static readonly AMQType LONG_STRING = new AMQLongStringType();

-      public static readonly AMQType UINT32 = new AMQUInt32Type();

-      public static readonly AMQType DECIMAL = new AMQDecimalType();

-      public static readonly AMQType TIMESTAMP = new AMQTimeStampType();

-      public static readonly AMQType FIELD_TABLE = new AMQFieldTableType();

-      public static readonly AMQType VOID = new AMQVoidType();

-      public static readonly AMQType BINARY = new AMQBinaryType();

-      public static readonly AMQType ASCII_STRING = new AMQAsciiStringType();

-      public static readonly AMQType WIDE_STRING = new AMQWideStringType();

-      public static readonly AMQType BOOLEAN = new AMQBooleanType();

-      public static readonly AMQType ASCII_CHARACTER = new AMQAsciiCharType();

-      public static readonly AMQType BYTE = new AMQByteType();

-      public static readonly AMQType SBYTE = new AMQSByteType();

-      public static readonly AMQType INT16 = new AMQInt16Type();

-      public static readonly AMQType UINT16 = new AMQUInt16Type();

-      public static readonly AMQType INT32 = new AMQInt32Type();

-      public static readonly AMQType INT64 = new AMQInt64Type();

-      public static readonly AMQType UINT64 = new AMQUInt64Type();

-      public static readonly AMQType FLOAT = new AMQFloatType();

-      public static readonly AMQType DOUBLE = new AMQDoubleType();

-

-      #endregion // Known Types

-

-      #region Type Implementation

-      //

-      // Type Implementation

-      //

-

-      sealed class AMQLongStringType : AMQType

-      {

-         public AMQLongStringType() : base('S')

-         {

-         }

-

-         public override uint GetEncodingSize(object value)

-         {

-            return EncodingUtils.EncodedLongStringLength((string) value);

-         }

-

-         public override object ToNativeValue(object value)

-         {

-            if ( value == null )

-               throw new ArgumentNullException("value");

-            return value.ToString();

-         }

-

-         public override object ReadValueFromBuffer(ByteBuffer buffer)

-         {

-            return EncodingUtils.ReadLongString(buffer);

-         }

-

-         protected override void WriteValueImpl(object value, ByteBuffer buffer)

-         {

-            EncodingUtils.WriteLongStringBytes(buffer, (string) value);

-         }

-

-      }

-

-      sealed class AMQUInt32Type : AMQType

-      {

-         public AMQUInt32Type() : base('i')

-         {

-         }

-

-         public override uint GetEncodingSize(object value)

-         {

-            return EncodingUtils.UnsignedIntegerLength();

-         }

-

-         public override object ToNativeValue(object value)

-         {

-            return Convert.ToUInt32(value);

-         }

-

-         public override object ReadValueFromBuffer(ByteBuffer buffer)

-         {

-            return EncodingUtils.ReadUnsignedInteger(buffer);

-         }

-

-         protected override void WriteValueImpl(object value, ByteBuffer buffer)

-         {

-            EncodingUtils.WriteUnsignedInteger(buffer, (uint) value);

-         }

-

-      }

-

-      sealed class AMQDecimalType : AMQType

-      {

-         public AMQDecimalType() : base('D')

-         {

-         }

-

-         public override uint GetEncodingSize(object value)

-         {

-            throw new NotImplementedException();

-         }

-

-         public override object ToNativeValue(object value)

-         {

-            throw new NotImplementedException();

-         }

-

-         public override object ReadValueFromBuffer(ByteBuffer buffer)

-         {

-            throw new NotImplementedException();

-         }

-

-         protected override void WriteValueImpl(object value, ByteBuffer buffer)

-         {

-            throw new NotImplementedException();

-         }

-      }

-

-      sealed class AMQTimeStampType : AMQType

-      {

-         public AMQTimeStampType() : base('T')

-         {

-         }

-

-         public override uint GetEncodingSize(object value)

-         {

-            throw new NotImplementedException();

-         }

-

-         public override object ToNativeValue(object value)

-         {

-            throw new NotImplementedException();

-         }

-

-         public override object ReadValueFromBuffer(ByteBuffer buffer)

-         {

-            throw new NotImplementedException();

-         }

-

-         protected override void WriteValueImpl(object value, ByteBuffer buffer)

-         {

-            throw new NotImplementedException();

-         }

-      }

-

-      sealed class AMQFieldTableType : AMQType

-      {

-         public AMQFieldTableType() : base('F')

-         {

-         }

-

-         public override uint GetEncodingSize(object value)

-         {

-            throw new NotImplementedException();

-         }

-

-         public override object ToNativeValue(object value)

-         {

-            throw new NotImplementedException();

-         }

-

-         public override object ReadValueFromBuffer(ByteBuffer buffer)

-         {

-            throw new NotImplementedException();

-         }

-

-         protected override void WriteValueImpl(object value, ByteBuffer buffer)

-         {

-            throw new NotImplementedException();

-         }

-      }

-

-      sealed class AMQVoidType : AMQType

-      {

-         public AMQVoidType() : base('V')

-         {

-         }

-

-         public override uint GetEncodingSize(object value)

-         {

-            return 0;

-         }

-

-         public override object ToNativeValue(object value)

-         {

-            if ( value != null )

-               throw new FormatException(string.Format("Cannot convert {0} to VOID type", value));

-            return null;

-         }

-

-         public override object ReadValueFromBuffer(ByteBuffer buffer)

-         {

-            return null;

-         }

-

-         protected override void WriteValueImpl(object value, ByteBuffer buffer)

-         {

-         }

-      }

-

-      // Extended Types

-

-      sealed class AMQBinaryType : AMQType

-      {

-         public AMQBinaryType() : base('x')

-         {

-         }

-

-         public override uint GetEncodingSize(object value)

-         {

-            return EncodingUtils.EncodedLongstrLength((byte[]) value);

-         }

-

-         public override object ToNativeValue(object value)

-         {

-            if ( value is byte[] || value == null )

-            {

-               return value;

-            }

-            throw new ArgumentException("Value cannot be converted to byte[]");

-         }

-

-         public override object ReadValueFromBuffer(ByteBuffer buffer)

-         {

-            return EncodingUtils.ReadLongstr(buffer);

-         }

-

-         protected override void WriteValueImpl(object value, ByteBuffer buffer)

-         {

-            EncodingUtils.WriteLongstr(buffer, (byte[])value);

-         }

-      }

-      

-      sealed class AMQAsciiStringType : AMQType

-      {

-         public AMQAsciiStringType() : base('c')

-         {

-         }

-

-         public override uint GetEncodingSize(object value)

-         {

-            return EncodingUtils.EncodedAsciiStringLength((string)value);

-         }

-

-         public override object ToNativeValue(object value)

-         {

-            if ( value == null )

-               throw new ArgumentNullException("value");

-            return value.ToString();

-         }

-

-         public override object ReadValueFromBuffer(ByteBuffer buffer)

-         {

-            return EncodingUtils.ReadAsciiString(buffer);

-         }

-

-         protected override void WriteValueImpl(object value, ByteBuffer buffer)

-         {

-            EncodingUtils.WriteAsciiString(buffer, (string)value);

-         }

-      }

-

-      sealed class AMQWideStringType : AMQType

-      {

-         // todo: Change encoding to UTF16 (java code still uses default 

-         // ascii encoding for wide strings

-         private static readonly Encoding ENCODING = Encoding.ASCII;

-

-         public AMQWideStringType()

-            : base('C')

-         {

-         }

-

-         public override uint GetEncodingSize(object value)

-         {

-            return EncodingUtils.EncodedLongStringLength((string)value, ENCODING);

-         }

-

-         public override object ToNativeValue(object value)

-         {

-            if ( value == null )

-               throw new ArgumentNullException("value");

-            return value.ToString();

-         }

-

-         public override object ReadValueFromBuffer(ByteBuffer buffer)

-         {

-            return EncodingUtils.ReadLongString(buffer, ENCODING);

-         }

-

-         protected override void WriteValueImpl(object value, ByteBuffer buffer)

-         {

-            EncodingUtils.WriteLongStringBytes(buffer, (string)value, ENCODING);

-         }

-      }

-

-      sealed class AMQBooleanType : AMQType

-      {

-         public AMQBooleanType() : base('t')

-         {

-         }

-

-         public override uint GetEncodingSize(object value)

-         {

-            return EncodingUtils.EncodedBooleanLength();

-         }

-

-         public override object ToNativeValue(object value)

-         {

-            return Convert.ToBoolean(value);

-         }

-

-         public override object ReadValueFromBuffer(ByteBuffer buffer)

-         {

-            return EncodingUtils.ReadBoolean(buffer);

-         }

-

-         protected override void WriteValueImpl(object value, ByteBuffer buffer)

-         {

-            EncodingUtils.WriteBoolean(buffer, (bool)value);

-         }

-      }

-

-      sealed class AMQAsciiCharType : AMQType

-      {

-         public AMQAsciiCharType() : base('k')

-         {

-         }

-

-         public override uint GetEncodingSize(object value)

-         {

-            return EncodingUtils.EncodedCharLength();

-         }

-

-         public override object ToNativeValue(object value)

-         {

-            return Convert.ToChar(value);

-         }

-

-         public override object ReadValueFromBuffer(ByteBuffer buffer)

-         {

-            return EncodingUtils.ReadChar(buffer);

-         }

-

-         protected override void WriteValueImpl(object value, ByteBuffer buffer)

-         {

-            EncodingUtils.WriteChar(buffer, (char)value);

-         }

-      }

-

-      sealed class AMQByteType : AMQType

-      {

-         public AMQByteType() : base('B')

-         {

-         }

-

-         public override uint GetEncodingSize(object value)

-         {

-            return EncodingUtils.EncodedByteLength();

-         }

-

-         public override object ToNativeValue(object value)

-         {

-            return  Convert.ToByte(value);

-         }

-

-         public override object ReadValueFromBuffer(ByteBuffer buffer)

-         {

-            return EncodingUtils.ReadByte(buffer);

-         }

-

-         protected override void WriteValueImpl(object value, ByteBuffer buffer)

-         {

-            EncodingUtils.WriteByte(buffer, (byte)value);

-         }

-      }

-

-      sealed class AMQSByteType : AMQType

-      {

-         public AMQSByteType()

-            : base('b')

-         {

-         }

-

-         public override uint GetEncodingSize(object value)

-         {

-            return EncodingUtils.EncodedSByteLength();

-         }

-

-         public override object ToNativeValue(object value)

-         {

-            return Convert.ToSByte(value);

-         }

-

-         public override object ReadValueFromBuffer(ByteBuffer buffer)

-         {

-            return EncodingUtils.ReadSByte(buffer);

-         }

-

-         protected override void WriteValueImpl(object value, ByteBuffer buffer)

-         {

-            EncodingUtils.WriteSByte(buffer, (sbyte)value);

-         }

-      }

-

-      sealed class AMQInt16Type : AMQType

-      {

-         public AMQInt16Type() : base('s')

-         {

-         }

-

-         public override uint GetEncodingSize(object value)

-         {

-            return EncodingUtils.EncodedShortLength();

-         }

-

-         public override object ToNativeValue(object value)

-         {

-            return Convert.ToInt16(value);

-         }

-

-         public override object ReadValueFromBuffer(ByteBuffer buffer)

-         {

-            return EncodingUtils.ReadShort(buffer);

-         }

-

-         protected override void WriteValueImpl(object value, ByteBuffer buffer)

-         {

-            EncodingUtils.WriteShort(buffer, (short)value);

-         }

-      }

-

-      sealed class AMQUInt16Type : AMQType

-      {

-         public AMQUInt16Type()

-            : base('S')

-         {

-         }

-

-         public override uint GetEncodingSize(object value)

-         {

-            return EncodingUtils.EncodedUnsignedShortLength();

-         }

-

-         public override object ToNativeValue(object value)

-         {

-            return Convert.ToUInt16(value);

-         }

-

-         public override object ReadValueFromBuffer(ByteBuffer buffer)

-         {

-            return EncodingUtils.ReadUnsignedShort(buffer);

-         }

-

-         protected override void WriteValueImpl(object value, ByteBuffer buffer)

-         {

-            EncodingUtils.WriteUnsignedShort(buffer, (ushort)value);

-         }

-      }

-

-      sealed class AMQInt32Type : AMQType

-      {

-         public AMQInt32Type() : base('I')

-         {

-         }

-

-         public override uint GetEncodingSize(object value)

-         {

-            return EncodingUtils.EncodedIntegerLength();

-         }

-

-         public override object ToNativeValue(object value)

-         {

-            return Convert.ToInt32(value);

-         }

-

-         public override object ReadValueFromBuffer(ByteBuffer buffer)

-         {

-            return EncodingUtils.ReadInteger(buffer);

-         }

-

-         protected override void WriteValueImpl(object value, ByteBuffer buffer)

-         {

-            EncodingUtils.WriteInteger(buffer, (int)value);

-         }

-      }

-

-      sealed class AMQInt64Type : AMQType

-      {

-         public AMQInt64Type() : base('l')

-         {

-         }

-

-         public override uint GetEncodingSize(object value)

-         {

-            return EncodingUtils.EncodedLongLength();

-         }

-

-         public override object ToNativeValue(object value)

-         {

-            return Convert.ToInt64(value);

-         }

-

-         public override object ReadValueFromBuffer(ByteBuffer buffer)

-         {

-            return EncodingUtils.ReadLong(buffer);

-         }

-

-         protected override void WriteValueImpl(object value, ByteBuffer buffer)

-         {

-            EncodingUtils.WriteLong(buffer, (long)value);

-         }

-      }

-

-      sealed class AMQUInt64Type : AMQType

-      {

-         public AMQUInt64Type()

-            : base('L')

-         {

-         }

-

-         public override uint GetEncodingSize(object value)

-         {

-            return EncodingUtils.EncodedUnsignedLongLength();

-         }

-

-         public override object ToNativeValue(object value)

-         {

-            return Convert.ToUInt64(value);

-         }

-

-         public override object ReadValueFromBuffer(ByteBuffer buffer)

-         {

-            return EncodingUtils.ReadUnsignedLong(buffer);

-         }

-

-         protected override void WriteValueImpl(object value, ByteBuffer buffer)

-         {

-            EncodingUtils.WriteUnsignedLong(buffer, (ulong)value);

-         }

-      }

-

-      sealed class AMQFloatType : AMQType

-      {

-         public AMQFloatType() : base('f')

-         {

-         }

-

-         public override uint GetEncodingSize(object value)

-         {

-            return EncodingUtils.EncodedFloatLength();

-         }

-

-         public override object ToNativeValue(object value)

-         {

-            return Convert.ToSingle(value);

-         }

-

-         public override object ReadValueFromBuffer(ByteBuffer buffer)

-         {

-            return EncodingUtils.ReadFloat(buffer);

-         }

-

-         protected override void WriteValueImpl(object value, ByteBuffer buffer)

-         {

-            EncodingUtils.WriteFloat(buffer, (float)value);

-         }

-      }

-

-      sealed class AMQDoubleType : AMQType

-      {

-         public AMQDoubleType() : base('d')

-         {

-         }

-

-         public override uint GetEncodingSize(object value)

-         {

-            return EncodingUtils.EncodedDoubleLength();

-         }

-

-         public override object ToNativeValue(object value)

-         {

-            return Convert.ToDouble(value);

-         }

-

-         public override object ReadValueFromBuffer(ByteBuffer buffer)

-         {

-            return EncodingUtils.ReadDouble(buffer);

-         }

-

-         protected override void WriteValueImpl(object value, ByteBuffer buffer)

-         {

-            EncodingUtils.WriteDouble(buffer, (double)value);

-         }

-      }      

-

-      #endregion // Type Implementation

-

-   } // class AMQType

-}

diff --git a/qpid/dotnet/Qpid.Common/Framing/AMQTypeMap.cs b/qpid/dotnet/Qpid.Common/Framing/AMQTypeMap.cs
deleted file mode 100644
index ed38c203a9..0000000000
--- a/qpid/dotnet/Qpid.Common/Framing/AMQTypeMap.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-/*

- *

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- *

- */

-using System;

-using System.Collections;

-

-namespace Apache.Qpid.Framing

-{

-   public sealed class AMQTypeMap

-   {

-      private static Hashtable _reverseTypeMap;

-

-      private AMQTypeMap()

-      {

-      }

-

-      static AMQTypeMap()

-      {

-         _reverseTypeMap = Hashtable.Synchronized(new Hashtable());

-

-         Add(AMQType.LONG_STRING);

-         Add(AMQType.BOOLEAN);

-         Add(AMQType.BYTE);

-         Add(AMQType.SBYTE);

-         Add(AMQType.INT16);

-         // not supported for now as type code conflicts

-         // with LONG_STRING

-         //Add(AMQType.UINT16);

-         Add(AMQType.INT32);

-         Add(AMQType.UINT32);

-         Add(AMQType.INT64);

-         Add(AMQType.UINT64);

-         Add(AMQType.FLOAT);

-         Add(AMQType.DOUBLE);

-         Add(AMQType.DECIMAL);

-         Add(AMQType.BINARY);

-         Add(AMQType.ASCII_STRING);

-         Add(AMQType.WIDE_STRING);

-         Add(AMQType.ASCII_CHARACTER);

-         Add(AMQType.TIMESTAMP);

-         Add(AMQType.FIELD_TABLE);

-         Add(AMQType.VOID);

-      }

-

-      public static AMQType GetType(byte identifier)

-      {

-         AMQType type = (AMQType)_reverseTypeMap[identifier];

-         if ( type == null )

-            throw new ArgumentOutOfRangeException(string.Format("No such type code: {0:x}", identifier));

-         return type;

-      }

-

-      private static void Add(AMQType type)

-      {

-         _reverseTypeMap.Add(type.Identifier, type);

-      }

-   }

-}

diff --git a/qpid/dotnet/Qpid.Common/Framing/AMQTypedValue.cs b/qpid/dotnet/Qpid.Common/Framing/AMQTypedValue.cs
deleted file mode 100644
index 8d21a60831..0000000000
--- a/qpid/dotnet/Qpid.Common/Framing/AMQTypedValue.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-/*

- *

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- *

- */

-using System;

-using Apache.Qpid.Buffer;

-

-namespace Apache.Qpid.Framing

-{

-   public class AMQTypedValue

-   {

-      private readonly AMQType _type;

-      private readonly object _value;

-

-      public AMQType Type

-      {

-         get { return _type; }

-      }

-

-      public object Value

-      {

-         get { return _value; }

-      }

-

-      public uint EncodingLength

-      {

-         get { return _type.GetEncodingSize(_value); }

-      }

-

-      public AMQTypedValue(AMQType type, object value)

-      {

-         if ( type == null )

-            throw new ArgumentNullException("type");

-         _type = type;

-         _value = type.ToNativeValue(value);

-      }

-

-      public AMQTypedValue(AMQType type, ByteBuffer buffer)

-      {

-         _type = type;

-         _value = type.ReadValueFromBuffer(buffer);

-      }

-

-      public void WriteToBuffer(ByteBuffer buffer)

-      {

-         _type.WriteToBuffer(_value, buffer);

-      }

-      

-      public static AMQTypedValue ReadFromBuffer(ByteBuffer buffer)

-      {

-         AMQType type = AMQTypeMap.GetType(buffer.GetByte());

-         return new AMQTypedValue(type, buffer);

-      }

-

-      public override string ToString()

-      {

-         return string.Format("{0}: {1}", Type, Value);

-      }

-   }

-}

diff --git a/qpid/dotnet/Qpid.Common/Framing/BasicContentHeaderProperties.cs b/qpid/dotnet/Qpid.Common/Framing/BasicContentHeaderProperties.cs
deleted file mode 100644
index 47db7b0887..0000000000
--- a/qpid/dotnet/Qpid.Common/Framing/BasicContentHeaderProperties.cs
+++ /dev/null
@@ -1,290 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using System;
-using log4net;
-using Apache.Qpid.Buffer;
-using Apache.Qpid.Messaging;
-
-namespace Apache.Qpid.Framing
-{
-   public class BasicContentHeaderProperties : IContentHeaderProperties
-   {
-      private static readonly ILog _log = LogManager.GetLogger(typeof(BasicContentHeaderProperties));
-
-      private string _contentType;
-      private string _encoding;
-      private FieldTable _headers;
-      private byte _deliveryMode;
-      private byte _priority;
-      private string _correlationId;
-      private long _expiration;
-      private string _replyTo;
-      private string _messageId;
-      private ulong _timestamp;
-      private string _type;
-      private string _userId;
-      private string _appId;
-      private string _clusterId;
-
-
-      #region Properties
-      //
-      // Properties
-      //
-
-      /// <summary>
-      /// The MIME Content Type
-      /// </summary>
-      public string ContentType
-      {
-         get { return _contentType; }
-         set { _contentType = value; }
-      }
-
-      /// <summary>
-      /// The MIME Content Encoding
-      /// </summary>
-      public string Encoding
-      {
-         get { return _encoding; }
-         set { _encoding = value; }
-      }
-
-      /// <summary>
-      /// Message headers
-      /// </summary>
-      public FieldTable Headers
-      {
-         get { return _headers; }
-         set { _headers = value; }
-      }
-
-      /// <summary>
-      /// Non-persistent (1) or persistent (2)
-      /// </summary>
-      public byte DeliveryMode
-      {
-         get { return _deliveryMode; }
-         set { _deliveryMode = value; }
-      }
-
-      /// <summary>
-      /// The message priority, 0 to 9
-      /// </summary>
-      public byte Priority
-      {
-         get { return _priority; }
-         set { _priority = value; }
-      }
-
-      /// <summary>
-      /// The application correlation identifier
-      /// </summary>
-      public string CorrelationId
-      {
-         get { return _correlationId; }
-         set { _correlationId = value; }
-      }
-
-      /// <summary>
-      /// Message expiration specification
-      /// </summary>
-      // TODO: Should be string according to spec
-      public long Expiration
-      {
-         get { return _expiration; }
-         set { _expiration = value; }
-      }
-
-      /// <summary>
-      /// The destination to reply to
-      /// </summary>
-      public string ReplyTo
-      {
-         get { return _replyTo; }
-         set { _replyTo = value; }
-      }
-
-      /// <summary>
-      /// The application message identifier
-      /// </summary>
-      public string MessageId
-      {
-         get { return _messageId; }
-         set { _messageId = value; }
-      }
-
-      /// <summary>
-      /// The message timestamp
-      /// </summary>
-      public ulong Timestamp
-      {
-         get { return _timestamp; }
-         set { _timestamp = value; }
-      }
-
-      /// <summary>
-      /// The message type name
-      /// </summary>
-      public string Type
-      {
-         get { return _type; }
-         set { _type = value; }
-      }
-
-      /// <summary>
-      /// The creating user id
-      /// </summary>
-      public string UserId
-      {
-         get { return _userId; }
-         set { _userId = value; }
-      }
-
-      /// <summary>
-      /// The creating application id
-      /// </summary>
-      public string AppId
-      {
-         get { return _appId; }
-         set { _appId = value; }
-      }
-
-      /// <summary>
-      /// Intra-cluster routing identifier
-      /// </summary>
-      public string ClusterId
-      {
-         get { return _clusterId; }
-         set { _clusterId = value; }
-      }
-
-      #endregion // Properties
-
-
-      public BasicContentHeaderProperties()
-      {
-      }
-
-      public uint PropertyListSize
-      {
-         get
-         {
-            return (uint)(EncodingUtils.EncodedShortStringLength(ContentType) +
-                   EncodingUtils.EncodedShortStringLength(Encoding) +
-                   EncodingUtils.EncodedFieldTableLength(Headers) +
-                   1 + 1 +
-                   EncodingUtils.EncodedShortStringLength(CorrelationId) +
-                   EncodingUtils.EncodedShortStringLength(ReplyTo) +
-                   EncodingUtils.EncodedShortStringLength(String.Format("{0:D}", Expiration)) +
-                   EncodingUtils.EncodedShortStringLength(MessageId) +
-                   8 +
-                   EncodingUtils.EncodedShortStringLength(Type) +
-                   EncodingUtils.EncodedShortStringLength(UserId) +
-                   EncodingUtils.EncodedShortStringLength(AppId) +
-                   EncodingUtils.EncodedShortStringLength(ClusterId));
-
-         }
-      }
-
-      public ushort PropertyFlags
-      {
-         get
-         {
-            int value = 0;
-
-            // for now we just blast in all properties
-            for ( int i = 0; i < 14; i++ )
-            {
-               value += (1 << (15 - i));
-            }
-            return (ushort)value;
-         }
-      }
-
-      public void WritePropertyListPayload(ByteBuffer buffer)
-      {
-         EncodingUtils.WriteShortStringBytes(buffer, ContentType);
-         EncodingUtils.WriteShortStringBytes(buffer, Encoding);
-         EncodingUtils.WriteFieldTableBytes(buffer, Headers);
-         buffer.Put(DeliveryMode);
-         buffer.Put(Priority);
-         EncodingUtils.WriteShortStringBytes(buffer, CorrelationId);
-         EncodingUtils.WriteShortStringBytes(buffer, ReplyTo);
-         EncodingUtils.WriteShortStringBytes(buffer, String.Format("{0:D}", Expiration));
-         EncodingUtils.WriteShortStringBytes(buffer, MessageId);
-         buffer.Put(Timestamp);
-         EncodingUtils.WriteShortStringBytes(buffer, Type);
-         EncodingUtils.WriteShortStringBytes(buffer, UserId);
-         EncodingUtils.WriteShortStringBytes(buffer, AppId);
-         EncodingUtils.WriteShortStringBytes(buffer, ClusterId);
-      }
-
-      public void PopulatePropertiesFromBuffer(ByteBuffer buffer, ushort propertyFlags)
-      {
-         _log.Debug("Property flags: " + propertyFlags);
-         if ( (propertyFlags & (1 << 15)) > 0 )
-            ContentType = EncodingUtils.ReadShortString(buffer);
-         if ( (propertyFlags & (1 << 14)) > 0 )
-            Encoding = EncodingUtils.ReadShortString(buffer);
-         if ( (propertyFlags & (1 << 13)) > 0 )
-            Headers = EncodingUtils.ReadFieldTable(buffer);
-         if ( (propertyFlags & (1 << 12)) > 0 )
-            DeliveryMode = buffer.GetByte();
-         if ( (propertyFlags & (1 << 11)) > 0 )
-            Priority = buffer.GetByte();
-         if ( (propertyFlags & (1 << 10)) > 0 )
-            CorrelationId = EncodingUtils.ReadShortString(buffer);
-         if ( (propertyFlags & (1 << 9)) > 0 )
-            ReplyTo = EncodingUtils.ReadShortString(buffer);
-         if ( (propertyFlags & (1 << 8)) > 0 )
-            Expiration = EncodingUtils.ReadLongAsShortString(buffer);
-         if ( (propertyFlags & (1 << 7)) > 0 )
-            MessageId = EncodingUtils.ReadShortString(buffer);
-         if ( (propertyFlags & (1 << 6)) > 0 )
-            Timestamp = buffer.GetUInt64();
-         if ( (propertyFlags & (1 << 5)) > 0 )
-            Type = EncodingUtils.ReadShortString(buffer);
-         if ( (propertyFlags & (1 << 4)) > 0 )
-            UserId = EncodingUtils.ReadShortString(buffer);
-         if ( (propertyFlags & (1 << 3)) > 0 )
-            AppId = EncodingUtils.ReadShortString(buffer);
-         if ( (propertyFlags & (1 << 2)) > 0 )
-            ClusterId = EncodingUtils.ReadShortString(buffer);
-      }
-
-      public void SetDeliveryMode(DeliveryMode deliveryMode)
-      {
-         if ( deliveryMode == Messaging.DeliveryMode.NonPersistent )
-         {
-            DeliveryMode = 1;
-         } else
-         {
-            DeliveryMode = 2;
-         }
-      }
-
-      public override string ToString()
-      {
-         return "Properties: " + ContentType + " " + Encoding + " " + Timestamp + " " + Type;
-      }
-   }
-}
diff --git a/qpid/dotnet/Qpid.Common/Framing/CompositeAMQDataBlock.cs b/qpid/dotnet/Qpid.Common/Framing/CompositeAMQDataBlock.cs
deleted file mode 100644
index d2b7f606b2..0000000000
--- a/qpid/dotnet/Qpid.Common/Framing/CompositeAMQDataBlock.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using System.Text;
-using Apache.Qpid.Buffer;
-
-namespace Apache.Qpid.Framing
-{
-    public class CompositeAMQDataBlock : IDataBlock, IEncodableAMQDataBlock
-    {
-        private IDataBlock[] _blocks;
-
-        public CompositeAMQDataBlock(IDataBlock[] blocks)
-        {
-            _blocks = blocks;
-        }
-
-        public IDataBlock[] Blocks
-        {
-            get
-            {
-                return _blocks;
-            }
-        }
-
-        public uint Size
-        {
-            get
-            {
-                uint frameSize = 0;
-                foreach (IDataBlock block in _blocks)
-                {
-                    frameSize += block.Size;
-                }
-                return frameSize;
-            }
-        }
-
-        public void WritePayload(ByteBuffer buffer)
-        {
-            foreach (IDataBlock block in _blocks)
-            {
-                block.WritePayload(buffer);
-            }
-        }
-
-        public override string ToString()
-        {
-            if (_blocks == null)
-            {
-                return "No blocks contained in composite frame";
-            }
-            else
-            {
-                StringBuilder buf = new StringBuilder(GetType().Name);
-                buf.Append("{");
-                //buf.Append("encodedBlock=").Append(_encodedBlock);
-                for (int i = 0; i < _blocks.Length; i++)
-                {
-                    buf.Append(" ").Append(i).Append("=[").Append(_blocks[i].ToString()).Append("]");
-                }
-                buf.Append("}");
-                return buf.ToString();
-            }
-        }
-
-    }
-}
diff --git a/qpid/dotnet/Qpid.Common/Framing/ContentBody.cs b/qpid/dotnet/Qpid.Common/Framing/ContentBody.cs
deleted file mode 100644
index 7a2142985d..0000000000
--- a/qpid/dotnet/Qpid.Common/Framing/ContentBody.cs
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using Apache.Qpid.Buffer;
-
-namespace Apache.Qpid.Framing
-{
-    public class ContentBody : IBody
-    {
-        public const byte TYPE = 3;
-
-        private ByteBuffer _payload;
-       
-        public ByteBuffer Payload
-        {
-           get { return _payload; }
-        }
-
-       public ContentBody()
-       {
-       }
-       public ContentBody(ByteBuffer payload)
-       {
-          PopulateFromBuffer(payload, (uint)payload.Remaining);
-       }
-       public ContentBody(ByteBuffer payload, uint length)
-       {
-          PopulateFromBuffer(payload, length);
-       }
-
-        #region IBody Members
-
-        public byte BodyType
-        {
-            get
-            {
-                return TYPE;
-            }
-        }
-
-        public uint Size
-        {
-            get
-            {
-                return (ushort)(Payload == null ? 0 : Payload.Remaining);
-            }
-        }
-
-        public void WritePayload(ByteBuffer buffer)
-        {
-            if (Payload != null)
-            {
-                buffer.Put(Payload);
-                Payload.Rewind();
-            }
-        }
-
-        public void PopulateFromBuffer(ByteBuffer buffer, uint size)
-        {
-            if (size > 0)
-            {
-                _payload = buffer.Slice();
-                _payload.Limit = (int)size;
-                buffer.Skip((int)size);
-            }
-        }
-
-        #endregion
-
-        public static AMQFrame CreateAMQFrame(ushort channelId, ContentBody body)
-        {
-            AMQFrame frame = new AMQFrame();
-            frame.Channel = channelId;
-            frame.BodyFrame = body;
-            return frame;
-        }
-
-        public override string ToString()
-        {
-            return string.Format("ContentBody [ Size: {0} ]", Size);
-        }
-    }
-}
diff --git a/qpid/dotnet/Qpid.Common/Framing/ContentBodyFactory.cs b/qpid/dotnet/Qpid.Common/Framing/ContentBodyFactory.cs
deleted file mode 100644
index 400b2aec08..0000000000
--- a/qpid/dotnet/Qpid.Common/Framing/ContentBodyFactory.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using log4net;
-using Apache.Qpid.Buffer;
-
-namespace Apache.Qpid.Framing
-{
-    public class ContentBodyFactory : IBodyFactory
-    {
-        private static readonly ILog _log = LogManager.GetLogger(typeof(ContentBodyFactory));
-
-        private static readonly ContentBodyFactory _instance = new ContentBodyFactory();
-
-        public static ContentBodyFactory GetInstance()
-        {
-            return _instance;
-        }
-
-        private ContentBodyFactory()
-        {
-            _log.Debug("Creating content body factory");
-        }
-
-        /// <summary>
-        /// Creates the body.
-        /// </summary>
-        /// <param name="inbuf">The ByteBuffer containing data from the network</param>
-        /// <returns></returns>
-        /// <exception>AMQFrameDecodingException</exception>
-        public IBody CreateBody(ByteBuffer inbuf)
-        {
-            return new ContentBody();
-        }
-    }
-}
diff --git a/qpid/dotnet/Qpid.Common/Framing/ContentHeaderBody.cs b/qpid/dotnet/Qpid.Common/Framing/ContentHeaderBody.cs
deleted file mode 100644
index 82889c23c8..0000000000
--- a/qpid/dotnet/Qpid.Common/Framing/ContentHeaderBody.cs
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using System;
-using Apache.Qpid.Buffer;
-
-namespace Apache.Qpid.Framing
-{
-    public class ContentHeaderBody : IBody
-    {
-        public static readonly byte TYPE = 2;
-
-        public ushort ClassId;
-
-        public ushort Weight;
-        
-        public ulong BodySize;
-
-        /** must never be null */
-        public IContentHeaderProperties Properties;
-
-        public ContentHeaderBody()
-        {
-        }
-
-        public ContentHeaderBody(IContentHeaderProperties props, ushort classId)
-        {
-            Properties = props;
-            ClassId = classId;
-        }
-
-        public ContentHeaderBody(ushort classId, ushort weight, IContentHeaderProperties props, uint bodySize)
-            : this(props, classId)
-        {            
-            Weight = weight;
-            BodySize = bodySize;
-        }
-
-        #region IBody Members
-
-        public byte BodyType
-        {
-            get
-            {
-                return TYPE;
-            }
-        }
-
-        public uint Size
-        {
-            get
-            {
-                return (2 + 2 + 8 + 2 + Properties.PropertyListSize);
-            }
-        }
-
-        public void WritePayload(ByteBuffer buffer)
-        {
-            buffer.Put(ClassId);
-            buffer.Put(Weight);
-            buffer.Put(BodySize);
-            buffer.Put(Properties.PropertyFlags);
-            Properties.WritePropertyListPayload(buffer);
-        }
-
-        public void PopulateFromBuffer(ByteBuffer buffer, uint size)
-        {     
-            ClassId = buffer.GetUInt16();
-            Weight = buffer.GetUInt16();
-            BodySize = buffer.GetUInt64();
-            ushort propertyFlags = buffer.GetUInt16();
-            ContentHeaderPropertiesFactory factory = ContentHeaderPropertiesFactory.GetInstance();
-            Properties = factory.CreateContentHeaderProperties(ClassId, propertyFlags, buffer);    
-        }
-
-        #endregion
-
-        public static AMQFrame CreateAMQFrame(ushort channelId, ushort classId, ushort weight, BasicContentHeaderProperties properties,
-                                              uint bodySize)
-        {
-            AMQFrame frame = new AMQFrame();
-            frame.Channel = channelId;
-            frame.BodyFrame = new ContentHeaderBody(classId, weight, properties, bodySize);
-            return frame;
-        }
-
-        public static AMQFrame CreateAMQFrame(ushort channelId, ContentHeaderBody body)
-        {
-            AMQFrame frame = new AMQFrame();
-            frame.Channel = channelId;
-            frame.BodyFrame = body;
-            return frame;
-        }
-
-        public override string ToString()
-        {
-            return String.Format("ContentHeaderBody: ClassId {0}, Weight {1}, BodySize {2}, Properties {3}", ClassId, Weight,
-                                 BodySize, Properties);
-        }
-    }
-}
diff --git a/qpid/dotnet/Qpid.Common/Framing/ContentHeaderBodyFactory.cs b/qpid/dotnet/Qpid.Common/Framing/ContentHeaderBodyFactory.cs
deleted file mode 100644
index c95a10871d..0000000000
--- a/qpid/dotnet/Qpid.Common/Framing/ContentHeaderBodyFactory.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using log4net;
-using Apache.Qpid.Buffer;
-
-namespace Apache.Qpid.Framing
-{
-    public class ContentHeaderBodyFactory : IBodyFactory
-    {
-        private static readonly ILog _log = LogManager.GetLogger(typeof(ContentHeaderBodyFactory));
-
-        private static readonly ContentHeaderBodyFactory _instance = new ContentHeaderBodyFactory();
-
-        public static ContentHeaderBodyFactory GetInstance()
-        {
-            return _instance;
-        }
-
-        private ContentHeaderBodyFactory()
-        {
-            _log.Debug("Creating content header body factory");
-        }
-
-        #region IBodyFactory Members
-
-        public IBody CreateBody(ByteBuffer inbuf)
-        {
-            // all content headers are the same - it is only the properties that differ.
-            // the content header body further delegates construction of properties
-            return new ContentHeaderBody();
-        }
-
-        #endregion
-    }
-}
diff --git a/qpid/dotnet/Qpid.Common/Framing/ContentHeaderPropertiesFactory.cs b/qpid/dotnet/Qpid.Common/Framing/ContentHeaderPropertiesFactory.cs
deleted file mode 100644
index bac5d10fd4..0000000000
--- a/qpid/dotnet/Qpid.Common/Framing/ContentHeaderPropertiesFactory.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using Apache.Qpid.Buffer;
-
-namespace Apache.Qpid.Framing
-{
-    public class ContentHeaderPropertiesFactory
-    {
-
-        private static readonly ContentHeaderPropertiesFactory _instance = new ContentHeaderPropertiesFactory();
-
-        public static ContentHeaderPropertiesFactory GetInstance()
-        {
-            return _instance;
-        }
-
-        private ContentHeaderPropertiesFactory()
-        {
-        }
-
-        /// <summary>
-        /// Creates the content header properties from a buffer.
-        /// </summary>
-        /// <param name="classId">The class id.</param>
-        /// <param name="propertyFlags">The property flags.</param>
-        /// <param name="buffer">The buffer.</param>
-        /// <returns>a populated properties structure</returns>
-        /// <exception cref="AMQFrameDecodingException">if the buffer cannot be decoded</exception>
-        public IContentHeaderProperties CreateContentHeaderProperties(ushort classId, ushort propertyFlags,
-                                                                      ByteBuffer buffer)             
-        {
-            IContentHeaderProperties properties;
-            switch (classId)
-            {
-                case 60:
-                    properties = new BasicContentHeaderProperties();
-                    break;
-                default:
-                    throw new AMQFrameDecodingException("Unsupport content header class id: " + classId);
-            }
-            properties.PopulatePropertiesFromBuffer(buffer, propertyFlags);
-            return properties;
-        }
-    }
-}
diff --git a/qpid/dotnet/Qpid.Common/Framing/EncodingUtils.cs b/qpid/dotnet/Qpid.Common/Framing/EncodingUtils.cs
deleted file mode 100644
index 4d424656f9..0000000000
--- a/qpid/dotnet/Qpid.Common/Framing/EncodingUtils.cs
+++ /dev/null
@@ -1,460 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using System;
-using System.Globalization;
-using System.Text;
-using Apache.Qpid.Buffer;
-
-namespace Apache.Qpid.Framing
-{
-   public class EncodingUtils
-   {
-      private static readonly Encoding DEFAULT_ENCODER = Encoding.ASCII;
-
-      // SHORT STRING
-      public static ushort EncodedShortStringLength(string s)
-      {
-         if ( s == null )
-         {
-            return 1;
-         } else
-         {
-            return (ushort)(1 + s.Length);
-         }
-      }
-      public static void WriteShortStringBytes(ByteBuffer buffer, string s)
-      {
-         if ( s != null )
-         {
-            //try
-            //{
-            //final byte[] encodedString = s.getBytes(STRING_ENCODING);
-            byte[] encodedString;
-            lock ( DEFAULT_ENCODER )
-            {
-               encodedString = DEFAULT_ENCODER.GetBytes(s);
-            }
-            // TODO: check length fits in an unsigned byte
-            buffer.Put((byte)encodedString.Length);
-            buffer.Put(encodedString);
-
-         } else
-         {
-            // really writing out unsigned byte
-            buffer.Put((byte)0);
-         }
-      }
-
-      // ASCII STRINGS
-      public static uint EncodedAsciiStringLength(string s)
-      {
-         // TODO: move this to 2-byte length once the proposed encodings
-         // have been approved. Also, validate length!
-         if ( s == null )
-            return 4;
-         else 
-            return (uint) (4 + s.Length);
-      }
-      public static string ReadAsciiString(ByteBuffer buffer)
-      {
-         return ReadLongString(buffer, DEFAULT_ENCODER);
-      }
-      public static void WriteAsciiString(ByteBuffer buffer, string s)
-      {
-         WriteLongStringBytes(buffer, s, DEFAULT_ENCODER);
-      }
-
-      // LONG STRING
-      public static uint EncodedLongStringLength(string s)
-      {
-         return EncodedLongStringLength(s, DEFAULT_ENCODER);
-      }
-
-      public static uint EncodedLongStringLength(string s, Encoding encoding)
-      {
-         if ( s == null )
-         {
-            return 4;
-         } else
-         {
-            return (uint)(4 + encoding.GetByteCount(s));
-         }
-      }
-      public static string ReadLongString(ByteBuffer buffer)
-      {
-         return ReadLongString(buffer, DEFAULT_ENCODER);
-      }
-      public static string ReadLongString(ByteBuffer buffer, Encoding encoding)
-      {
-         uint length = buffer.GetUInt32();
-         if ( length == 0 )
-         {
-            return null;
-         } else
-         {
-            byte[] data = new byte[length];
-            buffer.GetBytes(data);
-            lock ( encoding )
-            {
-               return encoding.GetString(data);
-            }
-         }
-      }
-      public static void WriteLongStringBytes(ByteBuffer buffer, string s)
-      {
-         WriteLongStringBytes(buffer, s, DEFAULT_ENCODER);
-      }
-
-      public static void WriteLongStringBytes(ByteBuffer buffer, string s, Encoding encoding)
-      {
-         if ( !(s == null || s.Length <= 0xFFFE) )
-         {
-            throw new ArgumentException("String too long");
-         }
-         if ( s != null )
-         {
-            lock ( encoding )
-            {
-               byte[] encodedString = encoding.GetBytes(s);
-               buffer.Put((uint)encodedString.Length);
-               buffer.Put(encodedString);
-            }
-         } else
-         {
-            buffer.Put((uint)0);
-         }
-      }
-
-      // BINARY
-      public static uint EncodedLongstrLength(byte[] bytes)
-      {
-         if ( bytes == null )
-         {
-            return 4;
-         } else
-         {
-            return (uint)(4 + bytes.Length);
-         }
-      }
-      public static byte[] ReadLongstr(ByteBuffer buffer)
-      {
-         uint length = buffer.GetUInt32();
-         if ( length == 0 )
-         {
-            return null;
-         } else
-         {
-            byte[] result = new byte[length];
-            buffer.GetBytes(result);
-            return result;
-         }
-      }
-      public static void WriteLongstr(ByteBuffer buffer, byte[] data)
-      {
-         if ( data != null )
-         {
-            buffer.Put((uint)data.Length);
-            buffer.Put(data);
-         } else
-         {
-            buffer.Put((uint)0);
-         }
-      }
-
-      // BOOLEANS
-      public static bool[] ReadBooleans(ByteBuffer buffer)
-      {
-         byte packedValue = buffer.GetByte();
-         bool[] result = new bool[8];
-
-         for ( int i = 0; i < 8; i++ )
-         {
-            result[i] = ((packedValue & (1 << i)) != 0);
-         }
-         return result;
-      }
-      public static void WriteBooleans(ByteBuffer buffer, bool[] values)
-      {
-         byte packedValue = 0;
-         for ( int i = 0; i < values.Length; i++ )
-         {
-            if ( values[i] )
-            {
-               packedValue = (byte)(packedValue | (1 << i));
-            }
-         }
-
-         buffer.Put(packedValue);
-      }
-
-      // FIELD TABLES
-      public static uint EncodedFieldTableLength(FieldTable table)
-      {
-         if ( table == null )
-         {
-            // size is encoded as 4 octets
-            return 4;
-         } else
-         {
-            // size of the table plus 4 octets for the size
-            return table.EncodedSize + 4;
-         }
-      }
-      /// <summary>
-      /// Reads the field table using the data in the specified buffer
-      /// </summary>
-      /// <param name="buffer">The buffer to read from.</param>
-      /// <returns>a populated field table</returns>
-      /// <exception cref="AMQFrameDecodingException">if the buffer does not contain a decodable field table</exception>
-      public static FieldTable ReadFieldTable(ByteBuffer buffer)
-      {
-         uint length = buffer.GetUInt32();
-         if ( length == 0 )
-         {
-            return null;
-         } else
-         {
-            return new FieldTable(buffer, length);
-         }
-      }
-      public static void WriteFieldTableBytes(ByteBuffer buffer, FieldTable table)
-      {
-         if ( table != null )
-         {
-            table.WriteToBuffer(buffer);
-         } else
-         {
-            buffer.Put((uint)0);
-         }
-      }
-
-
-      /// <summary>
-      /// Read a short string from the buffer
-      /// </summary>
-      /// <param name="buffer">The buffer to read from.</param>
-      /// <returns>a string</returns>
-      /// <exception cref="AMQFrameDecodingException">if the buffer does not contain a decodable short string</exception>
-      public static string ReadShortString(ByteBuffer buffer)
-      {
-         byte length = buffer.GetByte();
-         if ( length == 0 )
-         {
-            return null;
-         } else
-         {
-            byte[] data = new byte[length];
-            buffer.GetBytes(data);
-
-            lock ( DEFAULT_ENCODER )
-            {
-               return DEFAULT_ENCODER.GetString(data);
-            }
-         }
-      }
-
-
-
-      // BOOLEAN
-      public static uint EncodedBooleanLength()
-      {
-         return 1;
-      }
-      public static bool ReadBoolean(ByteBuffer buffer)
-      {
-         byte packedValue = buffer.GetByte();
-         return (packedValue == 1);
-      }
-      public static void WriteBoolean(ByteBuffer buffer, bool value)
-      {
-         buffer.Put((byte)(value ? 1 : 0));
-      }
-
-
-      // CHAR
-      public static uint EncodedCharLength()
-      {
-         return EncodedByteLength();
-      }
-      public static char ReadChar(ByteBuffer buffer)
-      {
-         return (char)buffer.GetByte();
-      }
-      public static void WriteChar(ByteBuffer buffer, char value)
-      {
-         buffer.Put((byte)value);
-      }
-
-      // BYTE
-      public static uint EncodedByteLength()
-      {
-         return 1;
-      }
-      public static byte ReadByte(ByteBuffer buffer)
-      {
-         return buffer.GetByte();
-      }
-      public static void WriteByte(ByteBuffer buffer, byte value)
-      {
-         buffer.Put(value);
-      }
-
-      // SBYTE
-      public static uint EncodedSByteLength()
-      {
-         return 1;
-      }
-      public static sbyte ReadSByte(ByteBuffer buffer)
-      {
-         return buffer.GetSByte();
-      }
-      public static void WriteSByte(ByteBuffer buffer, sbyte value)
-      {
-         buffer.Put(value);
-      }
-
-      // INT16
-      public static uint EncodedShortLength()
-      {
-         return 2;
-      }
-
-      public static short ReadShort(ByteBuffer buffer)
-      {
-         return buffer.GetInt16();
-      }
-      public static void WriteShort(ByteBuffer buffer, short value)
-      {
-         buffer.Put(value);
-      }
-
-      // UINT16
-      public static uint EncodedUnsignedShortLength()
-      {
-         return 2;
-      }
-
-      public static ushort ReadUnsignedShort(ByteBuffer buffer)
-      {
-         return buffer.GetUInt16();
-      }
-      public static void WriteUnsignedShort(ByteBuffer buffer, ushort value)
-      {
-         buffer.Put(value);
-      }
-
-
-      // INT32
-      public static uint EncodedIntegerLength()
-      {
-         return 4;
-      }
-      public static int ReadInteger(ByteBuffer buffer)
-      {
-         return buffer.GetInt32();
-      }
-      public static void WriteInteger(ByteBuffer buffer, int value)
-      {
-         buffer.Put(value);
-      }
-
-      // UINT32
-      public static uint UnsignedIntegerLength()
-      {
-         return 4;
-      }
-      public static void WriteUnsignedInteger(ByteBuffer buffer, uint value)
-      {
-         buffer.Put(value);
-      }
-      public static uint ReadUnsignedInteger(ByteBuffer buffer)
-      {
-         return buffer.GetUInt32();
-      }
-
-      // INT64
-      public static uint EncodedUnsignedLongLength()
-      {
-         return 8;
-      }
-      public static ulong ReadUnsignedLong(ByteBuffer buffer)
-      {
-         return buffer.GetUInt64();
-      }
-      public static void WriteUnsignedLong(ByteBuffer buffer, ulong value)
-      {
-         buffer.Put(value);
-      }
-      
-      // UINT64
-      public static uint EncodedLongLength()
-      {
-         return 8;
-      }
-      public static long ReadLong(ByteBuffer buffer)
-      {
-         return buffer.GetInt64();
-      }
-      public static void WriteLong(ByteBuffer buffer, long value)
-      {
-         buffer.Put(value);
-      }
-
-      // FLOAT
-      public static uint EncodedFloatLength()
-      {
-         return 4;
-      }
-      public static void WriteFloat(ByteBuffer buffer, float value)
-      {
-         buffer.Put(value);
-      }
-      public static float ReadFloat(ByteBuffer buffer)
-      {
-         return buffer.GetFloat();
-      }
-
-      // DOUBLE
-      public static uint EncodedDoubleLength()
-      {
-         return 8;
-      }
-      public static void WriteDouble(ByteBuffer buffer, double value)
-      {
-         buffer.Put(value);
-      }
-      public static double ReadDouble(ByteBuffer buffer)
-      {
-         return buffer.GetDouble();
-      }
-
-      // OTHER
-      public static long ReadLongAsShortString(ByteBuffer buffer)
-      {
-         string value = ReadShortString(buffer);
-         if ( value == null || value.Length == 0 )
-            return 0L;
-         return Convert.ToInt64(value, CultureInfo.InvariantCulture);
-      }
-
-   }
-
-}
diff --git a/qpid/dotnet/Qpid.Common/Framing/FieldTable.cs b/qpid/dotnet/Qpid.Common/Framing/FieldTable.cs
deleted file mode 100644
index 6567bf58ab..0000000000
--- a/qpid/dotnet/Qpid.Common/Framing/FieldTable.cs
+++ /dev/null
@@ -1,633 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using System;
-using System.Collections;
-using System.Text;
-using log4net;
-using Apache.Qpid.Buffer;
-using Apache.Qpid.Collections;
-using Apache.Qpid.Messaging;
-
-namespace Apache.Qpid.Framing
-{
-    public class FieldTable : IFieldTable, IEnumerable
-    {
-        private static readonly ILog _log = LogManager.GetLogger(typeof(FieldTable));
-
-        IDictionary _properties;
-        private ByteBuffer _encodedForm;
-        private object _syncLock;
-        private uint _encodedSize;
-
-        public FieldTable()
-        {
-           _syncLock = new object();
-        }
-        
-        /// <summary>
-        /// Construct a new field table.
-        /// </summary>
-        /// <param name="buffer">the buffer from which to read data. The length byte must be read already</param>
-        /// <param name="length">the length of the field table. Must be > 0.</param>
-        public FieldTable(ByteBuffer buffer, uint length) : this()
-        {
-           _encodedForm = buffer.Slice();
-           _encodedForm.Limit = (int)length;
-           _encodedSize = length;
-           buffer.Skip((int)length);
-        }
-
-        /// <summary>
-        /// The set of all property names
-        /// </summary>
-        public ICollection Keys
-        {
-           get 
-           { 
-              InitMapIfNecessary();
-              return _properties.Keys;  
-           }
-        }
-
-        /// <summary>
-        /// Calculated size of this field table once encoded
-        /// </summary>
-        public uint EncodedSize
-        {
-           get { return _encodedSize; }
-        }
-
-        /// <summary>
-        /// Number of properties in the field table
-        /// </summary>
-        public int Count
-        {
-           get
-           {
-              InitMapIfNecessary();
-              return _properties.Count;
-           }
-        }
-
-        /// <summary>
-        /// Gets or sets the specified property.
-        /// </summary>
-        /// <param name="key">Property name</param>
-        /// <returns>The specified property value</returns>
-        public object this[string key]
-        { 
-           get { return GetObject(key); }
-           set { SetObject(key, value); }
-        }
-
-        #region Typed Setters and Getters
-        //
-        // Typed Setters and Getters
-        //
-        public bool GetBoolean(string key)
-        {
-           return (bool)this[key];
-        }
-        public void SetBoolean(string key, bool value)
-        {
-           CheckPropertyName(key);
-           SetProperty(key, AMQType.BOOLEAN.AsTypedValue(value));
-        }
-        public byte GetByte(string key)
-        {
-           return (byte)this[key];
-        }
-        public void SetByte(string key, byte value)
-        {
-           CheckPropertyName(key);
-           SetProperty(key, AMQType.BYTE.AsTypedValue(value));
-        }
-        public sbyte GetSByte(string key)
-        {
-           return (sbyte)this[key];
-        }
-        public void SetSByte(string key, sbyte value)
-        {
-           CheckPropertyName(key);
-           SetProperty(key, AMQType.SBYTE.AsTypedValue(value));
-        }
-        public short GetInt16(string key)
-        {
-           return (short)this[key];
-        }
-        public void SetInt16(string key, short value)
-        {
-           CheckPropertyName(key);
-           SetProperty(key, AMQType.INT16.AsTypedValue(value));
-        }
-        public int GetInt32(string key)
-        {
-           return (int)this[key];
-        }
-        public void SetInt32(string key, int value)
-        {
-           CheckPropertyName(key);
-           SetProperty(key, AMQType.INT32.AsTypedValue(value));
-        }
-        public long GetInt64(string key)
-        {
-           return (long)this[key];
-        }
-        public void SetInt64(string key, long value)
-        {
-           CheckPropertyName(key);
-           SetProperty(key, AMQType.INT64.AsTypedValue(value));
-        }
-        public char GetChar(string key)
-        {
-           return (char)this[key];
-        }
-        public void SetChar(string key, char value)
-        {
-           CheckPropertyName(key);
-           SetProperty(key, AMQType.ASCII_CHARACTER.AsTypedValue(value));
-        }
-        public float GetFloat(string key)
-        {
-           return (float)this[key];
-        }
-        public void SetFloat(string key, float value)
-        {
-           CheckPropertyName(key);
-           SetProperty(key, AMQType.FLOAT.AsTypedValue(value));
-        }
-        public double GetDouble(string key)
-        {
-           return (double)this[key];
-        }
-        public void SetDouble(string key, double value)
-        {
-           CheckPropertyName(key);
-           SetProperty(key, AMQType.DOUBLE.AsTypedValue(value));
-        }
-        public decimal GetDecimal(string key)
-        {
-           return (decimal)this[key];
-        }
-        public void SetDecimal(string key, decimal value)
-        {
-           CheckPropertyName(key);
-           SetProperty(key, AMQType.DECIMAL.AsTypedValue(value));
-        }
-        public string GetString(string key)
-        {
-           return (string)this[key];
-        }
-        public void SetString(string key, string value)
-        {
-           CheckPropertyName(key);
-           if ( value == null )
-              SetProperty(key, AMQType.VOID.AsTypedValue(null));
-           else
-              SetProperty(key, AMQType.LONG_STRING.AsTypedValue(value));
-        }
-        public byte[] GetBytes(string key)
-        {
-           return (byte[])this[key];
-        }
-        public void SetBytes(string key, byte[] value)
-        {
-           CheckPropertyName(key);
-           SetProperty(key, AMQType.BINARY.AsTypedValue(value));
-        }
-        public ushort GetUInt16(string key)
-        {
-           return (ushort)this[key];
-        }
-        public void SetUInt16(string key, ushort value)
-        {
-           CheckPropertyName(key);
-           SetProperty(key, AMQType.UINT16.AsTypedValue(value));
-        }
-        public uint GetUInt32(string key)
-        {
-           return (uint)this[key];
-        }
-        public void SetUInt32(string key, uint value)
-        { 
-           CheckPropertyName(key);
-           SetProperty(key, AMQType.UINT32.AsTypedValue(value));
-        }
-        public ulong GetUInt64(string key)
-        {
-           return (ulong)this[key];
-        }
-        public void SetUInt64(string key, ulong value)
-        {
-           CheckPropertyName(key);
-           SetProperty(key, AMQType.UINT64.AsTypedValue(value));
-        } 
-
-        #endregion // Typed Setters and Getters
-
-        #region Public Methods
-        //
-        // Public Methods
-        //
-
-        /// <summary>
-        /// Removes the property with the specified name
-        /// </summary>
-        /// <param name="key">The name of the property to remove</param>
-        /// <returns>The previous value of the property or null</returns>
-        public AMQTypedValue RemoveKey(string key)
-        {
-           InitMapIfNecessary();
-           _encodedForm = null;
-           AMQTypedValue value = (AMQTypedValue)_properties[key];
-           if ( value != null )
-           {
-              _properties.Remove(key);
-              _encodedSize -= EncodingUtils.EncodedShortStringLength(key);
-              _encodedSize--;
-              _encodedSize -= value.EncodingLength;
-
-           }
-           return value;
-        }
-        
-
-        /// <summary>
-        /// Remove the property with the specified name
-        /// </summary>
-        /// <param name="key">The name of the property to remove</param>
-        public void Remove(string key)
-        {
-           RemoveKey(key);
-        }
-
-        /// <summary>
-        /// Remove all properties from the table
-        /// </summary>
-        public void Clear()
-        {
-           InitMapIfNecessary();
-           _encodedForm = null;
-           _properties.Clear();
-           _encodedSize = 0;
-        }
-
-        /// <summary>
-        /// Adds all the items from one field table in this one. Will overwrite any items in the current table
-        /// with the same key.
-        /// </summary>
-        /// <param name="ft">the source field table</param>
-        public void AddAll(IFieldTable ft)
-        {
-           foreach ( DictionaryEntry dictionaryEntry in ft )
-           {
-              this[(string)dictionaryEntry.Key] = dictionaryEntry.Value;
-           }
-        }
-
-        /// <summary>
-        /// Get a enumerator over the internal property set.
-        /// Notice the enumerator will DictionaryEntry objects with 
-        /// a string as the Key and an <see cref="AMQTypedValue"/> instance as the value
-        /// </summary>
-        /// <returns>The enumerator object</returns>
-        public IEnumerator GetEnumerator()
-        {
-           InitMapIfNecessary();
-           return _properties.GetEnumerator();
-        }
-
-        /// <summary>
-        /// Indicates if a property with the given name exists
-        /// </summary>
-        /// <param name="s">Property name to check</param>
-        /// <returns>True if the property exists</returns>
-        public bool Contains(string s)
-        {
-           InitMapIfNecessary();
-           return _properties.Contains(s);
-        }
-        
-        /// <summary>
-        /// Returns a dictionary mapping Property Names to the corresponding
-        /// <see cref="AMQTypedValue"/> value
-        /// </summary>
-        /// <returns>The internal dictionary</returns>
-        public IDictionary AsDictionary()
-        {
-           InitMapIfNecessary();
-           return _properties;
-        }
-
-        /// <summary>
-        /// Returns a string representation of this field table
-        /// </summary>
-        /// <returns>A string</returns>
-        public override string ToString()
-        {
-           StringBuilder sb = new StringBuilder("FieldTable {");
-
-           bool first = true;
-           InitMapIfNecessary();
-           foreach ( DictionaryEntry entry in _properties )
-           {
-              if ( !first )
-              {
-                 sb.Append(", ");
-              }
-              first = false;
-              sb.Append(entry.Key).Append(" => ").Append(entry.Value);
-           }
-
-           sb.Append("}");
-           return sb.ToString();
-        }
-        
-        /// <summary>
-        /// Serializes this instance to the specified <see cref="ByteBuffer"/>.
-        /// </summary>
-        /// <param name="buffer">The buffer to write to</param>
-        public void WriteToBuffer(ByteBuffer buffer)
-        {
-            if ( _log.IsDebugEnabled )
-            {
-               _log.Debug("FieldTable::writeToBuffer: Writing encoded length of " + EncodedSize + "...");
-            }
-
-           EncodingUtils.WriteUnsignedInteger(buffer, EncodedSize);
-           WritePayload(buffer);
-        }
-
-        /// <summary>
-        /// Returns a byte array with the serialized representation
-        /// of this field table
-        /// </summary>
-        /// <returns>An array of bytes</returns>
-        public byte[] GetDataAsBytes()
-        {
-           ByteBuffer buffer = ByteBuffer.Allocate((int)_encodedSize);
-           WritePayload(buffer);
-           byte[] result = new byte[_encodedSize];
-           buffer.Flip();
-           buffer.GetBytes(result);
-           //buffer.Release();
-           return result;
-        }
-
-        #endregion // Public Methods
-
-        #region Private Methods
-        //
-        // Private Methods
-        //
-
-        private static void CheckPropertyName(string propertyName)
-        {
-           if ( propertyName == null || propertyName.Length == 0 )
-              throw new ArgumentNullException("propertyName");
-           CheckIdentifierFormat(propertyName);
-        }
-
-        private static void CheckIdentifierFormat(string propertyName)
-        {
-           //        AMQP Spec: 4.2.5.5 Field Tables
-           //        Guidelines for implementers:
-           //           * Field names MUST start with a letter, '$' or '#' and may continue with
-           //             letters, '$' or '#', digits, or underlines, to a maximum length of 128
-           //             characters.
-           //           * The server SHOULD validate field names and upon receiving an invalid
-           //             field name, it SHOULD signal a connection exception with reply code
-           //             503 (syntax error). Conformance test: amq_wlp_table_01.
-           //           * A peer MUST handle duplicate fields by using only the first instance.
-
-
-           // AMQP length limit
-           if ( propertyName.Length > 128 )
-           {
-              throw new ArgumentException("AMQP limits property names to 128 characters");
-           }
-
-           // AMQ start character
-           if ( !(Char.IsLetter(propertyName[0])
-                 || propertyName[0] == '$'
-                 || propertyName[0] == '#'
-                 || propertyName[0] == '_' ) )// Not official AMQP added for JMS.
-           {
-              throw new ArgumentException("Identifier '" + propertyName + "' does not start with a valid AMQP start character");
-           }
-        }
-
-        private object GetObject(string key)
-        {
-           AMQTypedValue value = GetProperty(key);
-           return value != null ? value.Value : null;
-        }
-        
-        private void SetObject(string key, object value)
-        {
-           if ( value is bool )
-           {
-              SetBoolean(key, (bool)value);
-           } else if ( value is byte )
-           {
-              SetByte(key, (byte)value);
-           } else if ( value is sbyte )
-           {
-              SetSByte(key, (sbyte)value);
-           } else if ( value is short )
-           {
-              SetInt16(key, (short)value);
-           } else if ( value is ushort )
-           {
-              SetUInt16(key, (ushort)value);
-           } else if ( value is int )
-           {
-              SetInt32(key, (int) value);
-           } else if ( value is uint )
-           {
-              SetUInt32(key, (uint)value);
-           } else if ( value is long )
-           {
-              SetInt64(key, (long) value);
-           } else if ( value is ulong )
-           {
-              SetUInt64(key, (ulong)value);
-           } else if ( value is char )
-           {
-              SetChar(key, (char) value);
-           } else if ( value is float )
-           {
-              SetFloat(key, (float) value);
-           } else if ( value is double )
-           {
-              SetDouble(key, (double) value);
-           } else if ( value is decimal )
-           {
-              SetDecimal(key, (decimal) value);
-           } else if ( value is string )
-           {
-              SetString(key, (string) value);
-           } else if ( value is byte[] )
-           {
-              SetBytes(key, (byte[])value);
-           } else
-           {
-              throw new ArgumentException("Data type not supported yet");
-           }
-        }
-        
-        private AMQTypedValue GetProperty(string name)
-        {
-           InitMapIfNecessary();
-           return (AMQTypedValue) _properties[name];
-        }
-
-        private void PopulateFromBuffer()
-        {
-           try
-           {
-              ByteBuffer buffer = _encodedForm;
-              _encodedForm = null;
-              if ( buffer != null )
-                 SetFromBuffer(buffer, _encodedSize);
-           } catch ( AMQFrameDecodingException e )
-           {
-              _log.Error("Error decoding FieldTable in deferred decoding mode ", e);
-              throw;
-           }
-        }
-
-        private void SetFromBuffer(ByteBuffer buffer, uint length)
-        {
-           bool trace = _log.IsDebugEnabled;
-           if ( length > 0 )
-           {
-              int expectedRemaining = buffer.Remaining - (int)length;
-              _properties = new LinkedHashtable();
-
-              do
-              {
-                 string key = EncodingUtils.ReadShortString(buffer);
-                 AMQTypedValue value = AMQTypedValue.ReadFromBuffer(buffer);
-                 if ( trace )
-                 {
-                    _log.Debug(string.Format("FieldTable::PropFieldTable(buffer,{0}): Read type '{1}', key '{2}', value '{3}'", length, value.Type, key, value.Value));
-                 }
-                 _properties.Add(key, value);
-
-              } while ( buffer.Remaining > expectedRemaining );
-              _encodedSize = length;
-           }
-           if ( trace )
-           {
-              _log.Debug("FieldTable::FieldTable(buffer," + length + "): Done.");
-           }
-        }
-
-        private void InitMapIfNecessary()
-        {
-           lock ( _syncLock )
-           {
-              if ( _properties == null )
-              {
-                 if ( _encodedForm == null )
-                 {
-                    _properties = new LinkedHashtable();
-                 } else
-                 {
-                    PopulateFromBuffer();
-                 }
-              }
-           }
-        }
-
-        private AMQTypedValue SetProperty(string key, AMQTypedValue value)
-        {
-           InitMapIfNecessary();
-           _encodedForm = null;
-           if ( value == null )
-           {
-              RemoveKey(key);
-           }
-           AMQTypedValue oldVal = (AMQTypedValue)_properties[key];
-           _properties.Add(key, value);
-           if ( oldVal != null )
-           {
-              _encodedSize -= oldVal.EncodingLength;
-           } else
-           {
-              _encodedSize += EncodingUtils.EncodedShortStringLength(key) + (uint)1;
-           }
-           if ( value != null )
-           {
-              _encodedSize += value.EncodingLength;
-           }
-
-           return oldVal;
-        }
-
-        public void WritePayload(ByteBuffer buffer)
-        {
-           if ( _encodedForm != null )
-           {
-              lock ( _syncLock )
-              {
-                 buffer.Put(_encodedForm);
-                 _encodedForm.Flip();
-              }
-           } else if ( _properties != null )
-           {
-              foreach ( DictionaryEntry de in _properties )
-              {
-                 string key = (string)de.Key;
-                 AMQTypedValue value = (AMQTypedValue)de.Value;
-                 try
-                 {
-                    if ( _log.IsDebugEnabled )
-                    {
-                       _log.Debug("Writing Property:" + key +
-                                  " Type:" + value.Type +
-                                  " Value:" + value.Value);
-                       _log.Debug("Buffer Position:" + buffer.Position +
-                                  " Remaining:" + buffer.Remaining);
-                    }
-                    //Write the actual parameter name
-                    EncodingUtils.WriteShortStringBytes(buffer, key);
-                    value.WriteToBuffer(buffer);
-                 } catch ( Exception ex )
-                 {
-                    if ( _log.IsDebugEnabled )
-                    {
-                       _log.Debug("Exception thrown:" + ex);
-                       _log.Debug("Writing Property:" + key +
-                                  " Type:" + value.Type +
-                                  " Value:" + value.Value);
-                       _log.Debug("Buffer Position:" + buffer.Position +
-                                  " Remaining:" + buffer.Remaining);
-                    }
-                    throw;
-                 }
-              }
-           }
-        }
-        #endregion // Private Methods
-    }
-}
diff --git a/qpid/dotnet/Qpid.Common/Framing/HeartbeatBody.cs b/qpid/dotnet/Qpid.Common/Framing/HeartbeatBody.cs
deleted file mode 100644
index a8906f5ba8..0000000000
--- a/qpid/dotnet/Qpid.Common/Framing/HeartbeatBody.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using Apache.Qpid.Buffer;
-
-namespace Apache.Qpid.Framing
-{
-    public class HeartbeatBody : IBody
-{
-    public const byte TYPE = 8;
-    public static AMQFrame FRAME = new HeartbeatBody().ToFrame();
-
-    public byte BodyType
-    {
-        get
-        {
-            return TYPE;
-        }        
-    }
-
-    public uint Size
-    {
-        get
-        {
-            return 0;//heartbeats we generate have no payload
-        }        
-    }
-
-    public void WritePayload(ByteBuffer buffer)
-    {
-    }
-
-    public void PopulateFromBuffer(ByteBuffer buffer, uint size)
-    {
-        if (size > 0)
-        {
-            //allow other implementations to have a payload, but ignore it:
-            buffer.Skip((int) size);
-        }
-    }
-
-    public AMQFrame ToFrame()
-    {
-        return new AMQFrame(0, this);
-    }
-}
-}
diff --git a/qpid/dotnet/Qpid.Common/Framing/HeartbeatBodyFactory.cs b/qpid/dotnet/Qpid.Common/Framing/HeartbeatBodyFactory.cs
deleted file mode 100644
index 90e5c7768e..0000000000
--- a/qpid/dotnet/Qpid.Common/Framing/HeartbeatBodyFactory.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using Apache.Qpid.Buffer;
-
-namespace Apache.Qpid.Framing
-{
-    public class HeartbeatBodyFactory : IBodyFactory
-    {
-        public IBody CreateBody(ByteBuffer input)
-        {
-            return new HeartbeatBody();
-        }
-    }
-}
diff --git a/qpid/dotnet/Qpid.Common/Framing/IBody.cs b/qpid/dotnet/Qpid.Common/Framing/IBody.cs
deleted file mode 100644
index 97b4459e5c..0000000000
--- a/qpid/dotnet/Qpid.Common/Framing/IBody.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using Apache.Qpid.Buffer;
-
-namespace Apache.Qpid.Framing
-{
-    /// <summary>
-    /// An IBody is contained within a top level frame. As such, it is not en/decodable on its own but
-    /// is decoded as a step within a the overall en/decoding process.
-    /// </summary>
-    public interface IBody
-    {
-        /// <summary>
-        /// Gets the type. See RFC 006 for the meaning of "type" in this context.
-        /// </summary>
-        /// <value>The type.</value>
-        byte BodyType
-        {
-            get;
-        }
-    
-        /// <summary>
-        /// Get the size of the body
-        /// </summary>
-        /// <value>The size in bytes.</value>         
-        uint Size
-        {
-            get;
-        }
-
-        /// <summary>
-        /// Writes this instance to a buffer.
-        /// </summary>
-        /// <param name="buffer">The buffer.</param>
-        void WritePayload(ByteBuffer buffer);
-    
-        /// <summary>
-        /// Populates this instance from a buffer of data.
-        /// </summary>
-        /// <param name="buffer">The buffer.</param>
-        /// <param name="size">The size.</param>
-        /// <exception cref="AMQFrameDecodingException">If the buffer contains data that cannot be decoded</exception>
-        void PopulateFromBuffer(ByteBuffer buffer, uint size);
-    }
-}
diff --git a/qpid/dotnet/Qpid.Common/Framing/IBodyFactory.cs b/qpid/dotnet/Qpid.Common/Framing/IBodyFactory.cs
deleted file mode 100644
index dd7960ddbe..0000000000
--- a/qpid/dotnet/Qpid.Common/Framing/IBodyFactory.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using Apache.Qpid.Buffer;
-
-namespace Apache.Qpid.Framing
-{
-    /// <summary>
-    /// Any class that is capable of turning a stream of bytes into an AMQ structure must implement this interface.
-    /// </summary>
-    public interface IBodyFactory
-    {
-        /// <summary>
-        /// Creates the body.
-        /// </summary>
-        /// <param name="inbuf">The ByteBuffer containing data from the network</param>
-        /// <returns></returns>
-        /// <exception>AMQFrameDecodingException</exception>
-        IBody CreateBody(ByteBuffer inbuf);
-    }
-}
diff --git a/qpid/dotnet/Qpid.Common/Framing/IContentHeaderProperties.cs b/qpid/dotnet/Qpid.Common/Framing/IContentHeaderProperties.cs
deleted file mode 100644
index 676d0910d4..0000000000
--- a/qpid/dotnet/Qpid.Common/Framing/IContentHeaderProperties.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using Apache.Qpid.Buffer;
-
-namespace Apache.Qpid.Framing
-{
-    /// <summary>
-    /// There will be an implementation of this interface for each content type. All content types have associated
-    /// header properties and this provides a way to encode and decode them.
-    /// </summary>    
-    public interface IContentHeaderProperties
-    {
-        /// <summary>
-        /// Writes the property list to the buffer, in a suitably encoded form.
-        /// </summary>
-        /// <param name="buffer">The buffer to write to</param>
-        void WritePropertyListPayload(ByteBuffer buffer);
-
-        /// <summary>
-        /// Populates the properties from buffer.
-        /// </summary>
-        /// <param name="buffer">The buffer to read from.</param>
-        /// <param name="propertyFlags">The property flags.</param>
-        /// <exception cref="AMQFrameDecodingException">Thrown when the buffer does not contain valid data</exception>
-        void PopulatePropertiesFromBuffer(ByteBuffer buffer, ushort propertyFlags);
-
-        /// <summary>
-        /// Gets the size of the encoded property list in bytes.
-        /// </summary>
-        /// <value>The size of the property list in bytes</value>        
-        uint PropertyListSize
-        {
-            get;
-        }
-
-        /// <summary>
-        /// Gets the property flags. Property flags indicate which properties are set in the list. The
-        /// position and meaning of each flag is defined in the protocol specification for the particular
-        /// content type with which these properties are associated.
-        /// </summary>
-        /// <value>the flags as an unsigned integer</value>
-        ushort PropertyFlags
-        {
-            get;
-        }
-    }
-}
diff --git a/qpid/dotnet/Qpid.Common/Framing/IDataBlock.cs b/qpid/dotnet/Qpid.Common/Framing/IDataBlock.cs
deleted file mode 100644
index c61ed90d10..0000000000
--- a/qpid/dotnet/Qpid.Common/Framing/IDataBlock.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using Apache.Qpid.Buffer;
-
-namespace Apache.Qpid.Framing
-{
-    /// <summary>
-    /// A data block represents something that has a size in bytes and the ability to write itself to a byte
-    /// buffer (similar to a byte array). It represents "top level" frames in the protocol specification.
-    /// </summary>
-    public interface IDataBlock : IEncodableAMQDataBlock
-    {
-        /// <summary>
-        /// Get the size of buffer needed to store the byte representation of this
-        /// frame.
-        /// </summary>
-        /// <returns>size in bytes</returns>        
-        uint Size
-        {
-            get;
-        }
-
-        /// <summary>
-        /// Writes the datablock to the specified buffer.
-        /// </summary>
-        /// <param name="buffer">The buffer to write to. Must be the correct size.</param>
-        void WritePayload(ByteBuffer buffer);
-    }
-}
diff --git a/qpid/dotnet/Qpid.Common/Framing/IEncodableAMQDataBlock.cs b/qpid/dotnet/Qpid.Common/Framing/IEncodableAMQDataBlock.cs
deleted file mode 100644
index da8bf9fef9..0000000000
--- a/qpid/dotnet/Qpid.Common/Framing/IEncodableAMQDataBlock.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-namespace Apache.Qpid.Framing
-{
-    
-    /// <summary>
-    /// Marker interface to indicate to MINA that a data block should be encoded with the
-    /// single encoder/decoder that we have defined.
-    /// </summary>
-    public interface IEncodableAMQDataBlock
-    {
-    }
-}
diff --git a/qpid/dotnet/Qpid.Common/Framing/ProtocolInitiation.cs b/qpid/dotnet/Qpid.Common/Framing/ProtocolInitiation.cs
deleted file mode 100644
index a9f5697144..0000000000
--- a/qpid/dotnet/Qpid.Common/Framing/ProtocolInitiation.cs
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using System;
-using System.Collections;
-using System.Configuration;
-using System.Reflection;
-using System.Xml;
-using log4net;
-using Apache.Qpid.Buffer;
-using Apache.Qpid.Codec;
-using Apache.Qpid.Codec.Demux;
-using Apache.Qpid.Common;
-
-namespace Apache.Qpid.Framing
-{
-    public class ProtocolInitiation : IDataBlock, IEncodableAMQDataBlock
-    {
-        private static readonly ILog _log = LogManager.GetLogger(typeof(ProtocolInitiation));
-
-        public char[] Header = new char[]{'A','M','Q','P'};
-
-        private const byte CURRENT_PROTOCOL_CLASS = 1;
-        private const int CURRENT_PROTOCOL_INSTANCE = 1;
-        // FIXME: Needs to be tweakable from GRM.dll.config file. i.e. Major version 7 or 8 + 
-        // FIXME: a configuration item for avoiding Basic.Qos (for OpenAMQ compatibility)
-        public static int CURRENT_PROTOCOL_VERSION_MAJOR = 8; // FIXME: put back to 7 for OpenAMQ!
-        private const int CURRENT_PROTOCOL_VERSION_MINOR = 0;
-
-        public byte ProtocolClass = CURRENT_PROTOCOL_CLASS;
-        public byte ProtocolInstance = CURRENT_PROTOCOL_INSTANCE;
-        public byte ProtocolMajor = (byte)CURRENT_PROTOCOL_VERSION_MAJOR;
-        public byte ProtocolMinor = CURRENT_PROTOCOL_VERSION_MINOR;        
-
-        static ProtocolInitiation()
-        {
-            AssemblySettings settings = new AssemblySettings();
-            string openAMQ = settings["OpenAMQ1d4Compatibility"];
-            if (openAMQ.Equals("true"))
-            {
-                _log.Warn("Starting in OpenAMQ-1.0d4 compatibility mode. ProtocolMajorVersion is 7 and Basic.Qos will not be sent.");                
-                CURRENT_PROTOCOL_VERSION_MAJOR = 7;                
-            }            
-        }
-
-        public uint Size
-        {
-            get
-            {
-                return 4 + 1 + 1 + 1 + 1;
-            }
-        }
-
-        public void WritePayload(ByteBuffer buffer)
-        {
-            foreach (char c in Header)
-            {
-                buffer.Put((byte) c);
-            }
-            buffer.Put(ProtocolClass);
-            buffer.Put(ProtocolInstance);
-            buffer.Put(ProtocolMajor);
-            buffer.Put(ProtocolMinor);
-        }
-
-        /// <summary>
-        /// Populates from buffer.
-        /// </summary>
-        /// <param name="buffer">The buffer.</param>
-        public void PopulateFromBuffer(ByteBuffer buffer)
-        {
-            throw new AMQException("Method not implemented");
-        }
-
-        public class Decoder : IMessageDecoder
-        {
-            private bool _disabled = false;
-
-            public MessageDecoderResult Decodable(ByteBuffer inbuf)
-            {
-                if (_disabled)
-                {
-                    return MessageDecoderResult.NOT_OK;
-                }
-                if (inbuf.Remaining < 8)
-                {
-                    return MessageDecoderResult.NEED_DATA;
-                }
-                else
-                {
-                    char[] expected = new char[]{'A', 'M', 'Q', 'P'};
-                    for (int i = 0; i < 4; i++)
-                    {
-                        if (((char) inbuf.GetByte()) != expected[i])
-                        {
-                            return MessageDecoderResult.NOT_OK;
-                        }
-                    }
-                    return MessageDecoderResult.OK;
-                }
-            }
-
-            /// <summary>
-            /// Decodes the specified session.
-            /// </summary>
-            /// <param name="inbuf">The inbuf.</param>
-            /// <param name="output">The protocol output.</param>
-            /// <returns></returns>
-            public MessageDecoderResult Decode(ByteBuffer inbuf, IProtocolDecoderOutput output)
-            {
-                byte[] header = new byte[4];
-                inbuf.GetBytes(header);
-                ProtocolInitiation pi = new ProtocolInitiation();
-                pi.Header = new char[]{'A','M','Q','P'};
-                pi.ProtocolClass = inbuf.GetByte();
-                pi.ProtocolInstance = inbuf.GetByte();
-                pi.ProtocolMajor = inbuf.GetByte();
-                pi.ProtocolMinor = inbuf.GetByte();
-                output.Write(pi);
-                return MessageDecoderResult.OK;
-            }
-
-            public bool Disabled
-            {
-                set
-                {
-                    _disabled = value;
-                }
-            }
-        }
-
-        public override string ToString()
-        {
-            return String.Format("{0}{{Class={1} Instance={2} Major={3} Minor={4}}}",
-                                 GetType().Name, ProtocolClass, ProtocolInstance, ProtocolMajor, ProtocolMinor);
-        }
-    }
-}
diff --git a/qpid/dotnet/Qpid.Common/Properties/AssemblyInfo.cs b/qpid/dotnet/Qpid.Common/Properties/AssemblyInfo.cs
deleted file mode 100644
index e876015bc3..0000000000
--- a/qpid/dotnet/Qpid.Common/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using System.Reflection;
-using System.Runtime.InteropServices;
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("Apache.Qpid.Common")]
-[assembly: AssemblyDescription("Common AMQ Framing Code")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Apache Qpid")]
-[assembly: AssemblyProduct("Apache.Qpid.Common")]
-[assembly: AssemblyCopyright("Copyright © J.P. Morgan Chase & Co. 2006")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("8dea7c69-1383-4bf7-99e9-e172eba639a2")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Revision and Build Numbers 
-// by using the '*' as shown below:
-[assembly: AssemblyVersion("0.5.*")]
diff --git a/qpid/dotnet/Qpid.Common/Protocol/AMQConstant.cs b/qpid/dotnet/Qpid.Common/Protocol/AMQConstant.cs
deleted file mode 100644
index fcf94c29f4..0000000000
--- a/qpid/dotnet/Qpid.Common/Protocol/AMQConstant.cs
+++ /dev/null
@@ -1,100 +0,0 @@
-/*

- *

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- *

- */

-using System;

-using System.Collections;

-

-namespace Apache.Qpid.Protocol

-{

-   public sealed class AMQConstant

-   {

-      private int _code;

-      private string _name;

-      private static Hashtable _codeMap = new Hashtable();

-

-      public int Code

-      {

-         get { return _code; }

-      }

-

-      public string Name

-      {

-         get { return _name; }

-      }

-

-      private AMQConstant(int code, string name, bool map)

-      {

-         _code = code;

-         _name = name;

-

-         if ( map )

-         {

-            _codeMap.Add(code, this);

-         }

-      }

-

-      public override string ToString()

-      {

-         return string.Format("{0}: {1}", Code, Name);

-      }

-

-      public static AMQConstant GetConstant(int code)

-      {

-         AMQConstant c = (AMQConstant)_codeMap[code];

-         if ( c == null )

-         {

-            c = new AMQConstant(code, "unknown code", false);

-         }

-         return c;

-      }

-

-      #region Constants

-      //

-      // Constants

-      //

-      public static readonly AMQConstant FRAME_MIN_SIZE = new AMQConstant(4096, "frame min size", true);

-      public static readonly AMQConstant FRAME_END = new AMQConstant(206, "frame end", true);

-      public static readonly AMQConstant REPLY_SUCCESS = new AMQConstant(200, "reply success", true);

-      public static readonly AMQConstant NOT_DELIVERED = new AMQConstant(310, "not delivered", true);

-      public static readonly AMQConstant MESSAGE_TOO_LARGE = new AMQConstant(311, "message too large", true);

-      public static readonly AMQConstant NO_ROUTE = new AMQConstant(312, "no route", true);

-      public static readonly AMQConstant NO_CONSUMERS = new AMQConstant(313, "no consumers", true);

-      public static readonly AMQConstant CONTEXT_IN_USE = new AMQConstant(320, "context in use", true);

-      public static readonly AMQConstant INVALID_PATH = new AMQConstant(402, "invalid path", true);

-      public static readonly AMQConstant ACCESS_REFUSED = new AMQConstant(403, "access refused", true);

-      public static readonly AMQConstant NOT_FOUND = new AMQConstant(404, "not found", true);

-      public static readonly AMQConstant ALREADY_EXISTS = new AMQConstant(405, "already exists", true);

-      public static readonly AMQConstant IN_USE = new AMQConstant(406, "in use", true);

-      public static readonly AMQConstant INVALID_ROUTING_KEY = new AMQConstant(407, "routing key invalid", true);

-      public static readonly AMQConstant REQUEST_TIMEOUT = new AMQConstant(408, "request timeout", true);

-      public static readonly AMQConstant INVALID_ARGUMENT = new AMQConstant(409, "argument invalid", true);

-      public static readonly AMQConstant FRAME_ERROR = new AMQConstant(501, "frame error", true);

-      public static readonly AMQConstant SYNTAX_ERROR = new AMQConstant(502, "syntax error", true);

-      public static readonly AMQConstant COMMAND_INVALID = new AMQConstant(503, "command invalid", true);

-      public static readonly AMQConstant CHANNEL_ERROR = new AMQConstant(504, "channel error", true);

-      public static readonly AMQConstant RESOURCE_ERROR = new AMQConstant(506, "resource error", true);

-      public static readonly AMQConstant NOT_ALLOWED = new AMQConstant(530, "not allowed", true);

-      public static readonly AMQConstant NOT_IMPLEMENTED = new AMQConstant(540, "not implemented", true);

-      public static readonly AMQConstant INTERNAL_ERROR = new AMQConstant(541, "internal error", true);

-

-      #endregion // Constants

-

-   }

-}

diff --git a/qpid/dotnet/Qpid.Common/Qpid.Common.csproj b/qpid/dotnet/Qpid.Common/Qpid.Common.csproj
deleted file mode 100644
index d15c1887b7..0000000000
--- a/qpid/dotnet/Qpid.Common/Qpid.Common.csproj
+++ /dev/null
@@ -1,213 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <PropertyGroup>

-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ProductVersion>8.0.50727</ProductVersion>

-    <SchemaVersion>2.0</SchemaVersion>

-    <ProjectGuid>{77064C42-24D2-4CEB-9EA2-0EF481A43205}</ProjectGuid>

-    <OutputType>Library</OutputType>

-    <AppDesignerFolder>Properties</AppDesignerFolder>

-    <RootNamespace>Apache.Qpid</RootNamespace>

-    <AssemblyName>Apache.Qpid.Common</AssemblyName>

-    <SignAssembly>false</SignAssembly>

-    <AssemblyOriginatorKeyFile>

-    </AssemblyOriginatorKeyFile>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

-    <DebugSymbols>true</DebugSymbols>

-    <DebugType>full</DebugType>

-    <Optimize>false</Optimize>

-    <OutputPath>..\bin\net-2.0\debug\</OutputPath>

-    <DefineConstants>DEBUG;TRACE</DefineConstants>

-    <ErrorReport>prompt</ErrorReport>

-    <WarningLevel>4</WarningLevel>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

-    <DebugType>pdbonly</DebugType>

-    <Optimize>true</Optimize>

-    <OutputPath>..\bin\net-2.0\release\</OutputPath>

-    <DefineConstants>TRACE</DefineConstants>

-    <ErrorReport>prompt</ErrorReport>

-    <WarningLevel>4</WarningLevel>

-  </PropertyGroup>

-  <ItemGroup>

-    <Reference Include="log4net, Version=1.2.9.0, Culture=neutral, PublicKeyToken=b32731d11ce58905">

-      <SpecificVersion>False</SpecificVersion>

-      <HintPath>lib\log4net\log4net.dll</HintPath>

-    </Reference>

-    <Reference Include="System" />

-    <Reference Include="System.Data" />

-    <Reference Include="System.Xml" />

-  </ItemGroup>

-  <ItemGroup>

-    <Compile Include="AMQChannelClosedException.cs" />

-    <Compile Include="AMQConnectionClosedException.cs" />

-    <Compile Include="AMQDisconnectedException.cs" />

-    <Compile Include="AMQException.cs" />

-    <Compile Include="AMQInvalidArgumentException.cs" />

-    <Compile Include="AMQInvalidRoutingKeyException.cs" />

-    <Compile Include="AMQUndeliveredException.cs" />

-    <Compile Include="AssemblySettings.cs" />

-    <Compile Include="Collections\LinkedHashtable.cs" />

-    <Compile Include="Collections\ConsumerProducerQueue.cs" />

-    <Compile Include="Framing\AMQDataBlockDecoder.cs" />

-    <Compile Include="Framing\AMQDataBlockEncoder.cs" />

-    <Compile Include="Framing\AMQFrame.cs" />

-    <Compile Include="Framing\AMQMethodBody.cs" />

-    <Compile Include="Framing\AMQMethodBodyFactory.cs" />

-    <Compile Include="Framing\AMQProtocolHeaderException.cs" />

-    <Compile Include="Framing\AMQType.cs" />

-    <Compile Include="Framing\BasicContentHeaderProperties.cs" />

-    <Compile Include="Framing\CompositeAMQDataBlock.cs" />

-    <Compile Include="Framing\ContentBody.cs" />

-    <Compile Include="Framing\ContentBodyFactory.cs" />

-    <Compile Include="Framing\ContentHeaderBody.cs" />

-    <Compile Include="Framing\ContentHeaderBodyFactory.cs" />

-    <Compile Include="Framing\ContentHeaderPropertiesFactory.cs" />

-    <Compile Include="Framing\AMQTypedValue.cs" />

-    <Compile Include="Framing\AMQTypeMap.cs" />

-    <Compile Include="Framing\EncodingUtils.cs" />

-    <Compile Include="Framing\FieldTable.cs" />

-    <Compile Include="Framing\HeartbeatBody.cs" />

-    <Compile Include="Framing\HeartbeatBodyFactory.cs" />

-    <Compile Include="Framing\IBody.cs" />

-    <Compile Include="Framing\IDataBlock.cs" />

-    <Compile Include="Framing\AMQFrameDecodingException.cs" />

-    <Compile Include="Framing\IEncodableAMQDataBlock.cs" />

-    <Compile Include="Framing\IBodyFactory.cs" />

-    <Compile Include="Framing\IContentHeaderProperties.cs" />

-    <Compile Include="Framing\ProtocolInitiation.cs" />

-    <Compile Include="generated\AccessRequestBody.cs" />

-    <Compile Include="generated\AccessRequestOkBody.cs" />

-    <Compile Include="generated\BasicAckBody.cs" />

-    <Compile Include="generated\BasicCancelBody.cs" />

-    <Compile Include="generated\BasicCancelOkBody.cs" />

-    <Compile Include="generated\BasicConsumeBody.cs" />

-    <Compile Include="generated\BasicConsumeOkBody.cs" />

-    <Compile Include="generated\BasicDeliverBody.cs" />

-    <Compile Include="generated\BasicGetBody.cs" />

-    <Compile Include="generated\BasicGetEmptyBody.cs" />

-    <Compile Include="generated\BasicGetOkBody.cs" />

-    <Compile Include="generated\BasicPublishBody.cs" />

-    <Compile Include="generated\BasicQosBody.cs" />

-    <Compile Include="generated\BasicQosOkBody.cs" />

-    <Compile Include="generated\BasicRecoverBody.cs" />

-    <Compile Include="generated\BasicRecoverOkBody.cs" />

-    <Compile Include="generated\BasicRejectBody.cs" />

-    <Compile Include="generated\BasicReturnBody.cs" />

-    <Compile Include="generated\ChannelAlertBody.cs" />

-    <Compile Include="generated\ChannelCloseBody.cs" />

-    <Compile Include="generated\ChannelCloseOkBody.cs" />

-    <Compile Include="generated\ChannelFlowBody.cs" />

-    <Compile Include="generated\ChannelFlowOkBody.cs" />

-    <Compile Include="generated\ChannelOpenBody.cs" />

-    <Compile Include="generated\ChannelOpenOkBody.cs" />

-    <Compile Include="generated\ConnectionCloseBody.cs" />

-    <Compile Include="generated\ConnectionCloseOkBody.cs" />

-    <Compile Include="generated\ConnectionOpenBody.cs" />

-    <Compile Include="generated\ConnectionOpenOkBody.cs" />

-    <Compile Include="generated\ConnectionRedirectBody.cs" />

-    <Compile Include="generated\ConnectionSecureBody.cs" />

-    <Compile Include="generated\ConnectionSecureOkBody.cs" />

-    <Compile Include="generated\ConnectionStartBody.cs" />

-    <Compile Include="generated\ConnectionStartOkBody.cs" />

-    <Compile Include="generated\ConnectionTuneBody.cs" />

-    <Compile Include="generated\ConnectionTuneOkBody.cs" />

-    <Compile Include="generated\DtxSelectBody.cs" />

-    <Compile Include="generated\DtxSelectOkBody.cs" />

-    <Compile Include="generated\DtxStartBody.cs" />

-    <Compile Include="generated\DtxStartOkBody.cs" />

-    <Compile Include="generated\ExchangeBoundBody.cs" />

-    <Compile Include="generated\ExchangeBoundOkBody.cs" />

-    <Compile Include="generated\ExchangeDeclareBody.cs" />

-    <Compile Include="generated\ExchangeDeclareOkBody.cs" />

-    <Compile Include="generated\ExchangeDeleteBody.cs" />

-    <Compile Include="generated\ExchangeDeleteOkBody.cs" />

-    <Compile Include="generated\FileAckBody.cs" />

-    <Compile Include="generated\FileCancelBody.cs" />

-    <Compile Include="generated\FileCancelOkBody.cs" />

-    <Compile Include="generated\FileConsumeBody.cs" />

-    <Compile Include="generated\FileConsumeOkBody.cs" />

-    <Compile Include="generated\FileDeliverBody.cs" />

-    <Compile Include="generated\FileOpenBody.cs" />

-    <Compile Include="generated\FileOpenOkBody.cs" />

-    <Compile Include="generated\FilePublishBody.cs" />

-    <Compile Include="generated\FileQosBody.cs" />

-    <Compile Include="generated\FileQosOkBody.cs" />

-    <Compile Include="generated\FileRejectBody.cs" />

-    <Compile Include="generated\FileReturnBody.cs" />

-    <Compile Include="generated\FileStageBody.cs" />

-    <Compile Include="generated\MainRegistry.cs" />

-    <Compile Include="generated\MethodBodyDecoderRegistry.cs" />

-    <Compile Include="generated\QueueBindBody.cs" />

-    <Compile Include="generated\QueueBindOkBody.cs" />

-    <Compile Include="generated\QueueDeclareBody.cs" />

-    <Compile Include="generated\QueueDeclareOkBody.cs" />

-    <Compile Include="generated\QueueDeleteBody.cs" />

-    <Compile Include="generated\QueueDeleteOkBody.cs" />

-    <Compile Include="generated\QueuePurgeBody.cs" />

-    <Compile Include="generated\QueuePurgeOkBody.cs" />

-    <Compile Include="generated\StreamCancelBody.cs" />

-    <Compile Include="generated\StreamCancelOkBody.cs" />

-    <Compile Include="generated\StreamConsumeBody.cs" />

-    <Compile Include="generated\StreamConsumeOkBody.cs" />

-    <Compile Include="generated\StreamDeliverBody.cs" />

-    <Compile Include="generated\StreamPublishBody.cs" />

-    <Compile Include="generated\StreamQosBody.cs" />

-    <Compile Include="generated\StreamQosOkBody.cs" />

-    <Compile Include="generated\StreamReturnBody.cs" />

-    <Compile Include="generated\TestContentBody.cs" />

-    <Compile Include="generated\TestContentOkBody.cs" />

-    <Compile Include="generated\TestIntegerBody.cs" />

-    <Compile Include="generated\TestIntegerOkBody.cs" />

-    <Compile Include="generated\TestStringBody.cs" />

-    <Compile Include="generated\TestStringOkBody.cs" />

-    <Compile Include="generated\TestTableBody.cs" />

-    <Compile Include="generated\TestTableOkBody.cs" />

-    <Compile Include="generated\TunnelRequestBody.cs" />

-    <Compile Include="generated\TxCommitBody.cs" />

-    <Compile Include="generated\TxCommitOkBody.cs" />

-    <Compile Include="generated\TxRollbackBody.cs" />

-    <Compile Include="generated\TxRollbackOkBody.cs" />

-    <Compile Include="generated\TxSelectBody.cs" />

-    <Compile Include="generated\TxSelectOkBody.cs" />

-    <Compile Include="Collections\BlockingQueue.cs" />

-    <Compile Include="Collections\LinkedBlockingQueue.cs" />

-    <Compile Include="Collections\SynchronousQueue.cs" />

-    <Compile Include="Properties\AssemblyInfo.cs" />

-    <Compile Include="Protocol\AMQConstant.cs" />

-  </ItemGroup>

-  <ItemGroup>

-    <ProjectReference Include="..\Qpid.Buffer\Qpid.Buffer.csproj">

-      <Project>{44384DF2-B0A4-4580-BDBC-EE4BAA87D995}</Project>

-      <Name>Qpid.Buffer</Name>

-    </ProjectReference>

-    <ProjectReference Include="..\Qpid.Codec\Qpid.Codec.csproj">

-      <Project>{22D0D0C2-77AF-4DE3-B456-7FF3893F9F88}</Project>

-      <Name>Qpid.Codec</Name>

-    </ProjectReference>

-    <ProjectReference Include="..\Qpid.Messaging\Qpid.Messaging.csproj">

-      <Project>{6688F826-C58E-4C1B-AA1F-22AFAB4B7D07}</Project>

-      <Name>Qpid.Messaging</Name>

-    </ProjectReference>

-  </ItemGroup>

-  <ItemGroup>

-    <Content Include="stylesheets\csharp.xsl" />

-    <Content Include="stylesheets\framing.xsl" />

-    <Content Include="stylesheets\java.xsl" />

-    <Content Include="stylesheets\prepare1.xsl" />

-    <Content Include="stylesheets\prepare2.xsl" />

-    <Content Include="stylesheets\prepare3.xsl" />

-    <Content Include="stylesheets\readme.txt" />

-    <Content Include="stylesheets\registry.xsl" />

-    <Content Include="stylesheets\utils.xsl" />

-  </ItemGroup>

-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

-       Other similar extension points exist, see Microsoft.Common.targets.

-  <Target Name="BeforeBuild">

-  </Target>

-  <Target Name="AfterBuild">

-  </Target>

-  -->

-</Project>

diff --git a/qpid/dotnet/Qpid.Common/amqp.xml b/qpid/dotnet/Qpid.Common/amqp.xml
deleted file mode 100644
index 8ad0f17a2c..0000000000
--- a/qpid/dotnet/Qpid.Common/amqp.xml
+++ /dev/null
@@ -1,3908 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
-Copyright Notice
-================
-© Copyright JPMorgan Chase Bank & Co., Cisco Systems, Inc., Envoy Technologies Inc.,
-iMatix Corporation, IONA� Technologies, Red Hat, Inc.,
-TWIST Process Innovations, and 29West Inc. 2006. All rights reserved.
-
-License
-=======
-JPMorgan Chase Bank & Co., Cisco Systems, Inc., Envoy Technologies Inc., iMatix 
-Corporation, IONA� Technologies, Red Hat, Inc., TWIST Process Innovations, and 
-29West Inc. (collectively, the "Authors") each hereby grants to you a worldwide,
-perpetual, royalty-free, nontransferable, nonexclusive license to
-(i) copy, display, and implement the Advanced Messaging Queue Protocol
-("AMQP") Specification and (ii) the Licensed Claims that are held by
-the Authors, all for the purpose of implementing the Advanced Messaging
-Queue Protocol Specification. Your license and any rights under this
-Agreement will terminate immediately without notice from
-any Author if you bring any claim, suit, demand, or action related to
-the Advanced Messaging Queue Protocol Specification against any Author.
-Upon termination, you shall destroy all copies of the Advanced Messaging
-Queue Protocol Specification in your possession or control.
-
-As used hereunder, "Licensed Claims" means those claims of a patent or
-patent application, throughout the world, excluding design patents and
-design registrations, owned or controlled, or that can be sublicensed
-without fee and in compliance with the requirements of this
-Agreement, by an Author or its affiliates now or at any
-future time and which would necessarily be infringed by implementation
-of the Advanced Messaging Queue Protocol Specification. A claim is
-necessarily infringed hereunder only when it is not possible to avoid
-infringing it because there is no plausible non-infringing alternative
-for implementing the required portions of the Advanced Messaging Queue
-Protocol Specification. Notwithstanding the foregoing, Licensed Claims
-shall not include any claims other than as set forth above even if
-contained in the same patent as Licensed Claims; or that read solely
-on any implementations of any portion of the Advanced Messaging Queue
-Protocol Specification that are not required by the Advanced Messaging
-Queue Protocol Specification, or that, if licensed, would require a
-payment of royalties by the licensor to unaffiliated third parties.
-Moreover, Licensed Claims shall not include (i) any enabling technologies
-that may be necessary to make or use any Licensed Product but are not
-themselves expressly set forth in the Advanced Messaging Queue Protocol
-Specification (e.g., semiconductor manufacturing technology, compiler
-technology, object oriented technology, networking technology, operating
-system technology, and the like); or (ii) the implementation of other
-published standards developed elsewhere and merely referred to in the
-body of the Advanced Messaging Queue Protocol Specification, or
-(iii) any Licensed Product and any combinations thereof the purpose or
-function of which is not required for compliance with the Advanced
-Messaging Queue Protocol Specification. For purposes of this definition,
-the Advanced Messaging Queue Protocol Specification shall be deemed to
-include both architectural and interconnection requirements essential
-for interoperability and may also include supporting source code artifacts
-where such architectural, interconnection requirements and source code
-artifacts are expressly identified as being required or documentation to
-achieve compliance with the Advanced Messaging Queue Protocol Specification.
-
-As used hereunder, "Licensed Products" means only those specific portions
-of products (hardware, software or combinations thereof) that implement
-and are compliant with all relevant portions of the Advanced Messaging
-Queue Protocol Specification.
-
-The following disclaimers, which you hereby also acknowledge as to any
-use you may make of the Advanced Messaging Queue Protocol Specification:
-
-THE ADVANCED MESSAGING QUEUE PROTOCOL SPECIFICATION IS PROVIDED "AS IS,"
-AND THE AUTHORS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
-IMPLIED, INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, OR TITLE; THAT THE
-CONTENTS OF THE ADVANCED MESSAGING QUEUE PROTOCOL SPECIFICATION ARE
-SUITABLE FOR ANY PURPOSE; NOR THAT THE IMPLEMENTATION OF THE ADVANCED
-MESSAGING QUEUE PROTOCOL SPECIFICATION WILL NOT INFRINGE ANY THIRD PARTY 
-PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
-
-THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL,
-INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY
-USE, IMPLEMENTATION OR DISTRIBUTION OF THE ADVANCED MESSAGING QUEUE
-PROTOCOL SPECIFICATION.
-
-The name and trademarks of the Authors may NOT be used in any manner,
-including advertising or publicity pertaining to the Advanced Messaging
-Queue Protocol Specification or its contents without specific, written
-prior permission. Title to copyright in the Advanced Messaging Queue
-Protocol Specification will at all times remain with the Authors.
-
-No other rights are granted by implication, estoppel or otherwise.
-
-Upon termination of your license or rights under this Agreement, you
-shall destroy all copies of the Advanced Messaging Queue Protocol
-Specification in your possession or control.
-
-Trademarks
-==========
-"JPMorgan", "JPMorgan Chase", "Chase", the JPMorgan Chase logo and the
-Octagon Symbol are trademarks of JPMorgan Chase & Co.
-
-IMATIX and the iMatix logo are trademarks of iMatix Corporation sprl.
-
-IONA, IONA Technologies, and the IONA logos are trademarks of IONA
-Technologies PLC and/or its subsidiaries.
-
-LINUX is a trademark of Linus Torvalds. RED HAT and JBOSS are registered
-trademarks of Red Hat, Inc. in the US and other countries.
-
-Java, all Java-based trademarks and OpenOffice.org are trademarks of
-Sun Microsystems, Inc. in the United States, other countries, or both.
-
-Other company, product, or service names may be trademarks or service
-marks of others.
-
-Links to full AMQP specification:
-=================================
-http://www.envoytech.org/spec/amq/
-http://www.iona.com/opensource/amqp/
-http://www.redhat.com/solutions/specifications/amqp/
-http://www.twiststandards.org/tiki-index.php?page=AMQ
-http://www.imatix.com/amqp
-
--->
-
-<amqp major="8" minor="0" port="5672" comment="AMQ protocol 0.80">
-    AMQ Protocol 0.80
-<!--
-======================================================
-==       CONSTANTS
-======================================================
--->
-  <constant name="frame method" value="1"/>
-  <constant name="frame header" value="2"/>
-  <constant name="frame body" value="3"/>
-  <constant name="frame oob method" value="4"/>
-  <constant name="frame oob header" value="5"/>
-  <constant name="frame oob body" value="6"/>
-  <constant name="frame trace" value="7"/>
-  <constant name="frame heartbeat" value="8"/>
-  <constant name="frame min size" value="4096"/>
-  <constant name="frame end" value="206"/>
-  <constant name="reply success" value="200">
-  Indicates that the method completed successfully. This reply code is
-  reserved for future use - the current protocol design does not use
-  positive confirmation and reply codes are sent only in case of an
-  error.
-</constant>
-  <constant name="not delivered" value="310" class="soft error">
-  The client asked for a specific message that is no longer available.
-  The message was delivered to another client, or was purged from the
-  queue for some other reason.
-</constant>
-  <constant name="content too large" value="311" class="soft error">
-  The client attempted to transfer content larger than the server
-  could accept at the present time.  The client may retry at a later
-  time.
-</constant>
-  <constant name="connection forced" value="320" class="hard error">
-  An operator intervened to close the connection for some reason.
-  The client may retry at some later date.
-</constant>
-  <constant name="invalid path" value="402" class="hard error">
-  The client tried to work with an unknown virtual host or cluster.
-</constant>
-  <constant name="access refused" value="403" class="soft error">
-  The client attempted to work with a server entity to which it has
-  no  due to security settings.
-</constant>
-  <constant name="not found" value="404" class="soft error">
-  The client attempted to work with a server entity that does not exist.
-</constant>
-  <constant name="resource locked" value="405" class="soft error">
-  The client attempted to work with a server entity to which it has
-  no access because another client is working with it.
-</constant>
-  <constant name="frame error" value="501" class="hard error">
-  The client sent a malformed frame that the server could not decode.
-  This strongly implies a programming error in the client.
-</constant>
-  <constant name="syntax error" value="502" class="hard error">
-  The client sent a frame that contained illegal values for one or more
-  fields.  This strongly implies a programming error in the client.
-</constant>
-  <constant name="command invalid" value="503" class="hard error">
-  The client sent an invalid sequence of frames, attempting to perform
-  an operation that was considered invalid by the server. This usually
-  implies a programming error in the client.
-</constant>
-  <constant name="channel error" value="504" class="hard error">
-  The client attempted to work with a channel that had not been
-  correctly opened.  This most likely indicates a fault in the client
-  layer.
-</constant>
-  <constant name="resource error" value="506" class="hard error">
-  The server could not complete the method because it lacked sufficient
-  resources. This may be due to the client creating too many of some
-  type of entity.
-</constant>
-  <constant name="not allowed" value="530" class="hard error">
-  The client tried to work with some entity in a manner that is
-  prohibited by the server, due to security settings or by some other
-  criteria.
-</constant>
-  <constant name="not implemented" value="540" class="hard error">
-  The client tried to use functionality that is not implemented in the
-  server.
-</constant>
-  <constant name="internal error" value="541" class="hard error">
-  The server could not complete the method because of an internal error.
-  The server may require intervention by an operator in order to resume
-  normal operations.
-</constant>
-  <!--
-======================================================
-==       DOMAIN TYPES
-======================================================
--->
-  <domain name="access ticket" type="short">
-    access ticket granted by server
-    <doc>
-    An access ticket granted by the server for a certain set of access
-    rights within a specific realm. Access tickets are valid within the
-    channel where they were created, and expire when the channel closes.
-    </doc>
-    <assert check="ne" value="0"/>
-  </domain>
-  <domain name="class id" type="short"/>
-  <domain name="consumer tag" type="shortstr">
-    consumer tag
-    <doc>
-      Identifier for the consumer, valid within the current connection.
-    </doc>
-    <rule implement="MUST">
-      The consumer tag is valid only within the channel from which the
-      consumer was created. I.e. a client MUST NOT create a consumer in
-      one channel and then use it in another.
-    </rule>
-  </domain>
-  <domain name="delivery tag" type="longlong">
-    server-assigned delivery tag
-    <doc>
-      The server-assigned and channel-specific delivery tag
-    </doc>
-    <rule implement="MUST">
-      The delivery tag is valid only within the channel from which the
-      message was received.  I.e. a client MUST NOT receive a message on
-      one channel and then acknowledge it on another.
-    </rule>
-    <rule implement="MUST">
-      The server MUST NOT use a zero value for delivery tags.  Zero is
-      reserved for client use, meaning "all messages so far received".
-    </rule>
-  </domain>
-  <domain name="exchange name" type="shortstr">
-    exchange name
-    <doc>
-      The exchange name is a client-selected string that identifies
-      the exchange for publish methods.  Exchange names may consist
-      of any mixture of digits, letters, and underscores.  Exchange
-      names are scoped by the virtual host.
-    </doc>
-    <assert check="length" value="127"/>
-  </domain>
-  <domain name="known hosts" type="shortstr">
-list of known hosts
-<doc>
-Specifies the list of equivalent or alternative hosts that the server
-knows about, which will normally include the current server itself.
-Clients can cache this information and use it when reconnecting to a
-server after a failure.
-</doc>
-    <rule implement="MAY">
-The server MAY leave this field empty if it knows of no other
-hosts than itself.
-</rule>
-  </domain>
-  <domain name="method id" type="short"/>
-  <domain name="no ack" type="bit">
-    no acknowledgement needed
-    <doc>
-      If this field is set the server does not expect acknowledgments
-      for messages.  That is, when a message is delivered to the client
-      the server automatically and silently acknowledges it on behalf
-      of the client.  This functionality increases performance but at
-      the cost of reliability.  Messages can get lost if a client dies
-      before it can deliver them to the application.
-    </doc>
-  </domain>
-  <domain name="no local" type="bit">
-    do not deliver own messages
-    <doc>
-    If the no-local field is set the server will not send messages to
-    the client that published them.
-    </doc>
-  </domain>
-  <domain name="path" type="shortstr">
-    <doc>
-  Must start with a slash "/" and continue with path names
-  separated by slashes. A path name consists of any combination
-  of at least one of [A-Za-z0-9] plus zero or more of [.-_+!=:].
-</doc>
-    <assert check="notnull"/>
-    <assert check="syntax" rule="path"/>
-    <assert check="length" value="127"/>
-  </domain>
-  <domain name="peer properties" type="table">
-    <doc>
-This string provides a set of peer properties, used for
-identification, debugging, and general information.
-</doc>
-    <rule implement="SHOULD">
-The properties SHOULD contain these fields:
-"product", giving the name of the peer product, "version", giving
-the name of the peer version, "platform", giving the name of the
-operating system, "copyright", if appropriate, and "information",
-giving other general information.
-</rule>
-  </domain>
-  <domain name="queue name" type="shortstr">
-    queue name
-    <doc>
-    The queue name identifies the queue within the vhost.  Queue
-    names may consist of any mixture of digits, letters, and
-    underscores.
-    </doc>
-    <assert check="length" value="127"/>
-  </domain>
-  <domain name="redelivered" type="bit">
-    message is being redelivered
-    <doc>
-      This indicates that the message has been previously delivered to
-      this or another client.
-    </doc>
-    <rule implement="SHOULD">
-      The server SHOULD try to signal redelivered messages when it can.
-      When redelivering a message that was not successfully acknowledged,
-      the server SHOULD deliver it to the original client if possible.
-    </rule>
-    <rule implement="MUST">
-      The client MUST NOT rely on the redelivered field but MUST take it
-      as a hint that the message may already have been processed.  A
-      fully robust client must be able to track duplicate received messages
-      on non-transacted, and locally-transacted channels.
-    </rule>
-  </domain>
-  <domain name="reply code" type="short">
-reply code from server
-<doc>
-  The reply code. The AMQ reply codes are defined in AMQ RFC 011.
-</doc>
-    <assert check="notnull"/>
-  </domain>
-  <domain name="reply text" type="shortstr">
-localised reply text
-<doc>
-  The localised reply text.  This text can be logged as an aid to
-  resolving issues.
-</doc>
-    <assert check="notnull"/>
-  </domain>
-  <class name="connection" handler="connection" index="10">
-    <!--
-======================================================
-==       CONNECTION
-======================================================
--->
-  work with socket connections
-<doc>
-  The connection class provides methods for a client to establish a
-  network connection to a server, and for both peers to operate the
-  connection thereafter.
-</doc>
-    <doc name="grammar">
-    connection          = open-connection *use-connection close-connection
-    open-connection     = C:protocol-header
-                          S:START C:START-OK
-                          *challenge
-                          S:TUNE C:TUNE-OK
-                          C:OPEN S:OPEN-OK | S:REDIRECT
-    challenge           = S:SECURE C:SECURE-OK
-    use-connection      = *channel
-    close-connection    = C:CLOSE S:CLOSE-OK
-                        / S:CLOSE C:CLOSE-OK
-</doc>
-    <chassis name="server" implement="MUST"/>
-    <chassis name="client" implement="MUST"/>
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-    <method name="start" synchronous="1" index="10">
-  start connection negotiation
-  <doc>
-    This method starts the connection negotiation process by telling
-    the client the protocol version that the server proposes, along
-    with a list of security mechanisms which the client can use for
-    authentication.
-  </doc>
-      <rule implement="MUST">
-    If the client cannot handle the protocol version suggested by the
-    server it MUST close the socket connection.
-  </rule>
-      <rule implement="MUST">
-    The server MUST provide a protocol version that is lower than or
-    equal to that requested by the client in the protocol header. If
-    the server cannot support the specified protocol it MUST NOT send
-    this method, but MUST close the socket connection.
-  </rule>
-      <chassis name="client" implement="MUST"/>
-      <response name="start-ok"/>
-      <field name="version major" type="octet">
-    protocol major version
-    <doc>
-      The protocol major version that the server agrees to use, which
-      cannot be higher than the client's major version.
-    </doc>
-      </field>
-      <field name="version minor" type="octet">
-    protocol major version
-    <doc>
-      The protocol minor version that the server agrees to use, which
-      cannot be higher than the client's minor version.
-    </doc>
-      </field>
-      <field name="server properties" domain="peer properties">
-    server properties
-  </field>
-      <field name="mechanisms" type="longstr">
-    available security mechanisms
-    <doc>
-      A list of the security mechanisms that the server supports, delimited
-      by spaces.  Currently ASL supports these mechanisms: PLAIN.
-    </doc>
-        <see name="security mechanisms"/>
-        <assert check="notnull"/>
-      </field>
-      <field name="locales" type="longstr">
-    available message locales
-    <doc>
-      A list of the message locales that the server supports, delimited
-      by spaces.  The locale defines the language in which the server
-      will send reply texts.
-    </doc>
-        <rule implement="MUST">
-      All servers MUST support at least the en_US locale.
-    </rule>
-        <assert check="notnull"/>
-      </field>
-    </method>
-    <method name="start-ok" synchronous="1" index="11">
-  select security mechanism and locale
-  <doc>
-    This method selects a SASL security mechanism. ASL uses SASL
-    (RFC2222) to negotiate authentication and encryption.
-  </doc>
-      <chassis name="server" implement="MUST"/>
-      <field name="client properties" domain="peer properties">
-    client properties
-  </field>
-      <field name="mechanism" type="shortstr">
-    selected security mechanism
-    <doc>
-      A single security mechanisms selected by the client, which must be
-      one of those specified by the server.
-    </doc>
-        <rule implement="SHOULD">
-      The client SHOULD authenticate using the highest-level security
-      profile it can handle from the list provided by the server.
-    </rule>
-        <rule implement="MUST">
-    The mechanism field MUST contain one of the security mechanisms
-    proposed by the server in the Start method. If it doesn't, the
-    server MUST close the socket.
-    </rule>
-        <assert check="notnull"/>
-      </field>
-      <field name="response" type="longstr">
-    security response data
-    <doc>
-      A block of opaque data passed to the security mechanism. The contents
-      of this data are defined by the SASL security mechanism.  For the
-      PLAIN security mechanism this is defined as a field table holding
-      two fields, LOGIN and PASSWORD.
-    </doc>
-        <assert check="notnull"/>
-      </field>
-      <field name="locale" type="shortstr">
-    selected message locale
-    <doc>
-      A single message local selected by the client, which must be one
-      of those specified by the server.
-    </doc>
-        <assert check="notnull"/>
-      </field>
-    </method>
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-    <method name="secure" synchronous="1" index="20">
-  security mechanism challenge
-  <doc>
-    The SASL protocol works by exchanging challenges and responses until
-    both peers have received sufficient information to authenticate each
-    other.  This method challenges the client to provide more information.
-  </doc>
-      <chassis name="client" implement="MUST"/>
-      <response name="secure-ok"/>
-      <field name="challenge" type="longstr">
-    security challenge data
-    <doc>
-      Challenge information, a block of opaque binary data passed to
-      the security mechanism.
-    </doc>
-        <see name="security mechanisms"/>
-      </field>
-    </method>
-    <method name="secure-ok" synchronous="1" index="21">
-  security mechanism response
-  <doc>
-    This method attempts to authenticate, passing a block of SASL data
-    for the security mechanism at the server side.
-  </doc>
-      <chassis name="server" implement="MUST"/>
-      <field name="response" type="longstr">
-    security response data
-    <doc>
-      A block of opaque data passed to the security mechanism.  The contents
-      of this data are defined by the SASL security mechanism.
-    </doc>
-        <assert check="notnull"/>
-      </field>
-    </method>
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-    <method name="tune" synchronous="1" index="30">
-  propose connection tuning parameters
-  <doc>
-    This method proposes a set of connection configuration values
-    to the client.  The client can accept and/or adjust these.
-  </doc>
-      <chassis name="client" implement="MUST"/>
-      <response name="tune-ok"/>
-      <field name="channel max" type="short">
-    proposed maximum channels
-    <doc>
-      The maximum total number of channels that the server allows
-      per connection. Zero means that the server does not impose a
-      fixed limit, but the number of allowed channels may be limited
-      by available server resources.
-    </doc>
-      </field>
-      <field name="frame max" type="long">
-    proposed maximum frame size
-    <doc>
-      The largest frame size that the server proposes for the
-      connection. The client can negotiate a lower value.  Zero means
-      that the server does not impose any specific limit but may reject
-      very large frames if it cannot allocate resources for them.
-    </doc>
-        <rule implement="MUST">
-      Until the frame-max has been negotiated, both peers MUST accept
-      frames of up to 4096 octets large. The minimum non-zero value for
-      the frame-max field is 4096.
-    </rule>
-      </field>
-      <field name="heartbeat" type="short">
-    desired heartbeat delay
-    <doc>
-      The delay, in seconds, of the connection heartbeat that the server
-      wants.  Zero means the server does not want a heartbeat.
-    </doc>
-      </field>
-    </method>
-    <method name="tune-ok" synchronous="1" index="31">
-  negotiate connection tuning parameters
-  <doc>
-    This method sends the client's connection tuning parameters to the
-    server. Certain fields are negotiated, others provide capability
-    information.
-  </doc>
-      <chassis name="server" implement="MUST"/>
-      <field name="channel max" type="short">
-    negotiated maximum channels
-    <doc>
-      The maximum total number of channels that the client will use
-      per connection.  May not be higher than the value specified by
-      the server.
-    </doc>
-        <rule implement="MAY">
-      The server MAY ignore the channel-max value or MAY use it for
-      tuning its resource allocation.
-    </rule>
-        <assert check="notnull"/>
-        <assert check="le" method="tune" field="channel max"/>
-      </field>
-      <field name="frame max" type="long">
-    negotiated maximum frame size
-    <doc>
-      The largest frame size that the client and server will use for
-      the connection.  Zero means that the client does not impose any
-      specific limit but may reject very large frames if it cannot
-      allocate resources for them.  Note that the frame-max limit
-      applies principally to content frames, where large contents
-      can be broken into frames of arbitrary size.
-    </doc>
-        <rule implement="MUST">
-      Until the frame-max has been negotiated, both peers must accept
-      frames of up to 4096 octets large. The minimum non-zero value for
-      the frame-max field is 4096.
-    </rule>
-      </field>
-      <field name="heartbeat" type="short">
-    desired heartbeat delay
-    <doc>
-      The delay, in seconds, of the connection heartbeat that the client
-      wants. Zero means the client does not want a heartbeat.
-    </doc>
-      </field>
-    </method>
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-    <method name="open" synchronous="1" index="40">
-  open connection to virtual host
-  <doc>
-    This method opens a connection to a virtual host, which is a
-    collection of resources, and acts to separate multiple application
-    domains within a server.
-  </doc>
-      <rule implement="MUST">
-    The client MUST open the context before doing any work on the
-    connection.
-  </rule>
-      <chassis name="server" implement="MUST"/>
-      <response name="open-ok"/>
-      <response name="redirect"/>
-      <field name="virtual host" domain="path">
-    virtual host name
-    <assert check="regexp" value="^[a-zA-Z0-9/-_]+$"/>
-        <doc>
-      The name of the virtual host to work with.
-    </doc>
-        <rule implement="MUST">
-      If the server supports multiple virtual hosts, it MUST enforce a
-      full separation of exchanges, queues, and all associated entities
-      per virtual host. An application, connected to a specific virtual
-      host, MUST NOT be able to access resources of another virtual host.
-    </rule>
-        <rule implement="SHOULD">
-      The server SHOULD verify that the client has permission to access
-      the specified virtual host.
-    </rule>
-        <rule implement="MAY">
-      The server MAY configure arbitrary limits per virtual host, such
-      as the number of each type of entity that may be used, per
-      connection and/or in total.
-    </rule>
-      </field>
-      <field name="capabilities" type="shortstr">
-    required capabilities
-    <doc>
-      The client may specify a number of capability names, delimited by
-      spaces.  The server can use this string to how to process the
-      client's connection request.
-    </doc>
-      </field>
-      <field name="insist" type="bit">
-    insist on connecting to server
-    <doc>
-      In a configuration with multiple load-sharing servers, the server
-      may respond to a Connection.Open method with a Connection.Redirect.
-      The insist option tells the server that the client is insisting on
-      a connection to the specified server.
-    </doc>
-        <rule implement="SHOULD">
-      When the client uses the insist option, the server SHOULD accept
-      the client connection unless it is technically unable to do so.
-    </rule>
-      </field>
-    </method>
-    <method name="open-ok" synchronous="1" index="41">
-  signal that the connection is ready
-  <doc>
-    This method signals to the client that the connection is ready for
-    use.
-  </doc>
-      <chassis name="client" implement="MUST"/>
-      <field name="known hosts" domain="known hosts"/>
-    </method>
-    <method name="redirect" synchronous="1" index="50">
-  asks the client to use a different server
-  <doc>
-    This method redirects the client to another server, based on the
-    requested virtual host and/or capabilities.
-  </doc>
-      <rule implement="SHOULD">
-    When getting the Connection.Redirect method, the client SHOULD
-    reconnect to the host specified, and if that host is not present,
-    to any of the hosts specified in the known-hosts list.
-  </rule>
-      <chassis name="client" implement="MAY"/>
-      <field name="host" type="shortstr">
-    server to connect to
-    <doc>
-      Specifies the server to connect to.  This is an IP address or a
-      DNS name, optionally followed by a colon and a port number. If
-      no port number is specified, the client should use the default
-      port number for the protocol.
-    </doc>
-        <assert check="notnull"/>
-      </field>
-      <field name="known hosts" domain="known hosts"/>
-    </method>
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-    <method name="close" synchronous="1" index="60">
-  request a connection close
-  <doc>
-    This method indicates that the sender wants to close the connection.
-    This may be due to internal conditions (e.g. a forced shut-down) or
-    due to an error handling a specific method, i.e. an exception.  When
-    a close is due to an exception, the sender provides the class and
-    method id of the method which caused the exception.
-  </doc>
-      <rule implement="MUST">
-    After sending this method any received method except the Close-OK
-    method MUST be discarded.
-  </rule>
-      <rule implement="MAY">
-    The peer sending this method MAY use a counter or timeout to
-    detect failure of the other peer to respond correctly with
-    the Close-OK method.
-  </rule>
-      <rule implement="MUST">
-    When a server receives the Close method from a client it MUST
-    delete all server-side resources associated with the client's
-    context.  A client CANNOT reconnect to a context after sending
-    or receiving a Close method.
-  </rule>
-      <chassis name="client" implement="MUST"/>
-      <chassis name="server" implement="MUST"/>
-      <response name="close-ok"/>
-      <field name="reply code" domain="reply code"/>
-      <field name="reply text" domain="reply text"/>
-      <field name="class id" domain="class id">
-    failing method class
-    <doc>
-      When the close is provoked by a method exception, this is the
-      class of the method.
-    </doc>
-      </field>
-      <field name="method id" domain="class id">
-    failing method ID
-    <doc>
-      When the close is provoked by a method exception, this is the
-      ID of the method.
-    </doc>
-      </field>
-    </method>
-    <method name="close-ok" synchronous="1" index="61">
-  confirm a connection close
-  <doc>
-    This method confirms a Connection.Close method and tells the
-    recipient that it is safe to release resources for the connection
-    and close the socket.
-  </doc>
-      <rule implement="SHOULD">
-    A peer that detects a socket closure without having received a
-    Close-Ok handshake method SHOULD log the error.
-  </rule>
-      <chassis name="client" implement="MUST"/>
-      <chassis name="server" implement="MUST"/>
-    </method>
-  </class>
-  <class name="channel" handler="channel" index="20">
-    <!--
-======================================================
-==       CHANNEL
-======================================================
--->
-  work with channels
-<doc>
-  The channel class provides methods for a client to establish a virtual
-  connection - a channel - to a server and for both peers to operate the
-  virtual connection thereafter.
-</doc>
-    <doc name="grammar">
-    channel             = open-channel *use-channel close-channel
-    open-channel        = C:OPEN S:OPEN-OK
-    use-channel         = C:FLOW S:FLOW-OK
-                        / S:FLOW C:FLOW-OK
-                        / S:ALERT
-                        / functional-class
-    close-channel       = C:CLOSE S:CLOSE-OK
-                        / S:CLOSE C:CLOSE-OK
-</doc>
-    <chassis name="server" implement="MUST"/>
-    <chassis name="client" implement="MUST"/>
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-    <method name="open" synchronous="1" index="10">
-  open a channel for use
-  <doc>
-    This method opens a virtual connection (a channel).
-  </doc>
-      <rule implement="MUST">
-    This method MUST NOT be called when the channel is already open.
-  </rule>
-      <chassis name="server" implement="MUST"/>
-      <response name="open-ok"/>
-      <field name="out of band" type="shortstr">
-    out-of-band settings
-    <doc>
-      Configures out-of-band transfers on this channel.  The syntax and
-      meaning of this field will be formally defined at a later date.
-    </doc>
-        <assert check="null"/>
-      </field>
-    </method>
-    <method name="open-ok" synchronous="1" index="11">
-  signal that the channel is ready
-  <doc>
-    This method signals to the client that the channel is ready for use.
-  </doc>
-      <chassis name="client" implement="MUST"/>
-    </method>
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-    <method name="flow" synchronous="1" index="20">
-  enable/disable flow from peer
-  <doc>
-    This method asks the peer to pause or restart the flow of content
-    data. This is a simple flow-control mechanism that a peer can use
-    to avoid oveflowing its queues or otherwise finding itself receiving
-    more messages than it can process.  Note that this method is not
-    intended for window control.  The peer that receives a request to
-    stop sending content should finish sending the current content, if
-    any, and then wait until it receives a Flow restart method.
-  </doc>
-      <rule implement="MAY">
-    When a new channel is opened, it is active.  Some applications
-    assume that channels are inactive until started.  To emulate this
-    behaviour a client MAY open the channel, then pause it.
-  </rule>
-      <rule implement="SHOULD">
-    When sending content data in multiple frames, a peer SHOULD monitor
-    the channel for incoming methods and respond to a Channel.Flow as
-    rapidly as possible.
-  </rule>
-      <rule implement="MAY">
-    A peer MAY use the Channel.Flow method to throttle incoming content
-    data for internal reasons, for example, when exchangeing data over a
-    slower connection.
-  </rule>
-      <rule implement="MAY">
-    The peer that requests a Channel.Flow method MAY disconnect and/or
-    ban a peer that does not respect the request.
-  </rule>
-      <chassis name="server" implement="MUST"/>
-      <chassis name="client" implement="MUST"/>
-      <response name="flow-ok"/>
-      <field name="active" type="bit">
-    start/stop content frames
-    <doc>
-      If 1, the peer starts sending content frames.  If 0, the peer
-      stops sending content frames.
-    </doc>
-      </field>
-    </method>
-    <method name="flow-ok" index="21">
-  confirm a flow method
-  <doc>
-    Confirms to the peer that a flow command was received and processed.
-  </doc>
-      <chassis name="server" implement="MUST"/>
-      <chassis name="client" implement="MUST"/>
-      <field name="active" type="bit">
-    current flow setting
-    <doc>
-      Confirms the setting of the processed flow method: 1 means the
-      peer will start sending or continue to send content frames; 0
-      means it will not.
-    </doc>
-      </field>
-    </method>
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-    <method name="alert" index="30">
-  send a non-fatal warning message
-  <doc>
-    This method allows the server to send a non-fatal warning to the
-    client.  This is used for methods that are normally asynchronous
-    and thus do not have confirmations, and for which the server may
-    detect errors that need to be reported.  Fatal errors are handled
-    as channel or connection exceptions; non-fatal errors are sent
-    through this method.
-  </doc>
-      <chassis name="client" implement="MUST"/>
-      <field name="reply code" domain="reply code"/>
-      <field name="reply text" domain="reply text"/>
-      <field name="details" type="table">
-    detailed information for warning
-    <doc>
-      A set of fields that provide more information about the
-      problem.  The meaning of these fields are defined on a
-      per-reply-code basis (TO BE DEFINED).
-    </doc>
-      </field>
-    </method>
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-    <method name="close" synchronous="1" index="40">
-  request a channel close
-  <doc>
-    This method indicates that the sender wants to close the channel.
-    This may be due to internal conditions (e.g. a forced shut-down) or
-    due to an error handling a specific method, i.e. an exception.  When
-    a close is due to an exception, the sender provides the class and
-    method id of the method which caused the exception.
-  </doc>
-      <rule implement="MUST">
-    After sending this method any received method except
-    Channel.Close-OK MUST be discarded.
-  </rule>
-      <rule implement="MAY">
-    The peer sending this method MAY use a counter or timeout to detect
-    failure of the other peer to respond correctly with Channel.Close-OK..
-  </rule>
-      <chassis name="client" implement="MUST"/>
-      <chassis name="server" implement="MUST"/>
-      <response name="close-ok"/>
-      <field name="reply code" domain="reply code"/>
-      <field name="reply text" domain="reply text"/>
-      <field name="class id" domain="class id">
-    failing method class
-    <doc>
-      When the close is provoked by a method exception, this is the
-      class of the method.
-    </doc>
-      </field>
-      <field name="method id" domain="method id">
-    failing method ID
-    <doc>
-      When the close is provoked by a method exception, this is the
-      ID of the method.
-    </doc>
-      </field>
-    </method>
-    <method name="close-ok" synchronous="1" index="41">
-  confirm a channel close
-  <doc>
-    This method confirms a Channel.Close method and tells the recipient
-    that it is safe to release resources for the channel and close the
-    socket.
-  </doc>
-      <rule implement="SHOULD">
-    A peer that detects a socket closure without having received a
-    Channel.Close-Ok handshake method SHOULD log the error.
-  </rule>
-      <chassis name="client" implement="MUST"/>
-      <chassis name="server" implement="MUST"/>
-    </method>
-  </class>
-  <class name="access" handler="connection" index="30">
-    <!--
-======================================================
-==      ACCESS CONTROL
-======================================================
--->
-  work with access tickets
-<doc>
-  The protocol control access to server resources using access tickets.
-  A client must explicitly request access tickets before doing work.
-  An access ticket grants a client the right to use a specific set of
-  resources - called a "realm" - in specific ways.
-</doc>
-    <doc name="grammar">
-    access              = C:REQUEST S:REQUEST-OK
-</doc>
-    <chassis name="server" implement="MUST"/>
-    <chassis name="client" implement="MUST"/>
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-    <method name="request" synchronous="1" index="10">
-  request an access ticket
-  <doc>
-    This method requests an access ticket for an access realm.
-    The server responds by granting the access ticket.  If the
-    client does not have access rights to the requested realm
-    this causes a connection exception.  Access tickets are a
-    per-channel resource.
-  </doc>
-      <rule implement="MUST">
-    The realm name MUST start with either "/data" (for application
-    resources) or "/admin" (for server administration resources).
-    If the realm starts with any other path, the server MUST raise
-    a connection exception with reply code 403 (access refused).
-  </rule>
-      <rule implement="MUST">
-    The server MUST implement the /data realm and MAY implement the
-    /admin realm.  The mapping of resources to realms is not
-    defined in the protocol - this is a server-side configuration
-    issue.
-  </rule>
-      <chassis name="server" implement="MUST"/>
-      <response name="request-ok"/>
-      <field name="realm" domain="path">
-    name of requested realm
-    <rule implement="MUST">
-      If the specified realm is not known to the server, the server
-      must raise a channel exception with reply code 402 (invalid
-      path).
-    </rule>
-      </field>
-      <field name="exclusive" type="bit">
-    request exclusive access
-    <doc>
-      Request exclusive access to the realm. If the server cannot grant
-      this - because there are other active tickets for the realm - it
-      raises a channel exception.
-    </doc>
-      </field>
-      <field name="passive" type="bit">
-    request passive access
-    <doc>
-      Request message passive access to the specified access realm.
-      Passive access lets a client get information about resources in
-      the realm but not to make any changes to them.
-    </doc>
-      </field>
-      <field name="active" type="bit">
-    request active access
-    <doc>
-      Request message active access to the specified access realm.
-      Acvtive access lets a client get create and delete resources in
-      the realm.
-    </doc>
-      </field>
-      <field name="write" type="bit">
-    request write access
-    <doc>
-      Request write access to the specified access realm.  Write access
-      lets a client publish messages to all exchanges in the realm.
-    </doc>
-      </field>
-      <field name="read" type="bit">
-    request read access
-    <doc>
-      Request read access to the specified access realm.  Read access
-      lets a client consume messages from queues in the realm.
-    </doc>
-      </field>
-    </method>
-    <method name="request-ok" synchronous="1" index="11">
-  grant access to server resources
-  <doc>
-    This method provides the client with an access ticket. The access
-    ticket is valid within the current channel and for the lifespan of
-    the channel.
-  </doc>
-      <rule implement="MUST">
-    The client MUST NOT use access tickets except within the same
-    channel as originally granted.
-  </rule>
-      <rule implement="MUST">
-    The server MUST isolate access tickets per channel and treat an
-    attempt by a client to mix these as a connection exception.
-  </rule>
-      <chassis name="client" implement="MUST"/>
-      <field name="ticket" domain="access ticket"/>
-    </method>
-  </class>
-  <class name="exchange" handler="channel" index="40">
-    <!--
-======================================================
-==       EXCHANGES (or "routers", if you prefer)
-==       (Or matchers, plugins, extensions, agents,... Routing is just one of
-==        the many fun things an exchange can do.)
-======================================================
--->
-  work with exchanges
-<doc>
-  Exchanges match and distribute messages across queues.  Exchanges can be
-  configured in the server or created at runtime.
-</doc>
-    <doc name="grammar">
-    exchange            = C:DECLARE  S:DECLARE-OK
-                        / C:DELETE   S:DELETE-OK
-</doc>
-    <chassis name="server" implement="MUST"/>
-    <chassis name="client" implement="MUST"/>
-    <rule implement="MUST">
-      <test>amq_exchange_19</test>
-  The server MUST implement the direct and fanout exchange types, and
-  predeclare the corresponding exchanges named amq.direct and amq.fanout
-  in each virtual host. The server MUST also predeclare a direct
-  exchange to act as the default exchange for content Publish methods
-  and for default queue bindings.
-</rule>
-    <rule implement="SHOULD">
-      <test>amq_exchange_20</test>
-  The server SHOULD implement the topic exchange type, and predeclare
-  the corresponding exchange named amq.topic in each virtual host.
-</rule>
-    <rule implement="MAY">
-      <test>amq_exchange_21</test>
-  The server MAY implement the system exchange type, and predeclare the
-  corresponding exchanges named amq.system in each virtual host. If the
-  client attempts to bind a queue to the system exchange, the server
-  MUST raise a connection exception with reply code 507 (not allowed).
-</rule>
-    <rule implement="MUST">
-      <test>amq_exchange_22</test>
-  The default exchange MUST be defined as internal, and be inaccessible
-  to the client except by specifying an empty exchange name in a content
-  Publish method. That is, the server MUST NOT let clients make explicit
-  bindings to this exchange.
-</rule>
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-    <method name="declare" synchronous="1" index="10">
-  declare exchange, create if needed
-  <doc>
-    This method creates an exchange if it does not already exist, and if the
-    exchange exists, verifies that it is of the correct and expected class.
-  </doc>
-      <rule implement="SHOULD">
-        <test>amq_exchange_23</test>
-    The server SHOULD support a minimum of 16 exchanges per virtual host
-    and ideally, impose no limit except as defined by available resources.
-  </rule>
-      <chassis name="server" implement="MUST"/>
-      <response name="declare-ok"/>
-      <field name="ticket" domain="access ticket">
-        <doc>
-      When a client defines a new exchange, this belongs to the access realm
-      of the ticket used.  All further work done with that exchange must be
-      done with an access ticket for the same realm.
-    </doc>
-        <rule implement="MUST">
-      The client MUST provide a valid access ticket giving "active" access
-      to the realm in which the exchange exists or will be created, or
-      "passive" access if the if-exists flag is set.
-    </rule>
-      </field>
-      <field name="exchange" domain="exchange name">
-        <rule implement="MUST">
-          <test>amq_exchange_15</test>
-      Exchange names starting with "amq." are reserved for predeclared
-      and standardised exchanges.  If the client attempts to create an
-      exchange starting with "amq.", the server MUST raise a channel
-      exception with reply code 403 (access refused).
-    </rule>
-        <assert check="regexp" value="^[a-zA-Z0-9-_.:]+$"/>
-      </field>
-      <field name="type" type="shortstr">
-    exchange type
-    <doc>
-      Each exchange belongs to one of a set of exchange types implemented
-      by the server.  The exchange types define the functionality of the
-      exchange - i.e. how messages are routed through it.  It is not valid
-      or meaningful to attempt to change the type of an existing exchange.
-    </doc>
-        <rule implement="MUST">
-          <test>amq_exchange_16</test>
-      If the exchange already exists with a different type, the server
-      MUST raise a connection exception with a reply code 507 (not allowed).
-    </rule>
-        <rule implement="MUST">
-          <test>amq_exchange_18</test>
-      If the server does not support the requested exchange type it MUST
-      raise a connection exception with a reply code 503 (command invalid).
-    </rule>
-        <assert check="regexp" value="^[a-zA-Z0-9-_.:]+$"/>
-      </field>
-      <field name="passive" type="bit">
-    do not create exchange
-    <doc>
-    If set, the server will not create the exchange.  The client can use
-    this to check whether an exchange exists without modifying the server
-    state.
-    </doc>
-        <rule implement="MUST">
-          <test>amq_exchange_05</test>
-      If set, and the exchange does not already exist, the server MUST
-      raise a channel exception with reply code 404 (not found).
-    </rule>
-      </field>
-      <field name="durable" type="bit">
-    request a durable exchange
-    <doc>
-      If set when creating a new exchange, the exchange will be marked as
-      durable.  Durable exchanges remain active when a server restarts.
-      Non-durable exchanges (transient exchanges) are purged if/when a
-      server restarts.
-    </doc>
-        <rule implement="MUST">
-          <test>amq_exchange_24</test>
-      The server MUST support both durable and transient exchanges.
-    </rule>
-        <rule implement="MUST">
-      The server MUST ignore the durable field if the exchange already
-      exists.
-    </rule>
-      </field>
-      <field name="auto delete" type="bit">
-    auto-delete when unused
-    <doc>
-      If set, the exchange is deleted when all queues have finished
-      using it.
-    </doc>
-        <rule implement="SHOULD">
-          <test>amq_exchange_02</test>
-      The server SHOULD allow for a reasonable delay between the point
-      when it determines that an exchange is not being used (or no longer
-      used), and the point when it deletes the exchange.  At the least it
-      must allow a client to create an exchange and then bind a queue to
-      it, with a small but non-zero delay between these two actions.
-    </rule>
-        <rule implement="MUST">
-          <test>amq_exchange_25</test>
-      The server MUST ignore the auto-delete field if the exchange already
-      exists.
-    </rule>
-      </field>
-      <field name="internal" type="bit">
-    create internal exchange
-    <doc>
-      If set, the exchange may not be used directly by publishers, but
-      only when bound to other exchanges. Internal exchanges are used to
-      construct wiring that is not visible to applications.
-    </doc>
-      </field>
-
-  <field name = "nowait" type = "bit">
-    do not send a reply method
-    <doc>
-    If set, the server will not respond to the method. The client should
-    not wait for a reply method.  If the server could not complete the
-    method it will raise a channel or connection exception.
-    </doc>
-  </field>
-
-      <field name="arguments" type="table">
-    arguments for declaration
-    <doc>
-      A set of arguments for the declaration. The syntax and semantics
-      of these arguments depends on the server implementation.  This
-      field is ignored if passive is 1.
-    </doc>
-      </field>
-    </method>
-    <method name="declare-ok" synchronous="1" index="11">
-  confirms an exchange declaration
-  <doc>
-    This method confirms a Declare method and confirms the name of the
-    exchange, essential for automatically-named exchanges.
-  </doc>
-      <chassis name="client" implement="MUST"/>
-    </method>
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-    <method name="delete" synchronous="1" index="20">
-  delete an exchange
-  <doc>
-    This method deletes an exchange.  When an exchange is deleted all queue
-    bindings on the exchange are cancelled.
-  </doc>
-      <chassis name="server" implement="MUST"/>
-      <response name="delete-ok"/>
-      <field name="ticket" domain="access ticket">
-        <rule implement="MUST">
-      The client MUST provide a valid access ticket giving "active"
-      access rights to the exchange's access realm.
-    </rule>
-      </field>
-      <field name="exchange" domain="exchange name">
-        <rule implement="MUST">
-          <test>amq_exchange_11</test>
-      The exchange MUST exist. Attempting to delete a non-existing exchange
-      causes a channel exception.
-    </rule>
-        <assert check="notnull"/>
-      </field>
-      <field name="if unused" type="bit">
-    delete only if unused
-    <doc>
-      If set, the server will only delete the exchange if it has no queue
-      bindings. If the exchange has queue bindings the server does not
-      delete it but raises a channel exception instead.
-    </doc>
-        <rule implement="SHOULD">
-          <test>amq_exchange_12</test>
-      If set, the server SHOULD delete the exchange but only if it has
-      no queue bindings.
-    </rule>
-        <rule implement="SHOULD">
-          <test>amq_exchange_13</test>
-      If set, the server SHOULD raise a channel exception if the exchange is in
-      use.
-    </rule>
-      </field>
-
-  <field name = "nowait" type = "bit">
-    do not send a reply method
-    <doc>
-    If set, the server will not respond to the method. The client should
-    not wait for a reply method.  If the server could not complete the
-    method it will raise a channel or connection exception.
-    </doc>
-  </field>
-
-    </method>
-    <method name="delete-ok" synchronous="1" index="21">
-  confirm deletion of an exchange
-  <doc>
-    This method confirms the deletion of an exchange.
-  </doc>
-      <chassis name="client" implement="MUST"/>
-    </method>
-  </class>
-  <class name="queue" handler="channel" index="50">
-    <!--
-======================================================
-==       QUEUES
-======================================================
--->
-  work with queues
-
-<doc>
-  Queues store and forward messages.  Queues can be configured in the server
-  or created at runtime.  Queues must be attached to at least one exchange
-  in order to receive messages from publishers.
-</doc>
-    <doc name="grammar">
-    queue               = C:DECLARE  S:DECLARE-OK
-                        / C:BIND     S:BIND-OK
-                        / C:PURGE    S:PURGE-OK
-                        / C:DELETE   S:DELETE-OK
-</doc>
-    <chassis name="server" implement="MUST"/>
-    <chassis name="client" implement="MUST"/>
-    <rule implement="MUST">
-      <test>amq_queue_33</test>
-  A server MUST allow any content class to be sent to any queue, in any
-  mix, and queue and delivery these content classes independently. Note
-  that all methods that fetch content off queues are specific to a given
-  content class.
-</rule>
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-    <method name="declare" synchronous="1" index="10">
-  declare queue, create if needed
-  <doc>
-    This method creates or checks a queue.  When creating a new queue
-    the client can specify various properties that control the durability
-    of the queue and its contents, and the level of sharing for the queue.
-  </doc>
-      <rule implement="MUST">
-        <test>amq_queue_34</test>
-    The server MUST create a default binding for a newly-created queue
-    to the default exchange, which is an exchange of type 'direct'.
-  </rule>
-      <rule implement="SHOULD">
-        <test>amq_queue_35</test>
-    The server SHOULD support a minimum of 256 queues per virtual host
-    and ideally, impose no limit except as defined by available resources.
-  </rule>
-      <chassis name="server" implement="MUST"/>
-      <response name="declare-ok"/>
-      <field name="ticket" domain="access ticket">
-        <doc>
-      When a client defines a new queue, this belongs to the access realm
-      of the ticket used.  All further work done with that queue must be
-      done with an access ticket for the same realm.
-    </doc>
-        <doc>
-      The client provides a valid access ticket giving "active" access
-      to the realm in which the queue exists or will be created, or
-      "passive" access if the if-exists flag is set.
-    </doc>
-      </field>
-      <field name="queue" domain="queue name">
-        <rule implement="MAY">
-          <test>amq_queue_10</test>
-      The queue name MAY be empty, in which case the server MUST create
-      a new queue with a unique generated name and return this to the
-      client in the Declare-Ok method.
-    </rule>
-        <rule implement="MUST">
-          <test>amq_queue_32</test>
-      Queue names starting with "amq." are reserved for predeclared and
-      standardised server queues.  If the queue name starts with "amq."
-      and the passive option is zero, the server MUST raise a connection
-      exception with reply code 403 (access refused).
-    </rule>
-        <assert check="regexp" value="^[a-zA-Z0-9-_.:]*$"/>
-      </field>
-      <field name="passive" type="bit">
-    do not create queue
-    <doc>
-    If set, the server will not create the queue.  The client can use
-    this to check whether a queue exists without modifying the server
-    state.
-    </doc>
-        <rule implement="MUST">
-          <test>amq_queue_05</test>
-      If set, and the queue does not already exist, the server MUST
-      respond with a reply code 404 (not found) and raise a channel
-      exception.
-    </rule>
-      </field>
-      <field name="durable" type="bit">
-    request a durable queue
-    <doc>
-      If set when creating a new queue, the queue will be marked as
-      durable.  Durable queues remain active when a server restarts.
-      Non-durable queues (transient queues) are purged if/when a
-      server restarts.  Note that durable queues do not necessarily
-      hold persistent messages, although it does not make sense to
-      send persistent messages to a transient queue.
-    </doc>
-        <rule implement="MUST">
-          <test>amq_queue_03</test>
-      The server MUST recreate the durable queue after a restart.
-    </rule>
-        <rule implement="MUST">
-          <test>amq_queue_36</test>
-      The server MUST support both durable and transient queues.
-    </rule>
-        <rule implement="MUST">
-          <test>amq_queue_37</test>
-      The server MUST ignore the durable field if the queue already
-      exists.
-    </rule>
-      </field>
-      <field name="exclusive" type="bit">
-    request an exclusive queue
-    <doc>
-      Exclusive queues may only be consumed from by the current connection.
-      Setting the 'exclusive' flag always implies 'auto-delete'.
-    </doc>
-        <rule implement="MUST">
-          <test>amq_queue_38</test>
-      The server MUST support both exclusive (private) and non-exclusive
-      (shared) queues.
-    </rule>
-        <rule implement="MUST">
-          <test>amq_queue_04</test>
-      The server MUST raise a channel exception if 'exclusive' is specified
-      and the queue already exists and is owned by a different connection.
-    </rule>
-      </field>
-      <field name="auto delete" type="bit">
-    auto-delete queue when unused
-    <doc>
-      If set, the queue is deleted when all consumers have finished
-      using it. Last consumer can be cancelled either explicitly or because
-      its channel is closed. If there was no consumer ever on the queue, it
-      won't be deleted.
-    </doc>
-        <rule implement="SHOULD">
-          <test>amq_queue_02</test>
-      The server SHOULD allow for a reasonable delay between the point
-      when it determines that a queue is not being used (or no longer
-      used), and the point when it deletes the queue.  At the least it
-      must allow a client to create a queue and then create a consumer
-      to read from it, with a small but non-zero delay between these
-      two actions.  The server should equally allow for clients that may
-      be disconnected prematurely, and wish to re-consume from the same
-      queue without losing messages.  We would recommend a configurable
-      timeout, with a suitable default value being one minute.
-    </rule>
-        <rule implement="MUST">
-          <test>amq_queue_31</test>
-      The server MUST ignore the auto-delete field if the queue already
-      exists.
-    </rule>
-      </field>
-  <field name = "nowait" type = "bit">
-    do not send a reply method
-    <doc>
-    If set, the server will not respond to the method. The client should
-    not wait for a reply method.  If the server could not complete the
-    method it will raise a channel or connection exception.
-    </doc>
-  </field>
-
-      <field name="arguments" type="table">
-    arguments for declaration
-    <doc>
-      A set of arguments for the declaration. The syntax and semantics
-      of these arguments depends on the server implementation.  This
-      field is ignored if passive is 1.
-    </doc>
-      </field>
-    </method>
-    <method name="declare-ok" synchronous="1" index="11">
-  confirms a queue definition
-  <doc>
-    This method confirms a Declare method and confirms the name of the
-    queue, essential for automatically-named queues.
-  </doc>
-      <chassis name="client" implement="MUST"/>
-      <field name="queue" domain="queue name">
-        <doc>
-      Reports the name of the queue. If the server generated a queue
-      name, this field contains that name.
-    </doc>
-        <assert check="notnull"/>
-      </field>
-      <field name="message count" type="long">
-    number of messages in queue
-    <doc>
-      Reports the number of messages in the queue, which will be zero
-      for newly-created queues.
-    </doc>
-      </field>
-      <field name="consumer count" type="long">
-    number of consumers
-    <doc>
-      Reports the number of active consumers for the queue. Note that
-      consumers can suspend activity (Channel.Flow) in which case they
-      do not appear in this count.
-    </doc>
-      </field>
-    </method>
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-    <method name="bind" synchronous="1" index="20">
-  bind queue to an exchange
-  <doc>
-    This method binds a queue to an exchange.  Until a queue is
-    bound it will not receive any messages.  In a classic messaging
-    model, store-and-forward queues are bound to a dest exchange
-    and subscription queues are bound to a dest_wild exchange.
-  </doc>
-      <rule implement="MUST">
-        <test>amq_queue_25</test>
-    A server MUST allow ignore duplicate bindings - that is, two or
-    more bind methods for a specific queue, with identical arguments
-    - without treating these as an error.
-  </rule>
-      <rule implement="MUST">
-        <test>amq_queue_39</test>
-    If a bind fails, the server MUST raise a connection exception.
-  </rule>
-      <rule implement="MUST">
-        <test>amq_queue_12</test>
-    The server MUST NOT allow a durable queue to bind to a transient
-    exchange. If the client attempts this the server MUST raise a
-    channel exception.
-  </rule>
-      <rule implement="SHOULD">
-        <test>amq_queue_13</test>
-    Bindings for durable queues are automatically durable and the
-    server SHOULD restore such bindings after a server restart.
-  </rule>
-      <rule implement="MUST">
-        <test>amq_queue_17</test>
-    If the client attempts to an exchange that was declared as internal,
-    the server MUST raise a connection exception with reply code 530
-    (not allowed).
-  </rule>
-      <rule implement="SHOULD">
-        <test>amq_queue_40</test>
-    The server SHOULD support at least 4 bindings per queue, and
-    ideally, impose no limit except as defined by available resources.
-  </rule>
-      <chassis name="server" implement="MUST"/>
-      <response name="bind-ok"/>
-      <field name="ticket" domain="access ticket">
-        <doc>
-      The client provides a valid access ticket giving "active"
-      access rights to the queue's access realm.
-    </doc>
-      </field>
-
-  <field name = "queue" domain = "queue name">
-    <doc>
-      Specifies the name of the queue to bind.  If the queue name is
-      empty, refers to the current queue for the channel, which is
-      the last declared queue.
-    </doc>
-    <doc name = "rule">
-      If the client did not previously declare a queue, and the queue
-      name in this method is empty, the server MUST raise a connection
-      exception with reply code 530 (not allowed).
-    </doc>
-    <doc name = "rule" test = "amq_queue_26">
-      If the queue does not exist the server MUST raise a channel exception
-      with reply code 404 (not found).
-    </doc>
-  </field>
-
-  <field name="exchange" domain="exchange name">
-          The name of the exchange to bind to.
-          <rule implement="MUST">
-          <test>amq_queue_14</test>
-      If the exchange does not exist the server MUST raise a channel
-      exception with reply code 404 (not found).
-    </rule>
-      </field>
-      <field name="routing key" type="shortstr">
-     message routing key
-    <doc>
-      Specifies the routing key for the binding.  The routing key is
-      used for routing messages depending on the exchange configuration.
-      Not all exchanges use a routing key - refer to the specific
-      exchange documentation.  If the routing key is empty and the queue
-      name is empty, the routing key will be the current queue for the
-      channel, which is the last declared queue.
-    </doc>
-  </field>
-
-  <field name = "nowait" type = "bit">
-    do not send a reply method
-    <doc>
-    If set, the server will not respond to the method. The client should
-    not wait for a reply method.  If the server could not complete the
-    method it will raise a channel or connection exception.
-    </doc>
-  </field>
-
-  <field name="arguments" type="table">
-    arguments for binding
-    <doc>
-      A set of arguments for the binding.  The syntax and semantics of
-      these arguments depends on the exchange class.
-    </doc>
-      </field>
-    </method>
-    <method name="bind-ok" synchronous="1" index="21">
-  confirm bind successful
-  <doc>
-    This method confirms that the bind was successful.
-  </doc>
-      <chassis name="client" implement="MUST"/>
-    </method>
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-    <method name="purge" synchronous="1" index="30">
-  purge a queue
-  <doc>
-    This method removes all messages from a queue.  It does not cancel
-    consumers.  Purged messages are deleted without any formal "undo"
-    mechanism.
-  </doc>
-      <rule implement="MUST">
-        <test>amq_queue_15</test>
-    A call to purge MUST result in an empty queue.
-  </rule>
-      <rule implement="MUST">
-        <test>amq_queue_41</test>
-    On transacted channels the server MUST not purge messages that have
-    already been sent to a client but not yet acknowledged.
-  </rule>
-      <rule implement="MAY">
-        <test>amq_queue_42</test>
-    The server MAY implement a purge queue or log that allows system
-    administrators to recover accidentally-purged messages.  The server
-    SHOULD NOT keep purged messages in the same storage spaces as the
-    live messages since the volumes of purged messages may get very
-    large.
-  </rule>
-      <chassis name="server" implement="MUST"/>
-      <response name="purge-ok"/>
-      <field name="ticket" domain="access ticket">
-        <doc>
-      The access ticket must be for the access realm that holds the
-      queue.
-    </doc>
-        <rule implement="MUST">
-      The client MUST provide a valid access ticket giving "read" access
-      rights to the queue's access realm.  Note that purging a queue is
-      equivalent to reading all messages and discarding them.
-    </rule>
-      </field>
-  <field name = "queue" domain = "queue name">
-    <doc>
-      Specifies the name of the queue to purge.  If the queue name is
-      empty, refers to the current queue for the channel, which is
-      the last declared queue.
-    </doc>
-    <doc name = "rule">
-      If the client did not previously declare a queue, and the queue
-      name in this method is empty, the server MUST raise a connection
-      exception with reply code 530 (not allowed).
-    </doc>
-    <doc name = "rule" test = "amq_queue_16">
-      The queue must exist. Attempting to purge a non-existing queue
-      causes a channel exception.
-    </doc>
-  </field>
-
-  <field name = "nowait" type = "bit">
-    do not send a reply method
-    <doc>
-    If set, the server will not respond to the method. The client should
-    not wait for a reply method.  If the server could not complete the
-    method it will raise a channel or connection exception.
-    </doc>
-  </field>
-    </method>
-    <method name="purge-ok" synchronous="1" index="31">
-  confirms a queue purge
-  <doc>
-    This method confirms the purge of a queue.
-  </doc>
-      <chassis name="client" implement="MUST"/>
-      <field name="message count" type="long">
-    number of messages purged
-    <doc>
-      Reports the number of messages purged.
-    </doc>
-      </field>
-    </method>
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-    <method name="delete" synchronous="1" index="40">
-  delete a queue
-  <doc>
-    This method deletes a queue.  When a queue is deleted any pending
-    messages are sent to a dead-letter queue if this is defined in the
-    server configuration, and all consumers on the queue are cancelled.
-  </doc>
-      <rule implement="SHOULD">
-        <test>amq_queue_43</test>
-    The server SHOULD use a dead-letter queue to hold messages that
-    were pending on a deleted queue, and MAY provide facilities for
-    a system administrator to move these messages back to an active
-    queue.
-  </rule>
-      <chassis name="server" implement="MUST"/>
-      <response name="delete-ok"/>
-      <field name="ticket" domain="access ticket">
-        <doc>
-      The client provides a valid access ticket giving "active"
-      access rights to the queue's access realm.
-    </doc>
-      </field>
-
-  <field name = "queue" domain = "queue name">
-    <doc>
-      Specifies the name of the queue to delete. If the queue name is
-      empty, refers to the current queue for the channel, which is the
-      last declared queue.
-    </doc>
-    <doc name = "rule">
-      If the client did not previously declare a queue, and the queue
-      name in this method is empty, the server MUST raise a connection
-      exception with reply code 530 (not allowed).
-    </doc>
-    <doc name = "rule" test = "amq_queue_21">
-      The queue must exist. Attempting to delete a non-existing queue
-      causes a channel exception.
-    </doc>
-  </field>
-
-      <field name="if unused" type="bit">
-    delete only if unused
-    <doc>
-      If set, the server will only delete the queue if it has no
-      consumers. If the queue has consumers the server does does not
-      delete it but raises a channel exception instead.
-    </doc>
-        <rule implement="MUST">
-          <test>amq_queue_29</test>
-          <test>amq_queue_30</test>
-      The server MUST respect the if-unused flag when deleting a queue.
-    </rule>
-      </field>
-      <field name="if empty" type="bit">
-    delete only if empty
-	<test>amq_queue_27</test>
-        <doc>
-      If set, the server will only delete the queue if it has no
-      messages. If the queue is not empty the server raises a channel
-      exception.
-    </doc>
-      </field>
-  <field name = "nowait" type = "bit">
-    do not send a reply method
-    <doc>
-    If set, the server will not respond to the method. The client should
-    not wait for a reply method.  If the server could not complete the
-    method it will raise a channel or connection exception.
-    </doc>
-  </field>
-    </method>
-
-    <method name="delete-ok" synchronous="1" index="41">
-  confirm deletion of a queue
-  <doc>
-    This method confirms the deletion of a queue.
-  </doc>
-      <chassis name="client" implement="MUST"/>
-      <field name="message count" type="long">
-    number of messages purged
-    <doc>
-      Reports the number of messages purged.
-    </doc>
-      </field>
-    </method>
-  </class>
-  <class name="basic" handler="channel" index="60">
-    <!--
-======================================================
-==       BASIC MIDDLEWARE
-======================================================
--->
-  work with basic content
-<doc>
-  The Basic class provides methods that support an industry-standard
-  messaging model.
-</doc>
-
-<doc name = "grammar">
-    basic               = C:QOS S:QOS-OK
-                        / C:CONSUME S:CONSUME-OK
-                        / C:CANCEL S:CANCEL-OK
-                        / C:PUBLISH content
-                        / S:RETURN content
-                        / S:DELIVER content
-                        / C:GET ( S:GET-OK content / S:GET-EMPTY )
-                        / C:ACK
-                        / C:REJECT
-</doc>
-
-<chassis name = "server" implement = "MUST" />
-<chassis name = "client" implement = "MAY"  />
-
-<doc name = "rule" test = "amq_basic_08">
-  The server SHOULD respect the persistent property of basic messages
-  and SHOULD make a best-effort to hold persistent basic messages on a
-  reliable storage mechanism.
-</doc>
-<doc name = "rule" test = "amq_basic_09">
-  The server MUST NOT discard a persistent basic message in case of a
-  queue overflow. The server MAY use the Channel.Flow method to slow
-  or stop a basic message publisher when necessary.
-</doc>
-<doc name = "rule" test = "amq_basic_10">
-  The server MAY overflow non-persistent basic messages to persistent
-  storage and MAY discard or dead-letter non-persistent basic messages
-  on a priority basis if the queue size exceeds some configured limit.
-</doc>
-<doc name = "rule" test = "amq_basic_11">
-  The server MUST implement at least 2 priority levels for basic
-  messages, where priorities 0-4 and 5-9 are treated as two distinct
-  levels. The server MAY implement up to 10 priority levels.
-</doc>
-<doc name = "rule" test = "amq_basic_12">
-  The server MUST deliver messages of the same priority in order
-  irrespective of their individual persistence.
-</doc>
-<doc name = "rule" test = "amq_basic_13">
-  The server MUST support both automatic and explicit acknowledgements
-  on Basic content.
-</doc>
-
-<!--  These are the properties for a Basic content  -->
-
-<field name = "content type" type = "shortstr">
-    MIME content type
-</field>
-<field name = "content encoding" type = "shortstr">
-    MIME content encoding
-</field>
-<field name = "headers" type = "table">
-    Message header field table
-</field>
-<field name = "delivery mode" type = "octet">
-    Non-persistent (1) or persistent (2)
-</field>
-<field name = "priority" type = "octet">
-    The message priority, 0 to 9
-</field>
-<field name = "correlation id" type = "shortstr">
-    The application correlation identifier
-</field>
-<field name = "reply to" type = "shortstr">
-    The destination to reply to
-</field>
-<field name = "expiration" type = "shortstr">
-    Message expiration specification
-</field>
-<field name = "message id" type = "shortstr">
-    The application message identifier
-</field>
-<field name = "timestamp" type = "timestamp">
-    The message timestamp
-</field>
-<field name = "type" type = "shortstr">
-    The message type name
-</field>
-<field name = "user id" type = "shortstr">
-    The creating user id
-</field>
-<field name = "app id" type = "shortstr">
-    The creating application id
-</field>
-<field name = "cluster id" type = "shortstr">
-    Intra-cluster routing identifier
-</field>
-
-
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-<method name = "qos" synchronous = "1" index = "10">
-  specify quality of service
-  <doc>
-    This method requests a specific quality of service.  The QoS can
-    be specified for the current channel or for all channels on the
-    connection.  The particular properties and semantics of a qos method
-    always depend on the content class semantics.  Though the qos method
-    could in principle apply to both peers, it is currently meaningful
-    only for the server.
-  </doc>
-  <chassis name = "server" implement = "MUST" />
-  <response name = "qos-ok" />
-
-  <field name = "prefetch size" type = "long">
-    prefetch window in octets
-    <doc>
-      The client can request that messages be sent in advance so that
-      when the client finishes processing a message, the following
-      message is already held locally, rather than needing to be sent
-      down the channel.  Prefetching gives a performance improvement.
-      This field specifies the prefetch window size in octets.  The
-      server will send a message in advance if it is equal to or
-      smaller in size than the available prefetch size (and also falls
-      into other prefetch limits). May be set to zero, meaning "no
-      specific limit", although other prefetch limits may still apply.
-      The prefetch-size is ignored if the no-ack option is set.
-    </doc>
-    <doc name = "rule" test = "amq_basic_17">
-      The server MUST ignore this setting when the client is not
-      processing any messages - i.e. the prefetch size does not limit
-      the transfer of single messages to a client, only the sending in
-      advance of more messages while the client still has one or more
-      unacknowledged messages.
-   </doc>
-  </field>
-
-  <field name = "prefetch count" type = "short">
-    prefetch window in messages
-    <doc>
-      Specifies a prefetch window in terms of whole messages.  This
-      field may be used in combination with the prefetch-size field;
-      a message will only be sent in advance if both prefetch windows
-      (and those at the channel and connection level) allow it.
-      The prefetch-count is ignored if the no-ack option is set.
-    </doc>
-    <doc name = "rule" test = "amq_basic_18">
-      The server MAY send less data in advance than allowed by the
-      client's specified prefetch windows but it MUST NOT send more.
-    </doc>
-  </field>
-
-  <field name = "global" type = "bit">
-    apply to entire connection
-    <doc>
-      By default the QoS settings apply to the current channel only.  If
-      this field is set, they are applied to the entire connection.
-    </doc>
-  </field>
-</method>
-
-<method name = "qos-ok" synchronous = "1" index = "11">
-  confirm the requested qos
-  <doc>
-    This method tells the client that the requested QoS levels could
-    be handled by the server.  The requested QoS applies to all active
-    consumers until a new QoS is defined.
-  </doc>
-  <chassis name = "client" implement = "MUST" />
-</method>
-
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-<method name = "consume" synchronous = "1" index = "20">
-  start a queue consumer
-  <doc>
-    This method asks the server to start a "consumer", which is a
-    transient request for messages from a specific queue. Consumers
-    last as long as the channel they were created on, or until the
-    client cancels them.
-  </doc>
-  <doc name = "rule" test = "amq_basic_01">
-    The server SHOULD support at least 16 consumers per queue, unless
-    the queue was declared as private, and ideally, impose no limit
-    except as defined by available resources.
-  </doc>
-  <chassis name = "server" implement = "MUST" />
-  <response name = "consume-ok" />
-
-  <field name = "ticket" domain = "access ticket">
-    <doc name = "rule">
-      The client MUST provide a valid access ticket giving "read" access
-      rights to the realm for the queue.
-    </doc>
-  </field>
-
-  <field name = "queue" domain = "queue name">
-    <doc>
-      Specifies the name of the queue to consume from.  If the queue name
-      is null, refers to the current queue for the channel, which is the
-      last declared queue.
-    </doc>
-    <doc name = "rule">
-      If the client did not previously declare a queue, and the queue name
-      in this method is empty, the server MUST raise a connection exception
-      with reply code 530 (not allowed).
-    </doc>
-  </field>
-
-  <field name = "consumer tag" domain = "consumer tag">
-    <doc>
-      Specifies the identifier for the consumer. The consumer tag is
-      local to a connection, so two clients can use the same consumer
-      tags. If this field is empty the server will generate a unique
-      tag.
-    </doc>
-    <doc name = "rule" test = "todo">
-      The tag MUST NOT refer to an existing consumer. If the client
-      attempts to create two consumers with the same non-empty tag
-      the server MUST raise a connection exception with reply code
-      530 (not allowed).
-    </doc>
-  </field>
-
-  <field name = "no local" domain = "no local" />
-
-  <field name = "no ack" domain = "no ack" />
-
-  <field name = "exclusive" type = "bit">
-    request exclusive access
-    <doc>
-      Request exclusive consumer access, meaning only this consumer can
-      access the queue.
-    </doc>
-    <doc name = "rule" test = "amq_basic_02">
-      If the server cannot grant exclusive access to the queue when asked,
-      - because there are other consumers active - it MUST raise a channel
-      exception with return code 403 (access refused).
-    </doc>
-  </field>
-
-  <field name = "nowait" type = "bit">
-    do not send a reply method
-    <doc>
-    If set, the server will not respond to the method. The client should
-    not wait for a reply method.  If the server could not complete the
-    method it will raise a channel or connection exception.
-    </doc>
-  </field>
-</method>
-
-<method name = "consume-ok" synchronous = "1" index = "21">
-  confirm a new consumer
-  <doc>
-    The server provides the client with a consumer tag, which is used
-    by the client for methods called on the consumer at a later stage.
-  </doc>
-  <chassis name = "client" implement = "MUST" />
-
-  <field name = "consumer tag" domain = "consumer tag">
-    <doc>
-      Holds the consumer tag specified by the client or provided by
-      the server.
-    </doc>
-  </field>
-</method>
-
-
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-<method name = "cancel" synchronous = "1" index = "30">
-  end a queue consumer
-  <doc test = "amq_basic_04">
-    This method cancels a consumer. This does not affect already
-    delivered messages, but it does mean the server will not send any
-    more messages for that consumer.  The client may receive an
-    abitrary number of messages in between sending the cancel method
-    and receiving the cancel-ok reply.
-  </doc>
-  <doc name = "rule" test = "todo">
-    If the queue no longer exists when the client sends a cancel command,
-    or the consumer has been cancelled for other reasons, this command
-    has no effect.
-  </doc>
-  <chassis name = "server" implement = "MUST" />
-  <response name = "cancel-ok" />
-
-  <field name = "consumer tag" domain = "consumer tag" />
-
-  <field name = "nowait" type = "bit">
-    do not send a reply method
-    <doc>
-    If set, the server will not respond to the method. The client should
-    not wait for a reply method.  If the server could not complete the
-    method it will raise a channel or connection exception.
-    </doc>
-  </field>
-</method>
-
-<method name = "cancel-ok" synchronous = "1" index = "31">
-  confirm a cancelled consumer
-  <doc>
-    This method confirms that the cancellation was completed.
-  </doc>
-  <chassis name = "client" implement = "MUST" />
-
-  <field name = "consumer tag" domain = "consumer tag" />
-</method>
-
-
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-<method name = "publish" content = "1" index = "40">
-  publish a message
-  <doc>
-    This method publishes a message to a specific exchange. The message
-    will be routed to queues as defined by the exchange configuration
-    and distributed to any active consumers when the transaction, if any,
-    is committed.
-  </doc>
-  <chassis name = "server" implement = "MUST" />
-
-  <field name = "ticket" domain = "access ticket">
-    <doc name = "rule">
-      The client MUST provide a valid access ticket giving "write"
-      access rights to the access realm for the exchange.
-    </doc>
-  </field>
-
-  <field name = "exchange" domain = "exchange name">
-    <doc>
-      Specifies the name of the exchange to publish to.  The exchange
-      name can be empty, meaning the default exchange.  If the exchange
-      name is specified, and that exchange does not exist, the server
-      will raise a channel exception.
-    </doc>
-    <doc name = "rule" test = "amq_basic_06">
-      The server MUST accept a blank exchange name to mean the default
-      exchange.
-    </doc>
-    <doc name = "rule" test = "amq_basic_14">
-      If the exchange was declared as an internal exchange, the server
-      MUST raise a channel exception with a reply code 403 (access
-      refused).
-    </doc>
-    <doc name = "rule" test = "amq_basic_15">
-      The exchange MAY refuse basic content in which case it MUST raise
-      a channel exception with reply code 540 (not implemented).
-    </doc>
-  </field>
-
-  <field name = "routing key" type = "shortstr">
-     Message routing key
-    <doc>
-      Specifies the routing key for the message.  The routing key is
-      used for routing messages depending on the exchange configuration.
-    </doc>
-  </field>
-
-  <field name = "mandatory" type = "bit">
-    indicate mandatory routing
-    <doc>
-      This flag tells the server how to react if the message cannot be
-      routed to a queue.  If this flag is set, the server will return an
-      unroutable message with a Return method.  If this flag is zero, the
-      server silently drops the message.
-    </doc>
-    <doc name = "rule" test = "amq_basic_07">
-      The server SHOULD implement the mandatory flag.
-    </doc>
-  </field>
-
-  <field name = "immediate" type = "bit">
-    request immediate delivery
-    <doc>
-      This flag tells the server how to react if the message cannot be
-      routed to a queue consumer immediately.  If this flag is set, the
-      server will return an undeliverable message with a Return method.
-      If this flag is zero, the server will queue the message, but with
-      no guarantee that it will ever be consumed.
-    </doc>
-    <doc name = "rule" test = "amq_basic_16">
-      The server SHOULD implement the immediate flag.
-    </doc>
-  </field>
-</method>
-
-<method name = "return" content = "1" index = "50">
-  return a failed message
-  <doc>
-    This method returns an undeliverable message that was published
-    with the "immediate" flag set, or an unroutable message published
-    with the "mandatory" flag set. The reply code and text provide
-    information about the reason that the message was undeliverable.
-  </doc>
-  <chassis name = "client" implement = "MUST" />
-
-  <field name = "reply code" domain = "reply code" />
-  <field name = "reply text" domain = "reply text" />
-
-  <field name = "exchange" domain = "exchange name">
-    <doc>
-      Specifies the name of the exchange that the message was
-      originally published to.
-    </doc>
-  </field>
-
-  <field name = "routing key" type = "shortstr">
-     Message routing key
-    <doc>
-      Specifies the routing key name specified when the message was
-      published.
-    </doc>
-  </field>
-</method>
-
-
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-<method name = "deliver" content = "1" index = "60">
-  notify the client of a consumer message
-  <doc>
-    This method delivers a message to the client, via a consumer.  In
-    the asynchronous message delivery model, the client starts a
-    consumer using the Consume method, then the server responds with
-    Deliver methods as and when messages arrive for that consumer.
-  </doc>
-  <doc name = "rule" test = "amq_basic_19">
-    The server SHOULD track the number of times a message has been
-    delivered to clients and when a message is redelivered a certain
-    number of times - e.g. 5 times - without being acknowledged, the
-    server SHOULD consider the message to be unprocessable (possibly
-    causing client applications to abort), and move the message to a
-    dead letter queue.
-  </doc>
-  <chassis name = "client" implement = "MUST" />
-
-  <field name = "consumer tag" domain = "consumer tag" />
-
-  <field name = "delivery tag" domain = "delivery tag" />
-
-  <field name = "redelivered" domain = "redelivered" />
-
-  <field name = "exchange" domain = "exchange name">
-    <doc>
-      Specifies the name of the exchange that the message was
-      originally published to.
-    </doc>
-  </field>
-
-  <field name = "routing key" type = "shortstr">
-     Message routing key
-    <doc>
-      Specifies the routing key name specified when the message was
-      published.
-    </doc>
-  </field>
-</method>
-
-
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-<method name = "get" synchronous = "1" index = "70">
-  direct access to a queue
-  <doc>
-    This method provides a direct access to the messages in a queue
-    using a synchronous dialogue that is designed for specific types of
-    application where synchronous functionality is more important than
-    performance.
-  </doc>
-  <response name = "get-ok" />
-  <response name = "get-empty" />
-  <chassis name = "server" implement = "MUST" />
-
-  <field name = "ticket" domain = "access ticket">
-    <doc name = "rule">
-      The client MUST provide a valid access ticket giving "read"
-      access rights to the realm for the queue.
-    </doc>
-  </field>
-
-  <field name = "queue" domain = "queue name">
-    <doc>
-      Specifies the name of the queue to consume from.  If the queue name
-      is null, refers to the current queue for the channel, which is the
-      last declared queue.
-    </doc>
-    <doc name = "rule">
-      If the client did not previously declare a queue, and the queue name
-      in this method is empty, the server MUST raise a connection exception
-      with reply code 530 (not allowed).
-    </doc>
-  </field>
-
-  <field name = "no ack" domain = "no ack" />
-</method>
-
-<method name = "get-ok" synchronous = "1" content = "1" index = "71">
-  provide client with a message
-  <doc>
-    This method delivers a message to the client following a get
-    method.  A message delivered by 'get-ok' must be acknowledged
-    unless the no-ack option was set in the get method.
-  </doc>
-  <chassis name = "client" implement = "MAY" />
-
-  <field name = "delivery tag" domain = "delivery tag" />
-
-  <field name = "redelivered"  domain = "redelivered"  />
-
-  <field name = "exchange" domain = "exchange name">
-    <doc>
-      Specifies the name of the exchange that the message was originally
-      published to.  If empty, the message was published to the default
-      exchange.
-    </doc>
-  </field>
-
-  <field name = "routing key" type = "shortstr">
-     Message routing key
-    <doc>
-      Specifies the routing key name specified when the message was
-      published.
-    </doc>
-  </field>
-
-  <field name = "message count" type = "long" >
-    number of messages pending
-    <doc>
-      This field reports the number of messages pending on the queue,
-      excluding the message being delivered.  Note that this figure is
-      indicative, not reliable, and can change arbitrarily as messages
-      are added to the queue and removed by other clients.
-    </doc>
-  </field>
-</method>
-
-
-<method name = "get-empty" synchronous = "1" index = "72">
-  indicate no messages available
-  <doc>
-    This method tells the client that the queue has no messages
-    available for the client.
-  </doc>
-  <chassis name = "client" implement = "MAY" />
-
-  <field name = "cluster id" type = "shortstr">
-     Cluster id
-    <doc>
-      For use by cluster applications, should not be used by
-      client applications.
-    </doc>
-  </field>
-</method>
-
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-<method name = "ack" index = "80">
-  acknowledge one or more messages
-  <doc>
-    This method acknowledges one or more messages delivered via the
-    Deliver or Get-Ok methods.  The client can ask to confirm a
-    single message or a set of messages up to and including a specific
-    message.
-  </doc>
-  <chassis name = "server" implement = "MUST" />
-  <field name = "delivery tag" domain = "delivery tag" />
-
-  <field name = "multiple" type = "bit">
-    acknowledge multiple messages
-    <doc>
-      If set to 1, the delivery tag is treated as "up to and including",
-      so that the client can acknowledge multiple messages with a single
-      method.  If set to zero, the delivery tag refers to a single
-      message.  If the multiple field is 1, and the delivery tag is zero,
-      tells the server to acknowledge all outstanding mesages.
-    </doc>
-    <doc name = "rule" test = "amq_basic_20">
-      The server MUST validate that a non-zero delivery-tag refers to an
-      delivered message, and raise a channel exception if this is not the
-      case.
-    </doc>
-  </field>
-</method>
-
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-<method name = "reject" index = "90">
-  reject an incoming message
-  <doc>
-    This method allows a client to reject a message.  It can be used to
-    interrupt and cancel large incoming messages, or return untreatable
-    messages to their original queue.
-  </doc>
-  <doc name = "rule" test = "amq_basic_21">
-    The server SHOULD be capable of accepting and process the Reject
-    method while sending message content with a Deliver or Get-Ok
-    method.  I.e. the server should read and process incoming methods
-    while sending output frames.  To cancel a partially-send content,
-    the server sends a content body frame of size 1 (i.e. with no data
-    except the frame-end octet).
-  </doc>
-  <doc name = "rule" test = "amq_basic_22">
-    The server SHOULD interpret this method as meaning that the client
-    is unable to process the message at this time.
-  </doc>
-  <doc name = "rule">
-    A client MUST NOT use this method as a means of selecting messages
-    to process.  A rejected message MAY be discarded or dead-lettered,
-    not necessarily passed to another client.
-  </doc>      
-  <chassis name = "server" implement = "MUST" />
-    
-  <field name = "delivery tag" domain = "delivery tag" />
-
-  <field name = "requeue" type = "bit">
-    requeue the message
-    <doc>
-      If this field is zero, the message will be discarded.  If this bit
-      is 1, the server will attempt to requeue the message.
-    </doc>
-    <doc name = "rule" test = "amq_basic_23">
-      The server MUST NOT deliver the message to the same client within
-      the context of the current channel.  The recommended strategy is
-      to attempt to deliver the message to an alternative consumer, and
-      if that is not possible, to move the message to a dead-letter
-      queue.  The server MAY use more sophisticated tracking to hold
-      the message on the queue and redeliver it to the same client at
-      a later stage.
-    </doc>
-  </field>
-</method>
-
-<method name = "recover" index = "100">
-  redeliver unacknowledged messages. This method is only allowed on non-transacted channels.
-  <doc>
-    This method asks the broker to redeliver all unacknowledged messages on a
-    specifieid channel. Zero or more messages may be redelivered.
-  </doc>
-  <chassis name = "server" implement = "MUST" />
-
-  <field name = "requeue" type = "bit">
-    requeue the message
-    <doc>
-      If this field is zero, the message will be redelivered to the original recipient.  If this bit
-      is 1, the server will attempt to requeue the message, potentially then delivering it to an
-      alternative subscriber.
-    </doc>
-  </field>
-
-    <doc name="rule">
-      The server MUST set the redelivered flag on all messages that are resent.
-    </doc>
-    <doc name="rule">
-    The server MUST raise a channel exception if this is called on a transacted channel.
-    </doc>
-</method>
-
-
-</class>
-
-
-  <class name="file" handler="channel" index="70">
-    <!--
-======================================================
-==      FILE TRANSFER
-======================================================
--->
-  work with file content
-<doc>
-  The file class provides methods that support reliable file transfer.
-  File messages have a specific set of properties that are required for
-  interoperability with file transfer applications. File messages and
-  acknowledgements are subject to channel transactions.  Note that the
-  file class does not provide message browsing methods; these are not
-  compatible with the staging model.  Applications that need browsable
-  file transfer should use Basic content and the Basic class.
-</doc>
-
-<doc name = "grammar">
-    file                = C:QOS S:QOS-OK
-                        / C:CONSUME S:CONSUME-OK
-                        / C:CANCEL S:CANCEL-OK
-                        / C:OPEN S:OPEN-OK C:STAGE content
-                        / S:OPEN C:OPEN-OK S:STAGE content
-                        / C:PUBLISH
-                        / S:DELIVER
-                        / S:RETURN
-                        / C:ACK
-                        / C:REJECT
-</doc>
-
-<chassis name = "server" implement = "MAY" />
-<chassis name = "client" implement = "MAY" />
-
-<doc name = "rule">
-  The server MUST make a best-effort to hold file messages on a
-  reliable storage mechanism.
-</doc>
-<doc name = "rule">
-  The server MUST NOT discard a file message in case of a queue
-  overflow. The server MUST use the Channel.Flow method to slow or stop
-  a file message publisher when necessary.
-</doc>
-<doc name = "rule">
-  The server MUST implement at least 2 priority levels for file
-  messages, where priorities 0-4 and 5-9 are treated as two distinct
-  levels. The server MAY implement up to 10 priority levels.
-</doc>
-<doc name = "rule">
-  The server MUST support both automatic and explicit acknowledgements
-  on file content.
-</doc>
-
-<!--  These are the properties for a File content  -->
-
-<field name = "content type" type = "shortstr">
-    MIME content type
-</field>
-<field name = "content encoding" type = "shortstr">
-    MIME content encoding
-</field>
-<field name = "headers" type = "table">
-    Message header field table
-</field>
-<field name = "priority" type = "octet">
-    The message priority, 0 to 9
-</field>
-<field name = "reply to" type = "shortstr">
-    The destination to reply to
-</field>
-<field name = "message id" type = "shortstr">
-    The application message identifier
-</field>
-<field name = "filename" type = "shortstr">
-    The message filename
-</field>
-<field name = "timestamp" type = "timestamp">
-    The message timestamp
-</field>
-<field name = "cluster id" type = "shortstr">
-    Intra-cluster routing identifier
-</field>
-
-
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-<method name = "qos" synchronous = "1" index = "10">
-  specify quality of service
-  <doc>
-    This method requests a specific quality of service.  The QoS can
-    be specified for the current channel or for all channels on the
-    connection.  The particular properties and semantics of a qos method
-    always depend on the content class semantics.  Though the qos method
-    could in principle apply to both peers, it is currently meaningful
-    only for the server.
-  </doc>
-  <chassis name = "server" implement = "MUST" />
-  <response name = "qos-ok" />
-
-  <field name = "prefetch size" type = "long">
-    prefetch window in octets
-    <doc>
-      The client can request that messages be sent in advance so that
-      when the client finishes processing a message, the following
-      message is already held locally, rather than needing to be sent
-      down the channel.  Prefetching gives a performance improvement.
-      This field specifies the prefetch window size in octets. May be
-      set to zero, meaning "no specific limit".  Note that other
-      prefetch limits may still apply. The prefetch-size is ignored
-      if the no-ack option is set.
-    </doc>
-  </field>
-
-  <field name = "prefetch count" type = "short">
-    prefetch window in messages
-    <doc>
-      Specifies a prefetch window in terms of whole messages.  This
-      is compatible with some file API implementations.  This field
-      may be used in combination with the prefetch-size field; a
-      message will only be sent in advance if both prefetch windows
-      (and those at the channel and connection level) allow it.
-      The prefetch-count is ignored if the no-ack option is set.
-    </doc>
-    <doc name = "rule">
-      The server MAY send less data in advance than allowed by the
-      client's specified prefetch windows but it MUST NOT send more.
-    </doc>
-  </field>
-
-  <field name = "global" type = "bit">
-    apply to entire connection
-    <doc>
-      By default the QoS settings apply to the current channel only.  If
-      this field is set, they are applied to the entire connection.
-    </doc>
-  </field>
-</method>
-
-<method name = "qos-ok" synchronous = "1" index = "11">
-  confirm the requested qos
-  <doc>
-    This method tells the client that the requested QoS levels could
-    be handled by the server.  The requested QoS applies to all active
-    consumers until a new QoS is defined.
-  </doc>
-  <chassis name = "client" implement = "MUST" />
-</method>
-
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-<method name = "consume" synchronous = "1" index = "20">
-  start a queue consumer
-  <doc>
-    This method asks the server to start a "consumer", which is a
-    transient request for messages from a specific queue. Consumers
-    last as long as the channel they were created on, or until the
-    client cancels them.
-  </doc>
-  <doc name = "rule">
-    The server SHOULD support at least 16 consumers per queue, unless
-    the queue was declared as private, and ideally, impose no limit
-    except as defined by available resources.
-  </doc>
-  <chassis name = "server" implement = "MUST" />
-  <response name = "consume-ok" />
-
-  <field name = "ticket" domain = "access ticket">
-    <doc name = "rule">
-      The client MUST provide a valid access ticket giving "read" access
-      rights to the realm for the queue.
-    </doc>
-  </field>
-
-  <field name = "queue" domain = "queue name">
-    <doc>
-      Specifies the name of the queue to consume from.  If the queue name
-      is null, refers to the current queue for the channel, which is the
-      last declared queue.
-    </doc>
-    <doc name = "rule">
-      If the client did not previously declare a queue, and the queue name
-      in this method is empty, the server MUST raise a connection exception
-      with reply code 530 (not allowed).
-    </doc>
-  </field>
-
-  <field name = "consumer tag" domain = "consumer tag">
-    <doc>
-      Specifies the identifier for the consumer. The consumer tag is
-      local to a connection, so two clients can use the same consumer
-      tags. If this field is empty the server will generate a unique
-      tag.
-    </doc>
-    <doc name = "rule" test = "todo">
-      The tag MUST NOT refer to an existing consumer. If the client
-      attempts to create two consumers with the same non-empty tag
-      the server MUST raise a connection exception with reply code
-      530 (not allowed).
-    </doc>
-  </field>
-
-  <field name = "no local" domain = "no local" />
-
-  <field name = "no ack" domain = "no ack" />
-
-  <field name = "exclusive" type = "bit">
-    request exclusive access
-    <doc>
-      Request exclusive consumer access, meaning only this consumer can
-      access the queue.
-    </doc>
-    <doc name = "rule" test = "amq_file_00">
-      If the server cannot grant exclusive access to the queue when asked,
-      - because there are other consumers active - it MUST raise a channel
-      exception with return code 405 (resource locked).
-    </doc>
-  </field>
-
-  <field name = "nowait" type = "bit">
-    do not send a reply method
-    <doc>
-    If set, the server will not respond to the method. The client should
-    not wait for a reply method.  If the server could not complete the
-    method it will raise a channel or connection exception.
-    </doc>
-  </field>
-</method>
-
-<method name = "consume-ok" synchronous = "1" index = "21">
-  confirm a new consumer
-  <doc>
-    This method provides the client with a consumer tag which it MUST
-    use in methods that work with the consumer.
-  </doc>
-  <chassis name = "client" implement = "MUST" />
-
-  <field name = "consumer tag" domain = "consumer tag">
-    <doc>
-      Holds the consumer tag specified by the client or provided by
-      the server.
-    </doc>
-  </field>
-</method>
-
-
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-<method name = "cancel" synchronous = "1" index = "30">
-  end a queue consumer
-  <doc>
-    This method cancels a consumer. This does not affect already
-    delivered messages, but it does mean the server will not send any
-    more messages for that consumer.
-  </doc>
-  <chassis name = "server" implement = "MUST" />
-  <response name = "cancel-ok" />
-
-  <field name = "consumer tag" domain = "consumer tag" />
-
-  <field name = "nowait" type = "bit">
-    do not send a reply method
-    <doc>
-    If set, the server will not respond to the method. The client should
-    not wait for a reply method.  If the server could not complete the
-    method it will raise a channel or connection exception.
-    </doc>
-  </field>
-</method>
-
-<method name = "cancel-ok" synchronous = "1" index = "31">
-  confirm a cancelled consumer
-  <doc>
-    This method confirms that the cancellation was completed.
-  </doc>
-  <chassis name = "client" implement = "MUST" />
-
-  <field name = "consumer tag" domain = "consumer tag" />
-</method>
-
-
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-<method name = "open" synchronous = "1" index = "40">
-  request to start staging
-  <doc>
-    This method requests permission to start staging a message.  Staging
-    means sending the message into a temporary area at the recipient end
-    and then delivering the message by referring to this temporary area.
-    Staging is how the protocol handles partial file transfers - if a
-    message is partially staged and the connection breaks, the next time
-    the sender starts to stage it, it can restart from where it left off.
-  </doc>
-  <response name = "open-ok" />
-  <chassis name = "server" implement = "MUST" />
-  <chassis name = "client" implement = "MUST" />
-  
-  <field name = "identifier" type = "shortstr">
-    staging identifier
-    <doc>
-      This is the staging identifier. This is an arbitrary string chosen
-      by the sender.  For staging to work correctly the sender must use
-      the same staging identifier when staging the same message a second
-      time after recovery from a failure.  A good choice for the staging
-      identifier would be the SHA1 hash of the message properties data
-      (including the original filename, revised time, etc.).
-    </doc>
-  </field>
-
-  <field name = "content size" type = "longlong">
-    message content size
-    <doc>
-      The size of the content in octets.  The recipient may use this
-      information to allocate or check available space in advance, to
-      avoid "disk full" errors during staging of very large messages.
-    </doc>
-    <doc name = "rule">
-      The sender MUST accurately fill the content-size field.
-      Zero-length content is permitted.
-    </doc>
-  </field>
-</method>
-
-<method name = "open-ok" synchronous = "1" index = "41">
-  confirm staging ready
-  <doc>
-    This method confirms that the recipient is ready to accept staged
-    data.  If the message was already partially-staged at a previous
-    time the recipient will report the number of octets already staged.
-  </doc>
-  <response name = "stage" />
-  <chassis name = "server" implement = "MUST" />
-  <chassis name = "client" implement = "MUST" />
-  
-  <field name = "staged size" type = "longlong">
-    already staged amount
-    <doc>
-      The amount of previously-staged content in octets.  For a new
-      message this will be zero.
-    </doc>
-    <doc name = "rule">
-      The sender MUST start sending data from this octet offset in the
-      message, counting from zero.
-    </doc>
-    <doc name = "rule">
-      The recipient MAY decide how long to hold partially-staged content
-      and MAY implement staging by always discarding partially-staged
-      content.  However if it uses the file content type it MUST support
-      the staging methods.
-    </doc>
-  </field>
-</method>
-
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-<method name = "stage" content = "1" index = "50">
-  stage message content
-  <doc>
-    This method stages the message, sending the message content to the
-    recipient from the octet offset specified in the Open-Ok method.
-  </doc>
-  <chassis name = "server" implement = "MUST" />
-  <chassis name = "client" implement = "MUST" />
-</method>
-
-
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-<method name = "publish" index = "60">
-  publish a message
-  <doc>
-    This method publishes a staged file message to a specific exchange.
-    The file message will be routed to queues as defined by the exchange
-    configuration and distributed to any active consumers when the
-    transaction, if any, is committed.
-  </doc>
-  <chassis name = "server" implement = "MUST" />
-
-  <field name = "ticket" domain = "access ticket">
-    <doc name = "rule">
-      The client MUST provide a valid access ticket giving "write"
-      access rights to the access realm for the exchange.
-    </doc>
-  </field>
-
-  <field name = "exchange" domain = "exchange name">
-    <doc>
-      Specifies the name of the exchange to publish to.  The exchange
-      name can be empty, meaning the default exchange.  If the exchange
-      name is specified, and that exchange does not exist, the server
-      will raise a channel exception.
-    </doc>
-    <doc name = "rule">
-      The server MUST accept a blank exchange name to mean the default
-      exchange.
-    </doc>
-    <doc name = "rule">
-      If the exchange was declared as an internal exchange, the server
-      MUST respond with a reply code 403 (access refused) and raise a
-      channel exception.
-    </doc>
-    <doc name = "rule">
-      The exchange MAY refuse file content in which case it MUST respond
-      with a reply code 540 (not implemented) and raise a channel
-      exception.
-    </doc>
-  </field>
-
-  <field name = "routing key" type = "shortstr">
-     Message routing key
-    <doc>
-      Specifies the routing key for the message.  The routing key is
-      used for routing messages depending on the exchange configuration.
-    </doc>
-  </field>
-
-  <field name = "mandatory" type = "bit">
-    indicate mandatory routing
-    <doc>
-      This flag tells the server how to react if the message cannot be
-      routed to a queue.  If this flag is set, the server will return an
-      unroutable message with a Return method.  If this flag is zero, the
-      server silently drops the message.
-    </doc>
-    <doc name = "rule" test = "amq_file_00">
-      The server SHOULD implement the mandatory flag.
-    </doc>
-  </field>
-
-  <field name = "immediate" type = "bit">
-    request immediate delivery
-    <doc>
-      This flag tells the server how to react if the message cannot be
-      routed to a queue consumer immediately.  If this flag is set, the
-      server will return an undeliverable message with a Return method.
-      If this flag is zero, the server will queue the message, but with
-      no guarantee that it will ever be consumed.
-    </doc>
-    <doc name = "rule" test = "amq_file_00">
-      The server SHOULD implement the immediate flag.
-    </doc>
-  </field>
-
-  <field name = "identifier" type = "shortstr">
-    staging identifier
-    <doc>
-      This is the staging identifier of the message to publish.  The
-      message must have been staged.  Note that a client can send the
-      Publish method asynchronously without waiting for staging to
-      finish.
-    </doc>
-  </field>
-</method>
-
-<method name = "return" content = "1" index = "70">
-  return a failed message
-  <doc>
-    This method returns an undeliverable message that was published
-    with the "immediate" flag set, or an unroutable message published
-    with the "mandatory" flag set. The reply code and text provide
-    information about the reason that the message was undeliverable.
-  </doc>
-  <chassis name = "client" implement = "MUST" />
-
-  <field name = "reply code" domain = "reply code" />
-  <field name = "reply text" domain = "reply text" />
-
-  <field name = "exchange" domain = "exchange name">
-    <doc>
-      Specifies the name of the exchange that the message was
-      originally published to.
-    </doc>
-  </field>
-
-  <field name = "routing key" type = "shortstr">
-     Message routing key
-    <doc>
-      Specifies the routing key name specified when the message was
-      published.
-    </doc>
-  </field>
-</method>
-
-
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-<method name = "deliver" index = "80">
-  notify the client of a consumer message
-  <doc>
-    This method delivers a staged file message to the client, via a
-    consumer. In the asynchronous message delivery model, the client
-    starts a consumer using the Consume method, then the server
-    responds with Deliver methods as and when messages arrive for
-    that consumer.
-  </doc>
-  <doc name = "rule">
-    The server SHOULD track the number of times a message has been
-    delivered to clients and when a message is redelivered a certain
-    number of times - e.g. 5 times - without being acknowledged, the
-    server SHOULD consider the message to be unprocessable (possibly
-    causing client applications to abort), and move the message to a
-    dead letter queue.
-  </doc>
-  <chassis name = "client" implement = "MUST" />
-
-  <field name = "consumer tag" domain = "consumer tag" />
-
-  <field name = "delivery tag" domain = "delivery tag" />
-
-  <field name = "redelivered" domain = "redelivered" />
-
-  <field name = "exchange" domain = "exchange name">
-    <doc>
-      Specifies the name of the exchange that the message was originally
-      published to.
-    </doc>
-  </field>
-
-  <field name = "routing key" type = "shortstr">
-     Message routing key
-    <doc>
-      Specifies the routing key name specified when the message was
-      published.
-    </doc>
-  </field>
-
-  <field name = "identifier" type = "shortstr">
-    staging identifier
-    <doc>
-      This is the staging identifier of the message to deliver.  The
-      message must have been staged.  Note that a server can send the
-      Deliver method asynchronously without waiting for staging to
-      finish.
-    </doc>
-  </field>
-</method>
-
-
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-<method name = "ack" index = "90">
-  acknowledge one or more messages
-  <doc>
-    This method acknowledges one or more messages delivered via the
-    Deliver method.  The client can ask to confirm a single message or
-    a set of messages up to and including a specific message.
-  </doc>
-  <chassis name = "server" implement = "MUST" />
-  <field name = "delivery tag" domain = "delivery tag" />
-      
-  <field name = "multiple" type = "bit">
-    acknowledge multiple messages
-    <doc>
-      If set to 1, the delivery tag is treated as "up to and including",
-      so that the client can acknowledge multiple messages with a single
-      method.  If set to zero, the delivery tag refers to a single
-      message.  If the multiple field is 1, and the delivery tag is zero,
-      tells the server to acknowledge all outstanding mesages.
-    </doc>
-    <doc name = "rule">
-      The server MUST validate that a non-zero delivery-tag refers to an
-      delivered message, and raise a channel exception if this is not the
-      case.
-    </doc>
-  </field>
-</method>
-
-
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-<method name = "reject" index = "100">
-  reject an incoming message
-  <doc>
-    This method allows a client to reject a message.  It can be used to
-    return untreatable messages to their original queue.  Note that file
-    content is staged before delivery, so the client will not use this
-    method to interrupt delivery of a large message.
-  </doc>
-  <doc name = "rule">
-    The server SHOULD interpret this method as meaning that the client
-    is unable to process the message at this time.
-  </doc>
-  <doc name = "rule">
-    A client MUST NOT use this method as a means of selecting messages
-    to process.  A rejected message MAY be discarded or dead-lettered,
-    not necessarily passed to another client.
-  </doc>
-  <chassis name = "server" implement = "MUST" />
-    
-  <field name = "delivery tag" domain = "delivery tag" />
-
-  <field name = "requeue" type = "bit">
-    requeue the message
-    <doc>
-      If this field is zero, the message will be discarded.  If this bit
-      is 1, the server will attempt to requeue the message.
-    </doc>
-    <doc name = "rule">
-      The server MUST NOT deliver the message to the same client within
-      the context of the current channel.  The recommended strategy is
-      to attempt to deliver the message to an alternative consumer, and
-      if that is not possible, to move the message to a dead-letter
-      queue.  The server MAY use more sophisticated tracking to hold
-      the message on the queue and redeliver it to the same client at
-      a later stage.
-    </doc>
-  </field>
-</method>
-
-</class>
-
-  <class name="stream" handler="channel" index="80">
-    <!--
-======================================================
-==       STREAMING
-======================================================
--->
-  work with streaming content
-
-<doc>
-  The stream class provides methods that support multimedia streaming.
-  The stream class uses the following semantics: one message is one
-  packet of data; delivery is unacknowleged and unreliable; the consumer
-  can specify quality of service parameters that the server can try to
-  adhere to; lower-priority messages may be discarded in favour of high
-  priority messages.
-</doc>
-
-<doc name = "grammar">
-    stream              = C:QOS S:QOS-OK
-                        / C:CONSUME S:CONSUME-OK
-                        / C:CANCEL S:CANCEL-OK
-                        / C:PUBLISH content
-                        / S:RETURN
-                        / S:DELIVER content
-</doc>
-
-<chassis name = "server" implement = "MAY" />
-<chassis name = "client" implement = "MAY" />
-
-<doc name = "rule">
-  The server SHOULD discard stream messages on a priority basis if
-  the queue size exceeds some configured limit.
-</doc>
-<doc name = "rule">
-  The server MUST implement at least 2 priority levels for stream
-  messages, where priorities 0-4 and 5-9 are treated as two distinct
-  levels. The server MAY implement up to 10 priority levels.
-</doc>
-<doc name = "rule">
-  The server MUST implement automatic acknowledgements on stream
-  content.  That is, as soon as a message is delivered to a client
-  via a Deliver method, the server must remove it from the queue.
-</doc>
-
-
-<!--  These are the properties for a Stream content  -->
-
-<field name = "content type" type = "shortstr">
-    MIME content type
-</field>
-<field name = "content encoding" type = "shortstr">
-    MIME content encoding
-</field>
-<field name = "headers" type = "table">
-    Message header field table
-</field>
-<field name = "priority" type = "octet">
-    The message priority, 0 to 9
-</field>
-<field name = "timestamp" type = "timestamp">
-    The message timestamp
-</field>
-
-
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-<method name = "qos" synchronous = "1" index = "10">
-  specify quality of service
-  <doc>
-    This method requests a specific quality of service.  The QoS can
-    be specified for the current channel or for all channels on the
-    connection.  The particular properties and semantics of a qos method
-    always depend on the content class semantics.  Though the qos method
-    could in principle apply to both peers, it is currently meaningful
-    only for the server.
-  </doc>
-  <chassis name = "server" implement = "MUST" />
-  <response name = "qos-ok" />
-
-  <field name = "prefetch size" type = "long">
-    prefetch window in octets
-    <doc>
-      The client can request that messages be sent in advance so that
-      when the client finishes processing a message, the following
-      message is already held locally, rather than needing to be sent
-      down the channel.  Prefetching gives a performance improvement.
-      This field specifies the prefetch window size in octets. May be
-      set to zero, meaning "no specific limit".  Note that other
-      prefetch limits may still apply.
-    </doc>
-  </field>
-
-  <field name = "prefetch count" type = "short">
-    prefetch window in messages
-    <doc>
-      Specifies a prefetch window in terms of whole messages.  This
-      field may be used in combination with the prefetch-size field;
-      a message will only be sent in advance if both prefetch windows
-      (and those at the channel and connection level) allow it.
-    </doc>
-  </field>
-
-  <field name = "consume rate" type = "long">
-    transfer rate in octets/second
-    <doc>
-      Specifies a desired transfer rate in octets per second. This is
-      usually determined by the application that uses the streaming
-      data.  A value of zero means "no limit", i.e. as rapidly as
-      possible.
-    </doc>
-    <doc name = "rule">
-      The server MAY ignore the prefetch values and consume rates,
-      depending on the type of stream and the ability of the server
-      to queue and/or reply it.  The server MAY drop low-priority
-      messages in favour of high-priority messages.
-    </doc>
-  </field>
-
-  <field name = "global" type = "bit">
-    apply to entire connection
-    <doc>
-      By default the QoS settings apply to the current channel only.  If
-      this field is set, they are applied to the entire connection.
-    </doc>
-  </field>
-</method>
-
-<method name = "qos-ok" synchronous = "1" index = "11">
-  confirm the requested qos
-  <doc>
-    This method tells the client that the requested QoS levels could
-    be handled by the server.  The requested QoS applies to all active
-    consumers until a new QoS is defined.
-  </doc>
-  <chassis name = "client" implement = "MUST" />
-</method>
-
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-<method name = "consume" synchronous = "1" index = "20">
-  start a queue consumer
-  <doc>
-    This method asks the server to start a "consumer", which is a
-    transient request for messages from a specific queue. Consumers
-    last as long as the channel they were created on, or until the
-    client cancels them.
-  </doc>
-  <doc name = "rule">
-    The server SHOULD support at least 16 consumers per queue, unless
-    the queue was declared as private, and ideally, impose no limit
-    except as defined by available resources.
-  </doc>
-  <doc name = "rule">
-    Streaming applications SHOULD use different channels to select
-    different streaming resolutions. AMQP makes no provision for
-    filtering and/or transforming streams except on the basis of
-    priority-based selective delivery of individual messages.
-  </doc>
-  <chassis name = "server" implement = "MUST" />
-  <response name = "consume-ok" />
-
-  <field name = "ticket" domain = "access ticket">
-    <doc name = "rule">
-      The client MUST provide a valid access ticket giving "read" access
-      rights to the realm for the queue.
-    </doc>
-  </field>
-
-  <field name = "queue" domain = "queue name">
-    <doc>
-      Specifies the name of the queue to consume from.  If the queue name
-      is null, refers to the current queue for the channel, which is the
-      last declared queue.
-    </doc>
-    <doc name = "rule">
-      If the client did not previously declare a queue, and the queue name
-      in this method is empty, the server MUST raise a connection exception
-      with reply code 530 (not allowed).
-    </doc>
-  </field>
-
-  <field name = "consumer tag" domain = "consumer tag">
-    <doc>
-      Specifies the identifier for the consumer. The consumer tag is
-      local to a connection, so two clients can use the same consumer
-      tags. If this field is empty the server will generate a unique
-      tag.
-    </doc>
-    <doc name = "rule" test = "todo">
-      The tag MUST NOT refer to an existing consumer. If the client
-      attempts to create two consumers with the same non-empty tag
-      the server MUST raise a connection exception with reply code
-      530 (not allowed).
-    </doc>
-  </field>
-
-  <field name = "no local" domain = "no local" />
-
-  <field name = "exclusive" type = "bit">
-    request exclusive access
-    <doc>
-      Request exclusive consumer access, meaning only this consumer can
-      access the queue.
-    </doc>
-    <doc name = "rule" test = "amq_file_00">
-      If the server cannot grant exclusive access to the queue when asked,
-      - because there are other consumers active - it MUST raise a channel
-      exception with return code 405 (resource locked).
-    </doc>
-  </field>
-
-  <field name = "nowait" type = "bit">
-    do not send a reply method
-    <doc>
-    If set, the server will not respond to the method. The client should
-    not wait for a reply method.  If the server could not complete the
-    method it will raise a channel or connection exception.
-    </doc>
-  </field>
-</method>
-
-
-<method name = "consume-ok" synchronous = "1" index = "21">
-  confirm a new consumer
-  <doc>
-    This method provides the client with a consumer tag which it may
-    use in methods that work with the consumer.
-  </doc>
-  <chassis name = "client" implement = "MUST" />
-
-  <field name = "consumer tag" domain = "consumer tag">
-    <doc>
-      Holds the consumer tag specified by the client or provided by
-      the server.
-    </doc>
-  </field>
-</method>
-
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-<method name = "cancel" synchronous = "1" index = "30">
-  end a queue consumer
-  <doc>
-    This method cancels a consumer.  Since message delivery is
-    asynchronous the client may continue to receive messages for
-    a short while after canceling a consumer.  It may process or
-    discard these as appropriate.
-  </doc>
-  <chassis name = "server" implement = "MUST" />
-  <response name = "cancel-ok" />
-
-  <field name = "consumer tag" domain = "consumer tag" />
-
-  <field name = "nowait" type = "bit">
-    do not send a reply method
-    <doc>
-    If set, the server will not respond to the method. The client should
-    not wait for a reply method.  If the server could not complete the
-    method it will raise a channel or connection exception.
-    </doc>
-  </field>
-</method>
-
-<method name = "cancel-ok" synchronous = "1" index = "31">
-  confirm a cancelled consumer
-  <doc>
-    This method confirms that the cancellation was completed.
-  </doc>
-  <chassis name = "client" implement = "MUST" />
-
-  <field name = "consumer tag" domain = "consumer tag" />
-</method>
-
-
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-<method name = "publish" content = "1" index = "40">
-  publish a message
-  <doc>
-    This method publishes a message to a specific exchange. The message
-    will be routed to queues as defined by the exchange configuration
-    and distributed to any active consumers as appropriate.
-  </doc>
-  <chassis name = "server" implement = "MUST" />
-
-  <field name = "ticket" domain = "access ticket">
-    <doc name = "rule">
-      The client MUST provide a valid access ticket giving "write"
-      access rights to the access realm for the exchange.
-    </doc>
-  </field>
-
-  <field name = "exchange" domain = "exchange name">
-    <doc>
-      Specifies the name of the exchange to publish to.  The exchange
-      name can be empty, meaning the default exchange.  If the exchange
-      name is specified, and that exchange does not exist, the server
-      will raise a channel exception.
-    </doc>
-    <doc name = "rule">
-      The server MUST accept a blank exchange name to mean the default
-      exchange.
-    </doc>
-    <doc name = "rule">
-      If the exchange was declared as an internal exchange, the server
-      MUST respond with a reply code 403 (access refused) and raise a
-      channel exception.
-    </doc>
-    <doc name = "rule">
-      The exchange MAY refuse stream content in which case it MUST
-      respond with a reply code 540 (not implemented) and raise a
-      channel exception.
-    </doc>
-  </field>
-
-  <field name = "routing key" type = "shortstr">
-     Message routing key
-    <doc>
-      Specifies the routing key for the message.  The routing key is
-      used for routing messages depending on the exchange configuration.
-    </doc>
-  </field>
-
-  <field name = "mandatory" type = "bit">
-    indicate mandatory routing
-    <doc>
-      This flag tells the server how to react if the message cannot be
-      routed to a queue.  If this flag is set, the server will return an
-      unroutable message with a Return method.  If this flag is zero, the
-      server silently drops the message.
-    </doc>
-    <doc name = "rule" test = "amq_stream_00">
-      The server SHOULD implement the mandatory flag.
-    </doc>
-  </field>
-
-  <field name = "immediate" type = "bit">
-    request immediate delivery
-    <doc>
-      This flag tells the server how to react if the message cannot be
-      routed to a queue consumer immediately.  If this flag is set, the
-      server will return an undeliverable message with a Return method.
-      If this flag is zero, the server will queue the message, but with
-      no guarantee that it will ever be consumed.
-    </doc>
-    <doc name = "rule" test = "amq_stream_00">
-      The server SHOULD implement the immediate flag.
-    </doc>
-  </field>
-</method>
-
-<method name = "return" content = "1" index = "50">
-  return a failed message
-  <doc>
-    This method returns an undeliverable message that was published
-    with the "immediate" flag set, or an unroutable message published
-    with the "mandatory" flag set. The reply code and text provide
-    information about the reason that the message was undeliverable.
-  </doc>
-  <chassis name = "client" implement = "MUST" />
-
-  <field name = "reply code" domain = "reply code" />
-  <field name = "reply text" domain = "reply text" />
-
-  <field name = "exchange" domain = "exchange name">
-    <doc>
-      Specifies the name of the exchange that the message was
-      originally published to.
-    </doc>
-  </field>
-
-  <field name = "routing key" type = "shortstr">
-     Message routing key
-    <doc>
-      Specifies the routing key name specified when the message was
-      published.
-    </doc>     
-  </field>
-</method>
-
-
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-<method name = "deliver" content = "1" index = "60">
-  notify the client of a consumer message
-  <doc>
-    This method delivers a message to the client, via a consumer.  In
-    the asynchronous message delivery model, the client starts a
-    consumer using the Consume method, then the server responds with
-    Deliver methods as and when messages arrive for that consumer.
-  </doc>
-  <chassis name = "client" implement = "MUST" />
-
-  <field name = "consumer tag" domain = "consumer tag" />
-
-  <field name = "delivery tag" domain = "delivery tag" />
-
-  <field name = "exchange" domain = "exchange name">
-    <doc>
-      Specifies the name of the exchange that the message was originally
-      published to.
-    </doc>
-  </field>
-
-  <field name = "queue" domain = "queue name">
-    <doc>
-      Specifies the name of the queue that the message came from. Note
-      that a single channel can start many consumers on different
-      queues.
-    </doc>
-    <assert check = "notnull" />
-  </field>
-</method>
-  </class>
-
-  <class name="tx" handler="channel" index="90">
-    <!--
-======================================================
-==       TRANSACTIONS
-======================================================
--->
-  work with standard transactions
-
-<doc>
-  Standard transactions provide so-called "1.5 phase commit".  We can
-  ensure that work is never lost, but there is a chance of confirmations
-  being lost, so that messages may be resent.  Applications that use
-  standard transactions must be able to detect and ignore duplicate
-  messages.
-</doc>
-    <rule implement="SHOULD">
-  An client using standard transactions SHOULD be able to track all
-  messages received within a reasonable period, and thus detect and
-  reject duplicates of the same message. It SHOULD NOT pass these to
-  the application layer.
-</rule>
-    <doc name="grammar">
-    tx                  = C:SELECT S:SELECT-OK
-                        / C:COMMIT S:COMMIT-OK
-                        / C:ROLLBACK S:ROLLBACK-OK
-</doc>
-    <chassis name="server" implement="SHOULD"/>
-    <chassis name="client" implement="MAY"/>
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-    <method name="select" synchronous="1" index="10">
-select standard transaction mode
-  <doc>
-    This method sets the channel to use standard transactions.  The
-    client must use this method at least once on a channel before
-    using the Commit or Rollback methods.
-  </doc>
-      <chassis name="server" implement="MUST"/>
-      <response name="select-ok"/>
-    </method>
-    <method name="select-ok" synchronous="1" index="11">
-confirm transaction mode
-  <doc>
-    This method confirms to the client that the channel was successfully
-    set to use standard transactions.
-  </doc>
-      <chassis name="client" implement="MUST"/>
-    </method>
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-    <method name="commit" synchronous="1" index="20">
-commit the current transaction
-  <doc>
-    This method commits all messages published and acknowledged in
-    the current transaction.  A new transaction starts immediately
-    after a commit.
-  </doc>
-      <chassis name="server" implement="MUST"/>
-      <response name="commit-ok"/>
-    </method>
-    <method name="commit-ok" synchronous="1" index="21">
-confirm a successful commit
-  <doc>
-    This method confirms to the client that the commit succeeded.
-    Note that if a commit fails, the server raises a channel exception.
-  </doc>
-      <chassis name="client" implement="MUST"/>
-    </method>
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-    <method name="rollback" synchronous="1" index="30">
-abandon the current transaction
-  <doc>
-    This method abandons all messages published and acknowledged in
-    the current transaction.  A new transaction starts immediately
-    after a rollback.
-  </doc>
-      <chassis name="server" implement="MUST"/>
-      <response name="rollback-ok"/>
-    </method>
-    <method name="rollback-ok" synchronous="1" index="31">
-confirm a successful rollback
-  <doc>
-    This method confirms to the client that the rollback succeeded.
-    Note that if an rollback fails, the server raises a channel exception.
-  </doc>
-      <chassis name="client" implement="MUST"/>
-    </method>
-  </class>
-  <class name="dtx" handler="channel" index="100">
-    <!--
-======================================================
-==       DISTRIBUTED TRANSACTIONS
-======================================================
--->
-  work with distributed transactions
-
-<doc>
-  Distributed transactions provide so-called "2-phase commit".    The
-  AMQP distributed transaction model supports the X-Open XA
-  architecture and other distributed transaction implementations.
-  The Dtx class assumes that the server has a private communications
-  channel (not AMQP) to a distributed transaction coordinator.
-</doc>
-    <doc name="grammar">
-    dtx                 = C:SELECT S:SELECT-OK
-                          C:START S:START-OK
-</doc>
-    <chassis name="server" implement="MAY"/>
-    <chassis name="client" implement="MAY"/>
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-    <method name="select" synchronous="1" index="10">
-select standard transaction mode
-  <doc>
-    This method sets the channel to use distributed transactions.  The
-    client must use this method at least once on a channel before
-    using the Start method.
-  </doc>
-      <chassis name="server" implement="MUST"/>
-      <response name="select-ok"/>
-    </method>
-    <method name="select-ok" synchronous="1" index="11">
-confirm transaction mode
-  <doc>
-    This method confirms to the client that the channel was successfully
-    set to use distributed transactions.
-  </doc>
-      <chassis name="client" implement="MUST"/>
-    </method>
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-    <method name="start" synchronous="1" index="20">
-  start a new distributed transaction
-  <doc>
-    This method starts a new distributed transaction.  This must be
-    the first method on a new channel that uses the distributed
-    transaction mode, before any methods that publish or consume
-    messages.
-  </doc>
-      <chassis name="server" implement="MAY"/>
-      <response name="start-ok"/>
-      <field name="dtx identifier" type="shortstr">
-    transaction identifier
-    <doc>
-      The distributed transaction key. This identifies the transaction
-      so that the AMQP server can coordinate with the distributed
-      transaction coordinator.
-    </doc>
-        <assert check="notnull"/>
-      </field>
-    </method>
-    <method name="start-ok" synchronous="1" index="21">
-  confirm the start of a new distributed transaction
-  <doc>
-    This method confirms to the client that the transaction started.
-    Note that if a start fails, the server raises a channel exception.
-  </doc>
-      <chassis name="client" implement="MUST"/>
-    </method>
-  </class>
-  <class name="tunnel" handler="tunnel" index="110">
-    <!--
-======================================================
-==       TUNNEL
-======================================================
--->
-  methods for protocol tunneling.
-
-<doc>
-  The tunnel methods are used to send blocks of binary data - which
-  can be serialised AMQP methods or other protocol frames - between
-  AMQP peers.
-</doc>
-    <doc name="grammar">
-    tunnel              = C:REQUEST
-                        / S:REQUEST
-</doc>
-    <chassis name="server" implement="MAY"/>
-    <chassis name="client" implement="MAY"/>
-    <field name="headers" type="table">
-    Message header field table
-</field>
-    <field name="proxy name" type="shortstr">
-    The identity of the tunnelling proxy
-</field>
-    <field name="data name" type="shortstr">
-    The name or type of the message being tunnelled
-</field>
-    <field name="durable" type="octet">
-    The message durability indicator
-</field>
-    <field name="broadcast" type="octet">
-    The message broadcast mode
-</field>
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-    <method name="request" content="1" index="10">
-  sends a tunnelled method
-  <doc>
-    This method tunnels a block of binary data, which can be an
-    encoded AMQP method or other data.  The binary data is sent
-    as the content for the Tunnel.Request method.
-  </doc>
-      <chassis name="server" implement="MUST"/>
-      <field name="meta data" type="table">
-    meta data for the tunnelled block
-    <doc>
-    This field table holds arbitrary meta-data that the sender needs
-    to pass to the recipient.
-    </doc>
-      </field>
-    </method>
-  </class>
-  <class name="test" handler="channel" index="120">
-    <!--
-======================================================
-==       TEST - CHECK FUNCTIONAL CAPABILITIES OF AN IMPLEMENTATION
-======================================================
--->
-  test functional primitives of the implementation
-
-<doc>
-  The test class provides methods for a peer to test the basic
-  operational correctness of another peer. The test methods are
-  intended to ensure that all peers respect at least the basic
-  elements of the protocol, such as frame and content organisation
-  and field types. We assume that a specially-designed peer, a
-  "monitor client" would perform such tests.
-</doc>
-    <doc name="grammar">
-    test                = C:INTEGER S:INTEGER-OK
-                        / S:INTEGER C:INTEGER-OK
-                        / C:STRING S:STRING-OK
-                        / S:STRING C:STRING-OK
-                        / C:TABLE S:TABLE-OK
-                        / S:TABLE C:TABLE-OK
-                        / C:CONTENT S:CONTENT-OK
-                        / S:CONTENT C:CONTENT-OK
-</doc>
-    <chassis name="server" implement="MUST"/>
-    <chassis name="client" implement="SHOULD"/>
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-    <method name="integer" synchronous="1" index="10">
-  test integer handling
-  <doc>
-    This method tests the peer's capability to correctly marshal integer
-    data.
-  </doc>
-      <chassis name="client" implement="MUST"/>
-      <chassis name="server" implement="MUST"/>
-      <response name="integer-ok"/>
-      <field name="integer 1" type="octet">
-    octet test value
-    <doc>
-      An octet integer test value.
-    </doc>
-      </field>
-      <field name="integer 2" type="short">
-    short test value
-    <doc>
-      A short integer test value.
-    </doc>
-      </field>
-      <field name="integer 3" type="long">
-    long test value
-    <doc>
-      A long integer test value.
-    </doc>
-      </field>
-      <field name="integer 4" type="longlong">
-    long-long test value
-    <doc>
-      A long long integer test value.
-    </doc>
-      </field>
-      <field name="operation" type="octet">
-    operation to test
-    <doc>
-      The client must execute this operation on the provided integer
-      test fields and return the result.
-    </doc>
-        <assert check="enum">
-          <value name="add">return sum of test values</value>
-          <value name="min">return lowest of test values</value>
-          <value name="max">return highest of test values</value>
-        </assert>
-      </field>
-    </method>
-    <method name="integer-ok" synchronous="1" index="11">
-  report integer test result
-  <doc>
-    This method reports the result of an Integer method.
-  </doc>
-      <chassis name="client" implement="MUST"/>
-      <chassis name="server" implement="MUST"/>
-      <field name="result" type="longlong">
-    result value
-    <doc>
-      The result of the tested operation.
-    </doc>
-      </field>
-    </method>
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-    <method name="string" synchronous="1" index="20">
-  test string handling
-  <doc>
-    This method tests the peer's capability to correctly marshal string
-    data.
-  </doc>
-      <chassis name="client" implement="MUST"/>
-      <chassis name="server" implement="MUST"/>
-      <response name="string-ok"/>
-      <field name="string 1" type="shortstr">
-    short string test value
-    <doc>
-      An short string test value.
-    </doc>
-      </field>
-      <field name="string 2" type="longstr">
-    long string test value
-    <doc>
-      A long string test value.
-    </doc>
-      </field>
-      <field name="operation" type="octet">
-    operation to test
-    <doc>
-      The client must execute this operation on the provided string
-      test fields and return the result.
-    </doc>
-        <assert check="enum">
-          <value name="add">return concatentation of test strings</value>
-          <value name="min">return shortest of test strings</value>
-          <value name="max">return longest of test strings</value>
-        </assert>
-      </field>
-    </method>
-    <method name="string-ok" synchronous="1" index="21">
-  report string test result
-  <doc>
-    This method reports the result of a String method.
-  </doc>
-      <chassis name="client" implement="MUST"/>
-      <chassis name="server" implement="MUST"/>
-      <field name="result" type="longstr">
-    result value
-    <doc>
-      The result of the tested operation.
-    </doc>
-      </field>
-    </method>
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-    <method name="table" synchronous="1" index="30">
-  test field table handling
-  <doc>
-    This method tests the peer's capability to correctly marshal field
-    table data.
-  </doc>
-      <chassis name="client" implement="MUST"/>
-      <chassis name="server" implement="MUST"/>
-      <response name="table-ok"/>
-      <field name="table" type="table">
-    field table of test values
-    <doc>
-      A field table of test values.
-    </doc>
-      </field>
-      <field name="integer op" type="octet">
-    operation to test on integers
-    <doc>
-      The client must execute this operation on the provided field
-      table integer values and return the result.
-    </doc>
-        <assert check="enum">
-          <value name="add">return sum of numeric field values</value>
-          <value name="min">return min of numeric field values</value>
-          <value name="max">return max of numeric field values</value>
-        </assert>
-      </field>
-      <field name="string op" type="octet">
-    operation to test on strings
-    <doc>
-      The client must execute this operation on the provided field
-      table string values and return the result.
-    </doc>
-        <assert check="enum">
-          <value name="add">return concatenation of string field values</value>
-          <value name="min">return shortest of string field values</value>
-          <value name="max">return longest of string field values</value>
-        </assert>
-      </field>
-    </method>
-    <method name="table-ok" synchronous="1" index="31">
-  report table test result
-  <doc>
-    This method reports the result of a Table method.
-  </doc>
-      <chassis name="client" implement="MUST"/>
-      <chassis name="server" implement="MUST"/>
-      <field name="integer result" type="longlong">
-    integer result value
-    <doc>
-      The result of the tested integer operation.
-    </doc>
-      </field>
-      <field name="string result" type="longstr">
-    string result value
-    <doc>
-      The result of the tested string operation.
-    </doc>
-      </field>
-    </method>
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-    <method name="content" synchronous="1" content="1" index="40">
-  test content handling
-  <doc>
-    This method tests the peer's capability to correctly marshal content.
-  </doc>
-      <chassis name="client" implement="MUST"/>
-      <chassis name="server" implement="MUST"/>
-      <response name="content-ok"/>
-    </method>
-    <method name="content-ok" synchronous="1" content="1" index="41">
-  report content test result
-  <doc>
-    This method reports the result of a Content method.  It contains the
-    content checksum and echoes the original content as provided.
-  </doc>
-      <chassis name="client" implement="MUST"/>
-      <chassis name="server" implement="MUST"/>
-      <field name="content checksum" type="long">
-    content hash
-    <doc>
-      The 32-bit checksum of the content, calculated by adding the
-      content into a 32-bit accumulator.
-    </doc>
-      </field>
-    </method>
-  </class>
-</amqp>
diff --git a/qpid/dotnet/Qpid.Common/build.xml b/qpid/dotnet/Qpid.Common/build.xml
deleted file mode 100644
index b6a8fb63b9..0000000000
--- a/qpid/dotnet/Qpid.Common/build.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<!--
- This sole purpose of this build script is to generate the framing layer for the .net client from the AMQ spec.
- -->
-<project name="AMQ Dot Net Framing Layer" default="generate">
-
-    <property name="amq.home" value="../.."/>
-
-    <property name="stylesheet" value="stylesheets/framing.xsl"/>
-    <property name="registry_stylesheet" value="stylesheets/registry.xsl"/>
-    <property name="registry_template" value="resources/registry.template"/>
-    <property name="saxon.jar" value="lib/saxon/saxon8.jar"/>
-    <property name="generated.src" value="generated"/>
-    <property name="static.src" value="src"/>
-    <property name="resources" value="resources"/>
-    <property name="base.lib" value="lib"/>
-
-    <path id="amq.home.path">
-      <pathelement location="${amq.home}"/>
-    </path>
-
-    <pathconvert targetos="unix" property="amq.home.fixed" refid="amq.home.path"/>
-
-<!-- Some spec changes break the build, reverting to private copy in Qpid.Common temporarily till this is fixed. -->
-    <property name="amq.asl" value="${amq.home.fixed}/specs/amqp.0-8.xml"/>
-
-    <target name="clean" description="Deletes the generated sources.">
-        <delete>
-            <fileset dir="${generated.src}" includes="**/*"/>
-        </delete>
-    </target>
-
-    <!-- 
-      Checks if the generation step needs to be performed. It will be skipped if the sources are up to date with the spec and provided that the
-      force flag has not been set. 
-     -->
-    <target name="check-generate" 
-            description="Checks if the generated sources are up-to-date. Use -Dforce=true or the 'forcegen' target to force generation.">
-
-        <condition property="generateNotRequired">
-	    <and>
-	        <uptodate targetfile="${generated.src}/results.out" srcfile="${amq.asl}"/>
-		<not><isset property="force"/></not>
-	    </and>
-	</condition>
-    </target>
-
-    <!-- Applies a transformation to the AMQP spec to generate the framing layer. -->
-    <target name="generate" depends="check-generate" unless="generateNotRequired" description="generates code">
-
-        <mkdir dir="${generated.src}"/>
-
-        <java jar="${saxon.jar}" fork="true">
-            <arg value="-o"/>
-            <arg value="${generated.src}/results.out"/>
-            <arg value="${amq.asl}"/>
-            <arg value="${stylesheet}"/>
-            <arg value="asl_base=${asl.base}"/>
-            <arg value="registry_name=MainRegistry"/>
-        </java>
-
-        <java jar="${saxon.jar}" fork="true">
-            <arg value="-o"/>
-            <arg value="${generated.src}/registry.out"/>
-            <arg value="${registry_template}"/>
-            <arg value="${registry_stylesheet}"/>
-        </java>
-    </target>
-
-    <!-- Does a clean and forces re-generation of the sources. -->
-    <target name="forcegen" depends="clean, generate" description="Forces clean re-generation of the code.">
-    </target>
-
-</project>
diff --git a/qpid/dotnet/Qpid.Common/default.build b/qpid/dotnet/Qpid.Common/default.build
deleted file mode 100644
index 36055b9ca9..0000000000
--- a/qpid/dotnet/Qpid.Common/default.build
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-<project name="Apache.Qpid.Common" default="build">
-    <!--
-		Properties that come from master build file
-		- build.dir: root directory for build
-		- build.debug: true if building debug release
-		- build.defines: variables to define during build
-    -->
-
-    <target name="build">
-        <csc target="library" 
-				define="${build.defines}" 
-				debug="${build.debug}" 
-				output="${build.dir}/${project::get-name()}.dll">
-			
-			<sources>
-			   <include name="**/*.cs" />
-         </sources>
-         <references>
-            <include name="${build.dir}/log4net.dll" />	
-            <include name="${build.dir}/Apache.Qpid.Buffer.dll" />	
-            <include name="${build.dir}/Apache.Qpid.Messaging.dll" />	
-            <include name="${build.dir}/Apache.Qpid.Codec.dll" />	
-         </references>
-        </csc>
-    </target>
-</project>
-
diff --git a/qpid/dotnet/Qpid.Common/lib/log4net/log4net-licence.txt b/qpid/dotnet/Qpid.Common/lib/log4net/log4net-licence.txt
deleted file mode 100644
index 261eeb9e9f..0000000000
--- a/qpid/dotnet/Qpid.Common/lib/log4net/log4net-licence.txt
+++ /dev/null
@@ -1,201 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/qpid/dotnet/Qpid.Common/lib/log4net/log4net.dll b/qpid/dotnet/Qpid.Common/lib/log4net/log4net.dll
deleted file mode 100644
index 995816f27b..0000000000
--- a/qpid/dotnet/Qpid.Common/lib/log4net/log4net.dll
+++ /dev/null
diff --git a/qpid/dotnet/Qpid.Common/lib/log4net/log4net.xml b/qpid/dotnet/Qpid.Common/lib/log4net/log4net.xml
deleted file mode 100644
index b8fd000170..0000000000
--- a/qpid/dotnet/Qpid.Common/lib/log4net/log4net.xml
+++ /dev/null
@@ -1,28655 +0,0 @@
-<?xml version="1.0"?>
-<doc>
-    <assembly>
-        <name>log4net</name>
-    </assembly>
-    <members>
-        <member name="T:log4net.Appender.AdoNetAppender">
-            <summary>
-            Appender that logs to a database.
-            </summary>
-            <remarks>
-            <para>
-            <see cref="T:log4net.Appender.AdoNetAppender"/> appends logging events to a table within a
-            database. The appender can be configured to specify the connection 
-            string by setting the <see cref="P:log4net.Appender.AdoNetAppender.ConnectionString"/> property. 
-            The connection type (provider) can be specified by setting the <see cref="P:log4net.Appender.AdoNetAppender.ConnectionType"/>
-            property. For more information on database connection strings for
-            your specific database see <a href="http://www.connectionstrings.com/">http://www.connectionstrings.com/</a>.
-            </para>
-            <para>
-            Records are written into the database either using a prepared
-            statement or a stored procedure. The <see cref="P:log4net.Appender.AdoNetAppender.CommandType"/> property
-            is set to <see cref="F:System.Data.CommandType.Text"/> (<c>System.Data.CommandType.Text</c>) to specify a prepared statement
-            or to <see cref="F:System.Data.CommandType.StoredProcedure"/> (<c>System.Data.CommandType.StoredProcedure</c>) to specify a stored
-            procedure.
-            </para>
-            <para>
-            The prepared statement text or the name of the stored procedure
-            must be set in the <see cref="P:log4net.Appender.AdoNetAppender.CommandText"/> property.
-            </para>
-            <para>
-            The prepared statement or stored procedure can take a number
-            of parameters. Parameters are added using the <see cref="M:log4net.Appender.AdoNetAppender.AddParameter(log4net.Appender.AdoNetAppenderParameter)"/>
-            method. This adds a single <see cref="T:log4net.Appender.AdoNetAppenderParameter"/> to the
-            ordered list of parameters. The <see cref="T:log4net.Appender.AdoNetAppenderParameter"/>
-            type may be subclassed if required to provide database specific
-            functionality. The <see cref="T:log4net.Appender.AdoNetAppenderParameter"/> specifies
-            the parameter name, database type, size, and how the value should
-            be generated using a <see cref="T:log4net.Layout.ILayout"/>.
-            </para>
-            </remarks>
-            <example>
-            An example of a SQL Server table that could be logged to:
-            <code lang="SQL">
-            CREATE TABLE [dbo].[Log] ( 
-              [ID] [int] IDENTITY (1, 1) NOT NULL ,
-              [Date] [datetime] NOT NULL ,
-              [Thread] [varchar] (255) NOT NULL ,
-              [Level] [varchar] (20) NOT NULL ,
-              [Logger] [varchar] (255) NOT NULL ,
-              [Message] [varchar] (4000) NOT NULL 
-            ) ON [PRIMARY]
-            </code>
-            </example>
-            <example>
-            An example configuration to log to the above table:
-            <code lang="XML" escaped="true">
-            <appender name="AdoNetAppender_SqlServer" type="log4net.Appender.AdoNetAppender">
-              <connectionType value="System.Data.SqlClient.SqlConnection, System.Data, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/>
-              <connectionString value="data source=SQLSVR;initial catalog=test_log4net;integrated security=false;persist security info=True;User ID=sa;Password=sa"/>
-              <commandText value="INSERT INTO Log ([Date],[Thread],[Level],[Logger],[Message]) VALUES (@log_date, @thread, @log_level, @logger, @message)"/>
-              <parameter>
-                <parameterName value="@log_date"/>
-                <dbType value="DateTime"/>
-                <layout type="log4net.Layout.PatternLayout" value="%date{yyyy'-'MM'-'dd HH':'mm':'ss'.'fff}"/>
-              </parameter>
-              <parameter>
-                <parameterName value="@thread"/>
-                <dbType value="String"/>
-                <size value="255"/>
-                <layout type="log4net.Layout.PatternLayout" value="%thread"/>
-              </parameter>
-              <parameter>
-                <parameterName value="@log_level"/>
-                <dbType value="String"/>
-                <size value="50"/>
-                <layout type="log4net.Layout.PatternLayout" value="%level"/>
-              </parameter>
-              <parameter>
-                <parameterName value="@logger"/>
-                <dbType value="String"/>
-                <size value="255"/>
-                <layout type="log4net.Layout.PatternLayout" value="%logger"/>
-              </parameter>
-              <parameter>
-                <parameterName value="@message"/>
-                <dbType value="String"/>
-                <size value="4000"/>
-                <layout type="log4net.Layout.PatternLayout" value="%message"/>
-              </parameter>
-            </appender>
-            </code>
-            </example>
-            <author>Julian Biddle</author>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-            <author>Lance Nehring</author>
-        </member>
-        <member name="T:log4net.Appender.BufferingAppenderSkeleton">
-            <summary>
-            Abstract base class implementation of <see cref="T:log4net.Appender.IAppender"/> that 
-            buffers events in a fixed size buffer.
-            </summary>
-            <remarks>
-            <para>
-            This base class should be used by appenders that need to buffer a 
-            number of events before logging them. For example the <see cref="T:log4net.Appender.AdoNetAppender"/> 
-            buffers events and then submits the entire contents of the buffer to 
-            the underlying database in one go.
-            </para>
-            <para>
-            Subclasses should override the <see cref="M:log4net.Appender.BufferingAppenderSkeleton.SendBuffer(log4net.Core.LoggingEvent[])"/>
-            method to deliver the buffered events.
-            </para>
-            <para>The BufferingAppenderSkeleton maintains a fixed size cyclic 
-            buffer of events. The size of the buffer is set using 
-            the <see cref="P:log4net.Appender.BufferingAppenderSkeleton.BufferSize"/> property.
-            </para>
-            <para>A <see cref="T:log4net.Core.ITriggeringEventEvaluator"/> is used to inspect 
-            each event as it arrives in the appender. If the <see cref="P:log4net.Appender.BufferingAppenderSkeleton.Evaluator"/> 
-            triggers, then the current buffer is sent immediately 
-            (see <see cref="M:log4net.Appender.BufferingAppenderSkeleton.SendBuffer(log4net.Core.LoggingEvent[])"/>). Otherwise the event 
-            is stored in the buffer. For example, an evaluator can be used to 
-            deliver the events immediately when an ERROR event arrives.
-            </para>
-            <para>
-            The buffering appender can be configured in a <see cref="P:log4net.Appender.BufferingAppenderSkeleton.Lossy"/> mode. 
-            By default the appender is NOT lossy. When the buffer is full all 
-            the buffered events are sent with <see cref="M:log4net.Appender.BufferingAppenderSkeleton.SendBuffer(log4net.Core.LoggingEvent[])"/>.
-            If the <see cref="P:log4net.Appender.BufferingAppenderSkeleton.Lossy"/> property is set to <c>true</c> then the 
-            buffer will not be sent when it is full, and new events arriving 
-            in the appender will overwrite the oldest event in the buffer. 
-            In lossy mode the buffer will only be sent when the <see cref="P:log4net.Appender.BufferingAppenderSkeleton.Evaluator"/>
-            triggers. This can be useful behavior when you need to know about 
-            ERROR events but not about events with a lower level, configure an 
-            evaluator that will trigger when an ERROR event arrives, the whole 
-            buffer will be sent which gives a history of events leading up to
-            the ERROR event.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-        </member>
-        <member name="T:log4net.Appender.AppenderSkeleton">
-            <summary>
-            Abstract base class implementation of <see cref="T:log4net.Appender.IAppender"/>. 
-            </summary>
-            <remarks>
-            <para>
-            This class provides the code for common functionality, such 
-            as support for threshold filtering and support for general filters.
-            </para>
-            <para>
-            Appenders can also implement the <see cref="T:log4net.Core.IOptionHandler"/> interface. Therefore
-            they would require that the <see cref="M:log4net.Core.IOptionHandler.ActivateOptions"/> method
-            be called after the appenders properties have been configured.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-        </member>
-        <member name="T:log4net.Appender.IAppender">
-            <summary>
-            Implement this interface for your own strategies for printing log statements.
-            </summary>
-            <remarks>
-            <para>
-            Implementors should consider extending the <see cref="T:log4net.Appender.AppenderSkeleton"/>
-            class which provides a default implementation of this interface.
-            </para>
-            <para>
-            Appenders can also implement the <see cref="T:log4net.Core.IOptionHandler"/> interface. Therefore
-            they would require that the <see cref="M:log4net.Core.IOptionHandler.ActivateOptions"/> method
-            be called after the appenders properties have been configured.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-        </member>
-        <member name="M:log4net.Appender.IAppender.Close">
-            <summary>
-            Closes the appender and releases resources.
-            </summary>
-            <remarks>
-            <para>
-            Releases any resources allocated within the appender such as file handles, 
-            network connections, etc.
-            </para>
-            <para>
-            It is a programming error to append to a closed appender.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.IAppender.DoAppend(log4net.Core.LoggingEvent)">
-            <summary>
-            Log the logging event in Appender specific way.
-            </summary>
-            <param name="loggingEvent">The event to log</param>
-            <remarks>
-            <para>
-            This method is called to log a message into this appender.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Appender.IAppender.Name">
-            <summary>
-            Gets or sets the name of this appender.
-            </summary>
-            <value>The name of the appender.</value>
-            <remarks>
-            <para>The name uniquely identifies the appender.</para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Appender.IBulkAppender">
-            <summary>
-            Interface for appenders that support bulk logging.
-            </summary>
-            <remarks>
-            <para>
-            This interface extends the <see cref="T:log4net.Appender.IAppender"/> interface to
-            support bulk logging of <see cref="T:log4net.Core.LoggingEvent"/> objects. Appenders
-            should only implement this interface if they can bulk log efficiently.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-        </member>
-        <member name="M:log4net.Appender.IBulkAppender.DoAppend(log4net.Core.LoggingEvent[])">
-            <summary>
-            Log the array of logging events in Appender specific way.
-            </summary>
-            <param name="loggingEvents">The events to log</param>
-            <remarks>
-            <para>
-            This method is called to log an array of events into this appender.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Core.IOptionHandler">
-            <summary>
-            Interface used to delay activate a configured object.
-            </summary>
-            <remarks>
-            <para>
-            This allows an object to defer activation of its options until all
-            options have been set. This is required for components which have
-            related options that remain ambiguous until all are set.
-            </para>
-            <para>
-            If a component implements this interface then the <see cref="M:log4net.Core.IOptionHandler.ActivateOptions"/> method 
-            must be called by the container after its all the configured properties have been set 
-            and before the component can be used.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-        </member>
-        <member name="M:log4net.Core.IOptionHandler.ActivateOptions">
-            <summary>
-            Activate the options that were previously set with calls to properties.
-            </summary>
-            <remarks>
-            <para>
-            This allows an object to defer activation of its options until all
-            options have been set. This is required for components which have
-            related options that remain ambiguous until all are set.
-            </para>
-            <para>
-            If a component implements this interface then this method must be called
-            after its properties have been set before the component can be used.
-            </para>
-            </remarks>
-        </member>
-        <member name="F:log4net.Appender.AppenderSkeleton.c_renderBufferSize">
-            <summary>
-            Initial buffer size
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.AppenderSkeleton.c_renderBufferMaxCapacity">
-            <summary>
-            Maximum buffer size before it is recycled
-            </summary>
-        </member>
-        <member name="M:log4net.Appender.AppenderSkeleton.#ctor">
-            <summary>
-            Default constructor
-            </summary>
-            <remarks>
-            <para>Empty default constructor</para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.AppenderSkeleton.Finalize">
-            <summary>
-            Finalizes this appender by calling the implementation's 
-            <see cref="M:log4net.Appender.AppenderSkeleton.Close"/> method.
-            </summary>
-            <remarks>
-            <para>
-            If this appender has not been closed then the <c>Finalize</c> method
-            will call <see cref="M:log4net.Appender.AppenderSkeleton.Close"/>.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.AppenderSkeleton.ActivateOptions">
-            <summary>
-            Initialize the appender based on the options set
-            </summary>
-            <remarks>
-            <para>
-            This is part of the <see cref="T:log4net.Core.IOptionHandler"/> delayed object
-            activation scheme. The <see cref="M:log4net.Appender.AppenderSkeleton.ActivateOptions"/> method must 
-            be called on this object after the configuration properties have
-            been set. Until <see cref="M:log4net.Appender.AppenderSkeleton.ActivateOptions"/> is called this
-            object is in an undefined state and must not be used. 
-            </para>
-            <para>
-            If any of the configuration properties are modified then 
-            <see cref="M:log4net.Appender.AppenderSkeleton.ActivateOptions"/> must be called again.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.AppenderSkeleton.Close">
-            <summary>
-            Closes the appender and release resources.
-            </summary>
-            <remarks>
-            <para>
-            Release any resources allocated within the appender such as file handles, 
-            network connections, etc.
-            </para>
-            <para>
-            It is a programming error to append to a closed appender.
-            </para>
-            <para>
-            This method cannot be overridden by subclasses. This method 
-            delegates the closing of the appender to the <see cref="M:log4net.Appender.AppenderSkeleton.OnClose"/>
-            method which must be overridden in the subclass.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.AppenderSkeleton.DoAppend(log4net.Core.LoggingEvent)">
-            <summary>
-            Performs threshold checks and invokes filters before 
-            delegating actual logging to the subclasses specific 
-            <see cref="M:log4net.Appender.AppenderSkeleton.Append(log4net.Core.LoggingEvent)"/> method.
-            </summary>
-            <param name="loggingEvent">The event to log.</param>
-            <remarks>
-            <para>
-            This method cannot be overridden by derived classes. A
-            derived class should override the <see cref="M:log4net.Appender.AppenderSkeleton.Append(log4net.Core.LoggingEvent)"/> method
-            which is called by this method.
-            </para>
-            <para>
-            The implementation of this method is as follows:
-            </para>
-            <para>
-            <list type="bullet">
-            	<item>
-            		<description>
-            		Checks that the severity of the <paramref name="loggingEvent"/>
-            		is greater than or equal to the <see cref="P:log4net.Appender.AppenderSkeleton.Threshold"/> of this
-            		appender.</description>
-            	</item>
-            	<item>
-            		<description>
-            		Checks that the <see cref="T:log4net.Filter.IFilter"/> chain accepts the 
-            		<paramref name="loggingEvent"/>.
-            		</description>
-            	</item>
-            	<item>
-            		<description>
-            		Calls <see cref="M:log4net.Appender.AppenderSkeleton.PreAppendCheck"/> and checks that 
-            		it returns <c>true</c>.</description>
-            	</item>
-            </list>
-            </para>
-            <para>
-            If all of the above steps succeed then the <paramref name="loggingEvent"/>
-            will be passed to the abstract <see cref="M:log4net.Appender.AppenderSkeleton.Append(log4net.Core.LoggingEvent)"/> method.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.AppenderSkeleton.DoAppend(log4net.Core.LoggingEvent[])">
-            <summary>
-            Performs threshold checks and invokes filters before 
-            delegating actual logging to the subclasses specific 
-            <see cref="M:log4net.Appender.AppenderSkeleton.Append(log4net.Core.LoggingEvent[])"/> method.
-            </summary>
-            <param name="loggingEvents">The array of events to log.</param>
-            <remarks>
-            <para>
-            This method cannot be overridden by derived classes. A
-            derived class should override the <see cref="M:log4net.Appender.AppenderSkeleton.Append(log4net.Core.LoggingEvent[])"/> method
-            which is called by this method.
-            </para>
-            <para>
-            The implementation of this method is as follows:
-            </para>
-            <para>
-            <list type="bullet">
-            	<item>
-            		<description>
-            		Checks that the severity of the <paramref name="loggingEvent"/>
-            		is greater than or equal to the <see cref="P:log4net.Appender.AppenderSkeleton.Threshold"/> of this
-            		appender.</description>
-            	</item>
-            	<item>
-            		<description>
-            		Checks that the <see cref="T:log4net.Filter.IFilter"/> chain accepts the 
-            		<paramref name="loggingEvent"/>.
-            		</description>
-            	</item>
-            	<item>
-            		<description>
-            		Calls <see cref="M:log4net.Appender.AppenderSkeleton.PreAppendCheck"/> and checks that 
-            		it returns <c>true</c>.</description>
-            	</item>
-            </list>
-            </para>
-            <para>
-            If all of the above steps succeed then the <paramref name="loggingEvents"/>
-            will be passed to the <see cref="M:log4net.Appender.AppenderSkeleton.Append(log4net.Core.LoggingEvent[])"/> method.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.AppenderSkeleton.FilterEvent(log4net.Core.LoggingEvent)">
-            <summary>
-            Test if the logging event should we output by this appender
-            </summary>
-            <param name="loggingEvent">the event to test</param>
-            <returns><c>true</c> if the event should be output, <c>false</c> if the event should be ignored</returns>
-            <remarks>
-            <para>
-            This method checks the logging event against the threshold level set
-            on this appender and also against the filters specified on this
-            appender.
-            </para>
-            <para>
-            The implementation of this method is as follows:
-            </para>
-            <para>
-            <list type="bullet">
-            	<item>
-            		<description>
-            		Checks that the severity of the <paramref name="loggingEvent"/>
-            		is greater than or equal to the <see cref="P:log4net.Appender.AppenderSkeleton.Threshold"/> of this
-            		appender.</description>
-            	</item>
-            	<item>
-            		<description>
-            		Checks that the <see cref="T:log4net.Filter.IFilter"/> chain accepts the 
-            		<paramref name="loggingEvent"/>.
-            		</description>
-            	</item>
-            </list>
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.AppenderSkeleton.AddFilter(log4net.Filter.IFilter)">
-            <summary>
-            Adds a filter to the end of the filter chain.
-            </summary>
-            <param name="filter">the filter to add to this appender</param>
-            <remarks>
-            <para>
-            The Filters are organized in a linked list.
-            </para>
-            <para>
-            Setting this property causes the new filter to be pushed onto the 
-            back of the filter chain.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.AppenderSkeleton.ClearFilters">
-            <summary>
-            Clears the filter list for this appender.
-            </summary>
-            <remarks>
-            <para>
-            Clears the filter list for this appender.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.AppenderSkeleton.IsAsSevereAsThreshold(log4net.Core.Level)">
-            <summary>
-            Checks if the message level is below this appender's threshold.
-            </summary>
-            <param name="level"><see cref="T:log4net.Core.Level"/> to test against.</param>
-            <remarks>
-            <para>
-            If there is no threshold set, then the return value is always <c>true</c>.
-            </para>
-            </remarks>
-            <returns>
-            <c>true</c> if the <paramref name="level"/> meets the <see cref="P:log4net.Appender.AppenderSkeleton.Threshold"/> 
-            requirements of this appender.
-            </returns>
-        </member>
-        <member name="M:log4net.Appender.AppenderSkeleton.OnClose">
-            <summary>
-            Is called when the appender is closed. Derived classes should override 
-            this method if resources need to be released.
-            </summary>
-            <remarks>
-            <para>
-            Releases any resources allocated within the appender such as file handles, 
-            network connections, etc.
-            </para>
-            <para>
-            It is a programming error to append to a closed appender.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.AppenderSkeleton.Append(log4net.Core.LoggingEvent)">
-            <summary>
-            Subclasses of <see cref="T:log4net.Appender.AppenderSkeleton"/> should implement this method 
-            to perform actual logging.
-            </summary>
-            <param name="loggingEvent">The event to append.</param>
-            <remarks>
-            <para>
-            A subclass must implement this method to perform
-            logging of the <paramref name="loggingEvent"/>.
-            </para>
-            <para>This method will be called by <see cref="M:log4net.Appender.AppenderSkeleton.DoAppend(log4net.Core.LoggingEvent)"/>
-            if all the conditions listed for that method are met.
-            </para>
-            <para>
-            To restrict the logging of events in the appender
-            override the <see cref="M:log4net.Appender.AppenderSkeleton.PreAppendCheck"/> method.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.AppenderSkeleton.Append(log4net.Core.LoggingEvent[])">
-            <summary>
-            Append a bulk array of logging events.
-            </summary>
-            <param name="loggingEvents">the array of logging events</param>
-            <remarks>
-            <para>
-            This base class implementation calls the <see cref="M:log4net.Appender.AppenderSkeleton.Append(log4net.Core.LoggingEvent)"/>
-            method for each element in the bulk array.
-            </para>
-            <para>
-            A sub class that can better process a bulk array of events should
-            override this method in addition to <see cref="M:log4net.Appender.AppenderSkeleton.Append(log4net.Core.LoggingEvent)"/>.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.AppenderSkeleton.PreAppendCheck">
-            <summary>
-            Called before <see cref="M:log4net.Appender.AppenderSkeleton.Append(log4net.Core.LoggingEvent)"/> as a precondition.
-            </summary>
-            <remarks>
-            <para>
-            This method is called by <see cref="M:log4net.Appender.AppenderSkeleton.DoAppend(log4net.Core.LoggingEvent)"/>
-            before the call to the abstract <see cref="M:log4net.Appender.AppenderSkeleton.Append(log4net.Core.LoggingEvent)"/> method.
-            </para>
-            <para>
-            This method can be overridden in a subclass to extend the checks 
-            made before the event is passed to the <see cref="M:log4net.Appender.AppenderSkeleton.Append(log4net.Core.LoggingEvent)"/> method.
-            </para>
-            <para>
-            A subclass should ensure that they delegate this call to
-            this base class if it is overridden.
-            </para>
-            </remarks>
-            <returns><c>true</c> if the call to <see cref="M:log4net.Appender.AppenderSkeleton.Append(log4net.Core.LoggingEvent)"/> should proceed.</returns>
-        </member>
-        <member name="M:log4net.Appender.AppenderSkeleton.RenderLoggingEvent(log4net.Core.LoggingEvent)">
-            <summary>
-            Renders the <see cref="T:log4net.Core.LoggingEvent"/> to a string.
-            </summary>
-            <param name="loggingEvent">The event to render.</param>
-            <returns>The event rendered as a string.</returns>
-            <remarks>
-            <para>
-            Helper method to render a <see cref="T:log4net.Core.LoggingEvent"/> to 
-            a string. This appender must have a <see cref="P:log4net.Appender.AppenderSkeleton.Layout"/>
-            set to render the <paramref name="loggingEvent"/> to 
-            a string.
-            </para>
-            <para>If there is exception data in the logging event and 
-            the layout does not process the exception, this method 
-            will append the exception text to the rendered string.
-            </para>
-            <para>
-            Where possible use the alternative version of this method
-            <see cref="M:log4net.Appender.AppenderSkeleton.RenderLoggingEvent(System.IO.TextWriter,log4net.Core.LoggingEvent)"/>.
-            That method streams the rendering onto an existing Writer
-            which can give better performance if the caller already has
-            a <see cref="T:System.IO.TextWriter"/> open and ready for writing.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.AppenderSkeleton.RenderLoggingEvent(System.IO.TextWriter,log4net.Core.LoggingEvent)">
-            <summary>
-            Renders the <see cref="T:log4net.Core.LoggingEvent"/> to a string.
-            </summary>
-            <param name="loggingEvent">The event to render.</param>
-            <param name="writer">The TextWriter to write the formatted event to</param>
-            <remarks>
-            <para>
-            Helper method to render a <see cref="T:log4net.Core.LoggingEvent"/> to 
-            a string. This appender must have a <see cref="P:log4net.Appender.AppenderSkeleton.Layout"/>
-            set to render the <paramref name="loggingEvent"/> to 
-            a string.
-            </para>
-            <para>If there is exception data in the logging event and 
-            the layout does not process the exception, this method 
-            will append the exception text to the rendered string.
-            </para>
-            <para>
-            Use this method in preference to <see cref="M:log4net.Appender.AppenderSkeleton.RenderLoggingEvent(log4net.Core.LoggingEvent)"/>
-            where possible. If, however, the caller needs to render the event
-            to a string then <see cref="M:log4net.Appender.AppenderSkeleton.RenderLoggingEvent(log4net.Core.LoggingEvent)"/> does
-            provide an efficient mechanism for doing so.
-            </para>
-            </remarks>
-        </member>
-        <member name="F:log4net.Appender.AppenderSkeleton.m_layout">
-            <summary>
-            The layout of this appender.
-            </summary>
-            <remarks>
-            See <see cref="P:log4net.Appender.AppenderSkeleton.Layout"/> for more information.
-            </remarks>
-        </member>
-        <member name="F:log4net.Appender.AppenderSkeleton.m_name">
-            <summary>
-            The name of this appender.
-            </summary>
-            <remarks>
-            See <see cref="P:log4net.Appender.AppenderSkeleton.Name"/> for more information.
-            </remarks>
-        </member>
-        <member name="F:log4net.Appender.AppenderSkeleton.m_threshold">
-            <summary>
-            The level threshold of this appender.
-            </summary>
-            <remarks>
-            <para>
-            There is no level threshold filtering by default.
-            </para>
-            <para>
-            See <see cref="P:log4net.Appender.AppenderSkeleton.Threshold"/> for more information.
-            </para>
-            </remarks>
-        </member>
-        <member name="F:log4net.Appender.AppenderSkeleton.m_errorHandler">
-            <summary>
-            It is assumed and enforced that errorHandler is never null.
-            </summary>
-            <remarks>
-            <para>
-            It is assumed and enforced that errorHandler is never null.
-            </para>
-            <para>
-            See <see cref="P:log4net.Appender.AppenderSkeleton.ErrorHandler"/> for more information.
-            </para>
-            </remarks>
-        </member>
-        <member name="F:log4net.Appender.AppenderSkeleton.m_headFilter">
-            <summary>
-            The first filter in the filter chain.
-            </summary>
-            <remarks>
-            <para>
-            Set to <c>null</c> initially.
-            </para>
-            <para>
-            See <see cref="T:log4net.Filter.IFilter"/> for more information.
-            </para>
-            </remarks>
-        </member>
-        <member name="F:log4net.Appender.AppenderSkeleton.m_tailFilter">
-            <summary>
-            The last filter in the filter chain.
-            </summary>
-            <remarks>
-            See <see cref="T:log4net.Filter.IFilter"/> for more information.
-            </remarks>
-        </member>
-        <member name="F:log4net.Appender.AppenderSkeleton.m_closed">
-            <summary>
-            Flag indicating if this appender is closed.
-            </summary>
-            <remarks>
-            See <see cref="M:log4net.Appender.AppenderSkeleton.Close"/> for more information.
-            </remarks>
-        </member>
-        <member name="F:log4net.Appender.AppenderSkeleton.m_recursiveGuard">
-            <summary>
-            The guard prevents an appender from repeatedly calling its own DoAppend method
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.AppenderSkeleton.m_renderWriter">
-            <summary>
-            StringWriter used to render events
-            </summary>
-        </member>
-        <member name="P:log4net.Appender.AppenderSkeleton.Threshold">
-            <summary>
-            Gets or sets the threshold <see cref="T:log4net.Core.Level"/> of this appender.
-            </summary>
-            <value>
-            The threshold <see cref="T:log4net.Core.Level"/> of the appender. 
-            </value>
-            <remarks>
-            <para>
-            All log events with lower level than the threshold level are ignored 
-            by the appender.
-            </para>
-            <para>
-            In configuration files this option is specified by setting the
-            value of the <see cref="P:log4net.Appender.AppenderSkeleton.Threshold"/> option to a level
-            string, such as "DEBUG", "INFO" and so on.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Appender.AppenderSkeleton.ErrorHandler">
-            <summary>
-            Gets or sets the <see cref="T:log4net.Core.IErrorHandler"/> for this appender.
-            </summary>
-            <value>The <see cref="T:log4net.Core.IErrorHandler"/> of the appender</value>
-            <remarks>
-            <para>
-            The <see cref="T:log4net.Appender.AppenderSkeleton"/> provides a default 
-            implementation for the <see cref="P:log4net.Appender.AppenderSkeleton.ErrorHandler"/> property. 
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Appender.AppenderSkeleton.FilterHead">
-            <summary>
-            The filter chain.
-            </summary>
-            <value>The head of the filter chain filter chain.</value>
-            <remarks>
-            <para>
-            Returns the head Filter. The Filters are organized in a linked list
-            and so all Filters on this Appender are available through the result.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Appender.AppenderSkeleton.Layout">
-            <summary>
-            Gets or sets the <see cref="T:log4net.Layout.ILayout"/> for this appender.
-            </summary>
-            <value>The layout of the appender.</value>
-            <remarks>
-            <para>
-            See <see cref="P:log4net.Appender.AppenderSkeleton.RequiresLayout"/> for more information.
-            </para>
-            </remarks>
-            <seealso cref="P:log4net.Appender.AppenderSkeleton.RequiresLayout"/>
-        </member>
-        <member name="P:log4net.Appender.AppenderSkeleton.Name">
-            <summary>
-            Gets or sets the name of this appender.
-            </summary>
-            <value>The name of the appender.</value>
-            <remarks>
-            <para>
-            The name uniquely identifies the appender.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Appender.AppenderSkeleton.RequiresLayout">
-            <summary>
-            Tests if this appender requires a <see cref="P:log4net.Appender.AppenderSkeleton.Layout"/> to be set.
-            </summary>
-            <remarks>
-            <para>
-            In the rather exceptional case, where the appender 
-            implementation admits a layout but can also work without it, 
-            then the appender should return <c>true</c>.
-            </para>
-            <para>
-            This default implementation always returns <c>true</c>.
-            </para>
-            </remarks>
-            <returns>
-            <c>true</c> if the appender requires a layout object, otherwise <c>false</c>.
-            </returns>
-        </member>
-        <member name="F:log4net.Appender.BufferingAppenderSkeleton.DEFAULT_BUFFER_SIZE">
-            <summary>
-            The default buffer size.
-            </summary>
-            <remarks>
-            The default size of the cyclic buffer used to store events.
-            This is set to 512 by default.
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.BufferingAppenderSkeleton.#ctor">
-            <summary>
-            Initializes a new instance of the <see cref="T:log4net.Appender.BufferingAppenderSkeleton"/> class.
-            </summary>
-            <remarks>
-            <para>
-            Protected default constructor to allow subclassing.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.BufferingAppenderSkeleton.#ctor(System.Boolean)">
-            <summary>
-            Initializes a new instance of the <see cref="T:log4net.Appender.BufferingAppenderSkeleton"/> class.
-            </summary>
-            <param name="eventMustBeFixed">the events passed through this appender must be
-            fixed by the time that they arrive in the derived class' <c>SendBuffer</c> method.</param>
-            <remarks>
-            <para>
-            Protected constructor to allow subclassing.
-            </para>
-            <para>
-            The <paramref name="eventMustBeFixed"/> should be set if the subclass
-            expects the events delivered to be fixed even if the 
-            <see cref="P:log4net.Appender.BufferingAppenderSkeleton.BufferSize"/> is set to zero, i.e. when no buffering occurs.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.BufferingAppenderSkeleton.Flush">
-            <summary>
-            Flush the currently buffered events
-            </summary>
-            <remarks>
-            <para>
-            Flushes any events that have been buffered.
-            </para>
-            <para>
-            If the appender is buffering in <see cref="P:log4net.Appender.BufferingAppenderSkeleton.Lossy"/> mode then the contents
-            of the buffer will NOT be flushed to the appender.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.BufferingAppenderSkeleton.Flush(System.Boolean)">
-            <summary>
-            Flush the currently buffered events
-            </summary>
-            <param name="flushLossyBuffer">set to <c>true</c> to flush the buffer of lossy events</param>
-            <remarks>
-            <para>
-            Flushes events that have been buffered. If <paramref name="flushLossyBuffer"/> is
-            <c>false</c> then events will only be flushed if this buffer is non-lossy mode.
-            </para>
-            <para>
-            If the appender is buffering in <see cref="P:log4net.Appender.BufferingAppenderSkeleton.Lossy"/> mode then the contents
-            of the buffer will only be flushed if <paramref name="flushLossyBuffer"/> is <c>true</c>.
-            In this case the contents of the buffer will be tested against the 
-            <see cref="P:log4net.Appender.BufferingAppenderSkeleton.LossyEvaluator"/> and if triggering will be output. All other buffered
-            events will be discarded.
-            </para>
-            <para>
-            If <paramref name="flushLossyBuffer"/> is <c>true</c> then the buffer will always
-            be emptied by calling this method.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.BufferingAppenderSkeleton.ActivateOptions">
-            <summary>
-            Initialize the appender based on the options set
-            </summary>
-            <remarks>
-            <para>
-            This is part of the <see cref="T:log4net.Core.IOptionHandler"/> delayed object
-            activation scheme. The <see cref="M:log4net.Appender.BufferingAppenderSkeleton.ActivateOptions"/> method must 
-            be called on this object after the configuration properties have
-            been set. Until <see cref="M:log4net.Appender.BufferingAppenderSkeleton.ActivateOptions"/> is called this
-            object is in an undefined state and must not be used. 
-            </para>
-            <para>
-            If any of the configuration properties are modified then 
-            <see cref="M:log4net.Appender.BufferingAppenderSkeleton.ActivateOptions"/> must be called again.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.BufferingAppenderSkeleton.OnClose">
-            <summary>
-            Close this appender instance.
-            </summary>
-            <remarks>
-            <para>
-            Close this appender instance. If this appender is marked
-            as not <see cref="P:log4net.Appender.BufferingAppenderSkeleton.Lossy"/> then the remaining events in 
-            the buffer must be sent when the appender is closed.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.BufferingAppenderSkeleton.Append(log4net.Core.LoggingEvent)">
-            <summary>
-            This method is called by the <see cref="M:log4net.Appender.AppenderSkeleton.DoAppend(log4net.Core.LoggingEvent)"/> method. 
-            </summary>
-            <param name="loggingEvent">the event to log</param>
-            <remarks>
-            <para>
-            Stores the <paramref name="loggingEvent"/> in the cyclic buffer.
-            </para>
-            <para>
-            The buffer will be sent (i.e. passed to the <see cref="M:log4net.Appender.BufferingAppenderSkeleton.SendBuffer(log4net.Core.LoggingEvent[])"/> 
-            method) if one of the following conditions is met:
-            </para>
-            <list type="bullet">
-            	<item>
-            		<description>The cyclic buffer is full and this appender is
-            		marked as not lossy (see <see cref="P:log4net.Appender.BufferingAppenderSkeleton.Lossy"/>)</description>
-            	</item>
-            	<item>
-            		<description>An <see cref="P:log4net.Appender.BufferingAppenderSkeleton.Evaluator"/> is set and
-            		it is triggered for the <paramref name="loggingEvent"/>
-            		specified.</description>
-            	</item>
-            </list>
-            <para>
-            Before the event is stored in the buffer it is fixed
-            (see <see cref="M:log4net.Core.LoggingEvent.FixVolatileData(log4net.Core.FixFlags)"/>) to ensure that
-            any data referenced by the event will be valid when the buffer
-            is processed.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.BufferingAppenderSkeleton.SendFromBuffer(log4net.Core.LoggingEvent,log4net.Util.CyclicBuffer)">
-            <summary>
-            Sends the contents of the buffer.
-            </summary>
-            <param name="firstLoggingEvent">The first logging event.</param>
-            <param name="buffer">The buffer containing the events that need to be send.</param>
-            <remarks>
-            <para>
-            The subclass must override <see cref="M:log4net.Appender.BufferingAppenderSkeleton.SendBuffer(log4net.Core.LoggingEvent[])"/>.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.BufferingAppenderSkeleton.SendBuffer(log4net.Core.LoggingEvent[])">
-            <summary>
-            Sends the events.
-            </summary>
-            <param name="events">The events that need to be send.</param>
-            <remarks>
-            <para>
-            The subclass must override this method to process the buffered events.
-            </para>
-            </remarks>
-        </member>
-        <member name="F:log4net.Appender.BufferingAppenderSkeleton.m_bufferSize">
-            <summary>
-            The size of the cyclic buffer used to hold the logging events.
-            </summary>
-            <remarks>
-            Set to <see cref="F:log4net.Appender.BufferingAppenderSkeleton.DEFAULT_BUFFER_SIZE"/> by default.
-            </remarks>
-        </member>
-        <member name="F:log4net.Appender.BufferingAppenderSkeleton.m_cb">
-            <summary>
-            The cyclic buffer used to store the logging events.
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.BufferingAppenderSkeleton.m_evaluator">
-            <summary>
-            The triggering event evaluator that causes the buffer to be sent immediately.
-            </summary>
-            <remarks>
-            The object that is used to determine if an event causes the entire
-            buffer to be sent immediately. This field can be <c>null</c>, which 
-            indicates that event triggering is not to be done. The evaluator
-            can be set using the <see cref="P:log4net.Appender.BufferingAppenderSkeleton.Evaluator"/> property. If this appender
-            has the <see cref="F:log4net.Appender.BufferingAppenderSkeleton.m_lossy"/> (<see cref="P:log4net.Appender.BufferingAppenderSkeleton.Lossy"/> property) set to 
-            <c>true</c> then an <see cref="P:log4net.Appender.BufferingAppenderSkeleton.Evaluator"/> must be set.
-            </remarks>
-        </member>
-        <member name="F:log4net.Appender.BufferingAppenderSkeleton.m_lossy">
-            <summary>
-            Indicates if the appender should overwrite events in the cyclic buffer 
-            when it becomes full, or if the buffer should be flushed when the 
-            buffer is full.
-            </summary>
-            <remarks>
-            If this field is set to <c>true</c> then an <see cref="P:log4net.Appender.BufferingAppenderSkeleton.Evaluator"/> must 
-            be set.
-            </remarks>
-        </member>
-        <member name="F:log4net.Appender.BufferingAppenderSkeleton.m_lossyEvaluator">
-            <summary>
-            The triggering event evaluator filters discarded events.
-            </summary>
-            <remarks>
-            The object that is used to determine if an event that is discarded should
-            really be discarded or if it should be sent to the appenders. 
-            This field can be <c>null</c>, which indicates that all discarded events will
-            be discarded. 
-            </remarks>
-        </member>
-        <member name="F:log4net.Appender.BufferingAppenderSkeleton.m_fixFlags">
-            <summary>
-            Value indicating which fields in the event should be fixed
-            </summary>
-            <remarks>
-            By default all fields are fixed
-            </remarks>
-        </member>
-        <member name="F:log4net.Appender.BufferingAppenderSkeleton.m_eventMustBeFixed">
-            <summary>
-            The events delivered to the subclass must be fixed.
-            </summary>
-        </member>
-        <member name="P:log4net.Appender.BufferingAppenderSkeleton.Lossy">
-            <summary>
-            Gets or sets a value that indicates whether the appender is lossy.
-            </summary>
-            <value>
-            <c>true</c> if the appender is lossy, otherwise <c>false</c>. The default is <c>false</c>.
-            </value>
-            <remarks>
-            <para>
-            This appender uses a buffer to store logging events before 
-            delivering them. A triggering event causes the whole buffer
-            to be send to the remote sink. If the buffer overruns before
-            a triggering event then logging events could be lost. Set
-            <see cref="P:log4net.Appender.BufferingAppenderSkeleton.Lossy"/> to <c>false</c> to prevent logging events 
-            from being lost.
-            </para>
-            <para>If <see cref="P:log4net.Appender.BufferingAppenderSkeleton.Lossy"/> is set to <c>true</c> then an
-            <see cref="P:log4net.Appender.BufferingAppenderSkeleton.Evaluator"/> must be specified.</para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Appender.BufferingAppenderSkeleton.BufferSize">
-            <summary>
-            Gets or sets the size of the cyclic buffer used to hold the 
-            logging events.
-            </summary>
-            <value>
-            The size of the cyclic buffer used to hold the logging events.
-            </value>
-            <remarks>
-            <para>
-            The <see cref="P:log4net.Appender.BufferingAppenderSkeleton.BufferSize"/> option takes a positive integer
-            representing the maximum number of logging events to collect in 
-            a cyclic buffer. When the <see cref="P:log4net.Appender.BufferingAppenderSkeleton.BufferSize"/> is reached,
-            oldest events are deleted as new events are added to the
-            buffer. By default the size of the cyclic buffer is 512 events.
-            </para>
-            <para>
-            If the <see cref="P:log4net.Appender.BufferingAppenderSkeleton.BufferSize"/> is set to a value less than
-            or equal to 1 then no buffering will occur. The logging event
-            will be delivered synchronously (depending on the <see cref="P:log4net.Appender.BufferingAppenderSkeleton.Lossy"/>
-            and <see cref="P:log4net.Appender.BufferingAppenderSkeleton.Evaluator"/> properties). Otherwise the event will
-            be buffered.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Appender.BufferingAppenderSkeleton.Evaluator">
-            <summary>
-            Gets or sets the <see cref="T:log4net.Core.ITriggeringEventEvaluator"/> that causes the 
-            buffer to be sent immediately.
-            </summary>
-            <value>
-            The <see cref="T:log4net.Core.ITriggeringEventEvaluator"/> that causes the buffer to be
-            sent immediately.
-            </value>
-            <remarks>
-            <para>
-            The evaluator will be called for each event that is appended to this 
-            appender. If the evaluator triggers then the current buffer will 
-            immediately be sent (see <see cref="M:log4net.Appender.BufferingAppenderSkeleton.SendBuffer(log4net.Core.LoggingEvent[])"/>).
-            </para>
-            <para>If <see cref="P:log4net.Appender.BufferingAppenderSkeleton.Lossy"/> is set to <c>true</c> then an
-            <see cref="P:log4net.Appender.BufferingAppenderSkeleton.Evaluator"/> must be specified.</para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Appender.BufferingAppenderSkeleton.LossyEvaluator">
-            <summary>
-            Gets or sets the value of the <see cref="T:log4net.Core.ITriggeringEventEvaluator"/> to use.
-            </summary>
-            <value>
-            The value of the <see cref="T:log4net.Core.ITriggeringEventEvaluator"/> to use.
-            </value>
-            <remarks>
-            <para>
-            The evaluator will be called for each event that is discarded from this 
-            appender. If the evaluator triggers then the current buffer will immediately 
-            be sent (see <see cref="M:log4net.Appender.BufferingAppenderSkeleton.SendBuffer(log4net.Core.LoggingEvent[])"/>).
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Appender.BufferingAppenderSkeleton.OnlyFixPartialEventData">
-            <summary>
-            Gets or sets a value indicating if only part of the logging event data
-            should be fixed.
-            </summary>
-            <value>
-            <c>true</c> if the appender should only fix part of the logging event 
-            data, otherwise <c>false</c>. The default is <c>false</c>.
-            </value>
-            <remarks>
-            <para>
-            Setting this property to <c>true</c> will cause only part of the
-            event data to be fixed and serialized. This will improve performance.
-            </para>
-            <para>
-            See <see cref="M:log4net.Core.LoggingEvent.FixVolatileData(log4net.Core.FixFlags)"/> for more information.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Appender.BufferingAppenderSkeleton.Fix">
-            <summary>
-            Gets or sets a the fields that will be fixed in the event
-            </summary>
-            <value>
-            The event fields that will be fixed before the event is buffered
-            </value>
-            <remarks>
-            <para>
-            The logging event needs to have certain thread specific values 
-            captured before it can be buffered. See <see cref="P:log4net.Core.LoggingEvent.Fix"/>
-            for details.
-            </para>
-            </remarks>
-            <seealso cref="P:log4net.Core.LoggingEvent.Fix"/>
-        </member>
-        <member name="M:log4net.Appender.AdoNetAppender.#ctor">
-            <summary> 
-            Initializes a new instance of the <see cref="T:log4net.Appender.AdoNetAppender"/> class.
-            </summary>
-            <remarks>
-            Public default constructor to initialize a new instance of this class.
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.AdoNetAppender.ActivateOptions">
-            <summary>
-            Initialize the appender based on the options set
-            </summary>
-            <remarks>
-            <para>
-            This is part of the <see cref="T:log4net.Core.IOptionHandler"/> delayed object
-            activation scheme. The <see cref="M:log4net.Appender.AdoNetAppender.ActivateOptions"/> method must 
-            be called on this object after the configuration properties have
-            been set. Until <see cref="M:log4net.Appender.AdoNetAppender.ActivateOptions"/> is called this
-            object is in an undefined state and must not be used. 
-            </para>
-            <para>
-            If any of the configuration properties are modified then 
-            <see cref="M:log4net.Appender.AdoNetAppender.ActivateOptions"/> must be called again.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.AdoNetAppender.OnClose">
-            <summary>
-            Override the parent method to close the database
-            </summary>
-            <remarks>
-            <para>
-            Closes the database command and database connection.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.AdoNetAppender.SendBuffer(log4net.Core.LoggingEvent[])">
-            <summary>
-            Inserts the events into the database.
-            </summary>
-            <param name="events">The events to insert into the database.</param>
-            <remarks>
-            <para>
-            Insert all the events specified in the <paramref name="events"/>
-            array into the database.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.AdoNetAppender.AddParameter(log4net.Appender.AdoNetAppenderParameter)">
-            <summary>
-            Adds a parameter to the command.
-            </summary>
-            <param name="parameter">The parameter to add to the command.</param>
-            <remarks>
-            <para>
-            Adds a parameter to the ordered list of command parameters.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.AdoNetAppender.SendBuffer(System.Data.IDbTransaction,log4net.Core.LoggingEvent[])">
-            <summary>
-            Writes the events to the database using the transaction specified.
-            </summary>
-            <param name="dbTran">The transaction that the events will be executed under.</param>
-            <param name="events">The array of events to insert into the database.</param>
-            <remarks>
-            <para>
-            The transaction argument can be <c>null</c> if the appender has been
-            configured not to use transactions. See <see cref="P:log4net.Appender.AdoNetAppender.UseTransactions"/>
-            property for more information.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.AdoNetAppender.GetLogStatement(log4net.Core.LoggingEvent)">
-            <summary>
-            Formats the log message into database statement text.
-            </summary>
-            <param name="logEvent">The event being logged.</param>
-            <remarks>
-            This method can be overridden by subclasses to provide 
-            more control over the format of the database statement.
-            </remarks>
-            <returns>
-            Text that can be passed to a <see cref="T:System.Data.IDbCommand"/>.
-            </returns>
-        </member>
-        <member name="M:log4net.Appender.AdoNetAppender.InitializeDatabaseConnection">
-            <summary>
-            Connects to the database.
-            </summary>		
-        </member>
-        <member name="M:log4net.Appender.AdoNetAppender.ResolveConnectionType">
-            <summary>
-            Retrieves the class type of the ADO.NET provider.
-            </summary>
-            <remarks>
-            <para>
-            Gets the Type of the ADO.NET provider to use to connect to the
-            database. This method resolves the type specified in the 
-            <see cref="P:log4net.Appender.AdoNetAppender.ConnectionType"/> property.
-            </para>
-            <para>
-            Subclasses can override this method to return a different type
-            if necessary.
-            </para>
-            </remarks>
-            <returns>The <see cref="T:System.Type"/> of the ADO.NET provider</returns>
-        </member>
-        <member name="M:log4net.Appender.AdoNetAppender.InitializeDatabaseCommand">
-            <summary>
-            Prepares the database command and initialize the parameters.
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.AdoNetAppender.m_usePreparedCommand">
-            <summary>
-            Flag to indicate if we are using a command object
-            </summary>
-            <remarks>
-            <para>
-            Set to <c>true</c> when the appender is to use a prepared
-            statement or stored procedure to insert into the database.
-            </para>
-            </remarks>
-        </member>
-        <member name="F:log4net.Appender.AdoNetAppender.m_parameters">
-            <summary>
-            The list of <see cref="T:log4net.Appender.AdoNetAppenderParameter"/> objects.
-            </summary>
-            <remarks>
-            <para>
-            The list of <see cref="T:log4net.Appender.AdoNetAppenderParameter"/> objects.
-            </para>
-            </remarks>
-        </member>
-        <member name="F:log4net.Appender.AdoNetAppender.m_securityContext">
-            <summary>
-            The security context to use for privileged calls
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.AdoNetAppender.m_dbConnection">
-            <summary>
-            The <see cref="T:System.Data.IDbConnection"/> that will be used
-            to insert logging events into a database.
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.AdoNetAppender.m_dbCommand">
-            <summary>
-            The database command.
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.AdoNetAppender.m_connectionString">
-            <summary>
-            Database connection string.
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.AdoNetAppender.m_connectionType">
-            <summary>
-            String type name of the <see cref="T:System.Data.IDbConnection"/> type name.
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.AdoNetAppender.m_commandText">
-            <summary>
-            The text of the command.
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.AdoNetAppender.m_commandType">
-            <summary>
-            The command type.
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.AdoNetAppender.m_useTransactions">
-            <summary>
-            Indicates whether to use transactions when writing to the database.
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.AdoNetAppender.m_reconnectOnError">
-            <summary>
-            Indicates whether to use transactions when writing to the database.
-            </summary>
-        </member>
-        <member name="P:log4net.Appender.AdoNetAppender.ConnectionString">
-            <summary>
-            Gets or sets the database connection string that is used to connect to 
-            the database.
-            </summary>
-            <value>
-            The database connection string used to connect to the database.
-            </value>
-            <remarks>
-            <para>
-            The connections string is specific to the connection type.
-            See <see cref="P:log4net.Appender.AdoNetAppender.ConnectionType"/> for more information.
-            </para>
-            </remarks>
-            <example>Connection string for MS Access via ODBC:
-            <code>"DSN=MS Access Database;UID=admin;PWD=;SystemDB=C:\data\System.mdw;SafeTransactions = 0;FIL=MS Access;DriverID = 25;DBQ=C:\data\train33.mdb"</code>
-            </example>
-            <example>Another connection string for MS Access via ODBC:
-            <code>"Driver={Microsoft Access Driver (*.mdb)};DBQ=C:\Work\cvs_root\log4net-1.2\access.mdb;UID=;PWD=;"</code>
-            </example>
-            <example>Connection string for MS Access via OLE DB:
-            <code>"Provider=Microsoft.Jet.OLEDB.4.0;Data Source=C:\Work\cvs_root\log4net-1.2\access.mdb;User Id=;Password=;"</code>
-            </example>
-        </member>
-        <member name="P:log4net.Appender.AdoNetAppender.ConnectionType">
-            <summary>
-            Gets or sets the type name of the <see cref="T:System.Data.IDbConnection"/> connection
-            that should be created.
-            </summary>
-            <value>
-            The type name of the <see cref="T:System.Data.IDbConnection"/> connection.
-            </value>
-            <remarks>
-            <para>
-            The type name of the ADO.NET provider to use.
-            </para>
-            <para>
-            The default is to use the OLE DB provider.
-            </para>
-            </remarks>
-            <example>Use the OLE DB Provider. This is the default value.
-            <code>System.Data.OleDb.OleDbConnection, System.Data, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</code>
-            </example>
-            <example>Use the MS SQL Server Provider. 
-            <code>System.Data.SqlClient.SqlConnection, System.Data, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</code>
-            </example>
-            <example>Use the ODBC Provider. 
-            <code>Microsoft.Data.Odbc.OdbcConnection,Microsoft.Data.Odbc,version=1.0.3300.0,publicKeyToken=b77a5c561934e089,culture=neutral</code>
-            This is an optional package that you can download from 
-            <a href="http://msdn.microsoft.com/downloads">http://msdn.microsoft.com/downloads</a> 
-            search for <b>ODBC .NET Data Provider</b>.
-            </example>
-            <example>Use the Oracle Provider. 
-            <code>System.Data.OracleClient.OracleConnection, System.Data.OracleClient, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</code>
-            This is an optional package that you can download from 
-            <a href="http://msdn.microsoft.com/downloads">http://msdn.microsoft.com/downloads</a> 
-            search for <b>.NET Managed Provider for Oracle</b>.
-            </example>
-        </member>
-        <member name="P:log4net.Appender.AdoNetAppender.CommandText">
-            <summary>
-            Gets or sets the command text that is used to insert logging events
-            into the database.
-            </summary>
-            <value>
-            The command text used to insert logging events into the database.
-            </value>
-            <remarks>
-            <para>
-            Either the text of the prepared statement or the
-            name of the stored procedure to execute to write into
-            the database.
-            </para>
-            <para>
-            The <see cref="P:log4net.Appender.AdoNetAppender.CommandType"/> property determines if
-            this text is a prepared statement or a stored procedure.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Appender.AdoNetAppender.CommandType">
-            <summary>
-            Gets or sets the command type to execute.
-            </summary>
-            <value>
-            The command type to execute.
-            </value>
-            <remarks>
-            <para>
-            This value may be either <see cref="F:System.Data.CommandType.Text"/> (<c>System.Data.CommandType.Text</c>) to specify
-            that the <see cref="P:log4net.Appender.AdoNetAppender.CommandText"/> is a prepared statement to execute, 
-            or <see cref="F:System.Data.CommandType.StoredProcedure"/> (<c>System.Data.CommandType.StoredProcedure</c>) to specify that the
-            <see cref="P:log4net.Appender.AdoNetAppender.CommandText"/> property is the name of a stored procedure
-            to execute.
-            </para>
-            <para>
-            The default value is <see cref="F:System.Data.CommandType.Text"/> (<c>System.Data.CommandType.Text</c>).
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Appender.AdoNetAppender.UseTransactions">
-            <summary>
-            Should transactions be used to insert logging events in the database.
-            </summary>
-            <value>
-            <c>true</c> if transactions should be used to insert logging events in
-            the database, otherwise <c>false</c>. The default value is <c>true</c>.
-            </value>
-            <remarks>
-            <para>
-            Gets or sets a value that indicates whether transactions should be used
-            to insert logging events in the database.
-            </para>
-            <para>
-            When set a single transaction will be used to insert the buffered events
-            into the database. Otherwise each event will be inserted without using
-            an explicit transaction.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Appender.AdoNetAppender.SecurityContext">
-            <summary>
-            Gets or sets the <see cref="P:log4net.Appender.AdoNetAppender.SecurityContext"/> used to call the NetSend method.
-            </summary>
-            <value>
-            The <see cref="P:log4net.Appender.AdoNetAppender.SecurityContext"/> used to call the NetSend method.
-            </value>
-            <remarks>
-            <para>
-            Unless a <see cref="P:log4net.Appender.AdoNetAppender.SecurityContext"/> specified here for this appender
-            the <see cref="P:log4net.Core.SecurityContextProvider.DefaultProvider"/> is queried for the
-            security context to use. The default behavior is to use the security context
-            of the current thread.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Appender.AdoNetAppender.ReconnectOnError">
-            <summary>
-            Should this appender try to reconnect to the database on error.
-            </summary>
-            <value>
-            <c>true</c> if the appender should try to reconnect to the database after an
-            error has occurred, otherwise <c>false</c>. The default value is <c>false</c>, 
-            i.e. not to try to reconnect.
-            </value>
-            <remarks>
-            <para>
-            The default behaviour is for the appender not to try to reconnect to the
-            database if an error occurs. Subsequent logging events are discarded.
-            </para>
-            <para>
-            To force the appender to attempt to reconnect to the database set this
-            property to <c>true</c>.
-            </para>
-            <note>
-            When the appender attempts to connect to the database there may be a
-            delay of up to the connection timeout specified in the connection string.
-            This delay will block the calling application's thread. 
-            Until the connection can be reestablished this potential delay may occur multiple times.
-            </note>
-            </remarks>
-        </member>
-        <member name="P:log4net.Appender.AdoNetAppender.Connection">
-            <summary>
-            Gets or sets the underlying <see cref="T:System.Data.IDbConnection"/>.
-            </summary>
-            <value>
-            The underlying <see cref="T:System.Data.IDbConnection"/>.
-            </value>
-            <remarks>
-            <see cref="T:log4net.Appender.AdoNetAppender"/> creates a <see cref="T:System.Data.IDbConnection"/> to insert 
-            logging events into a database.  Classes deriving from <see cref="T:log4net.Appender.AdoNetAppender"/> 
-            can use this property to get or set this <see cref="T:System.Data.IDbConnection"/>.  Use the 
-            underlying <see cref="T:System.Data.IDbConnection"/> returned from <see cref="P:log4net.Appender.AdoNetAppender.Connection"/> if 
-            you require access beyond that which <see cref="T:log4net.Appender.AdoNetAppender"/> provides.
-            </remarks>
-        </member>
-        <member name="T:log4net.Appender.AdoNetAppenderParameter">
-            <summary>
-            Parameter type used by the <see cref="T:log4net.Appender.AdoNetAppender"/>.
-            </summary>
-            <remarks>
-            <para>
-            This class provides the basic database parameter properties
-            as defined by the <see cref="T:System.Data.IDbDataParameter"/> interface.
-            </para>
-            <para>This type can be subclassed to provide database specific
-            functionality. The two methods that are called externally are
-            <see cref="M:log4net.Appender.AdoNetAppenderParameter.Prepare(System.Data.IDbCommand)"/> and <see cref="M:log4net.Appender.AdoNetAppenderParameter.FormatValue(System.Data.IDbCommand,log4net.Core.LoggingEvent)"/>.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.AdoNetAppenderParameter.#ctor">
-            <summary>
-            Initializes a new instance of the <see cref="T:log4net.Appender.AdoNetAppenderParameter"/> class.
-            </summary>
-            <remarks>
-            Default constructor for the AdoNetAppenderParameter class.
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.AdoNetAppenderParameter.Prepare(System.Data.IDbCommand)">
-            <summary>
-            Prepare the specified database command object.
-            </summary>
-            <param name="command">The command to prepare.</param>
-            <remarks>
-            <para>
-            Prepares the database command object by adding
-            this parameter to its collection of parameters.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.AdoNetAppenderParameter.FormatValue(System.Data.IDbCommand,log4net.Core.LoggingEvent)">
-            <summary>
-            Renders the logging event and set the parameter value in the command.
-            </summary>
-            <param name="command">The command containing the parameter.</param>
-            <param name="loggingEvent">The event to be rendered.</param>
-            <remarks>
-            <para>
-            Renders the logging event using this parameters layout
-            object. Sets the value of the parameter on the command object.
-            </para>
-            </remarks>
-        </member>
-        <member name="F:log4net.Appender.AdoNetAppenderParameter.m_parameterName">
-            <summary>
-            The name of this parameter.
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.AdoNetAppenderParameter.m_dbType">
-            <summary>
-            The database type for this parameter.
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.AdoNetAppenderParameter.m_inferType">
-            <summary>
-            Flag to infer type rather than use the DbType
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.AdoNetAppenderParameter.m_precision">
-            <summary>
-            The precision for this parameter.
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.AdoNetAppenderParameter.m_scale">
-            <summary>
-            The scale for this parameter.
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.AdoNetAppenderParameter.m_size">
-            <summary>
-            The size for this parameter.
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.AdoNetAppenderParameter.m_layout">
-            <summary>
-            The <see cref="T:log4net.Layout.IRawLayout"/> to use to render the
-            logging event into an object for this parameter.
-            </summary>
-        </member>
-        <member name="P:log4net.Appender.AdoNetAppenderParameter.ParameterName">
-            <summary>
-            Gets or sets the name of this parameter.
-            </summary>
-            <value>
-            The name of this parameter.
-            </value>
-            <remarks>
-            <para>
-            The name of this parameter. The parameter name
-            must match up to a named parameter to the SQL stored procedure
-            or prepared statement.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Appender.AdoNetAppenderParameter.DbType">
-            <summary>
-            Gets or sets the database type for this parameter.
-            </summary>
-            <value>
-            The database type for this parameter.
-            </value>
-            <remarks>
-            <para>
-            The database type for this parameter. This property should
-            be set to the database type from the <see cref="P:log4net.Appender.AdoNetAppenderParameter.DbType"/>
-            enumeration. See <see cref="P:System.Data.IDataParameter.DbType"/>.
-            </para>
-            <para>
-            This property is optional. If not specified the ADO.NET provider 
-            will attempt to infer the type from the value.
-            </para>
-            </remarks>
-            <seealso cref="P:System.Data.IDataParameter.DbType"/>
-        </member>
-        <member name="P:log4net.Appender.AdoNetAppenderParameter.Precision">
-            <summary>
-            Gets or sets the precision for this parameter.
-            </summary>
-            <value>
-            The precision for this parameter.
-            </value>
-            <remarks>
-            <para>
-            The maximum number of digits used to represent the Value.
-            </para>
-            <para>
-            This property is optional. If not specified the ADO.NET provider 
-            will attempt to infer the precision from the value.
-            </para>
-            </remarks>
-            <seealso cref="P:System.Data.IDbDataParameter.Precision"/>
-        </member>
-        <member name="P:log4net.Appender.AdoNetAppenderParameter.Scale">
-            <summary>
-            Gets or sets the scale for this parameter.
-            </summary>
-            <value>
-            The scale for this parameter.
-            </value>
-            <remarks>
-            <para>
-            The number of decimal places to which Value is resolved.
-            </para>
-            <para>
-            This property is optional. If not specified the ADO.NET provider 
-            will attempt to infer the scale from the value.
-            </para>
-            </remarks>
-            <seealso cref="P:System.Data.IDbDataParameter.Scale"/>
-        </member>
-        <member name="P:log4net.Appender.AdoNetAppenderParameter.Size">
-            <summary>
-            Gets or sets the size for this parameter.
-            </summary>
-            <value>
-            The size for this parameter.
-            </value>
-            <remarks>
-            <para>
-            The maximum size, in bytes, of the data within the column.
-            </para>
-            <para>
-            This property is optional. If not specified the ADO.NET provider 
-            will attempt to infer the size from the value.
-            </para>
-            </remarks>
-            <seealso cref="P:System.Data.IDbDataParameter.Size"/>
-        </member>
-        <member name="P:log4net.Appender.AdoNetAppenderParameter.Layout">
-            <summary>
-            Gets or sets the <see cref="T:log4net.Layout.IRawLayout"/> to use to 
-            render the logging event into an object for this 
-            parameter.
-            </summary>
-            <value>
-            The <see cref="T:log4net.Layout.IRawLayout"/> used to render the
-            logging event into an object for this parameter.
-            </value>
-            <remarks>
-            <para>
-            The <see cref="T:log4net.Layout.IRawLayout"/> that renders the value for this
-            parameter.
-            </para>
-            <para>
-            The <see cref="T:log4net.Layout.RawLayoutConverter"/> can be used to adapt
-            any <see cref="T:log4net.Layout.ILayout"/> into a <see cref="T:log4net.Layout.IRawLayout"/>
-            for use in the property.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Appender.AnsiColorTerminalAppender">
-            <summary>
-            Appends logging events to the terminal using ANSI color escape sequences.
-            </summary>
-            <remarks>
-            <para>
-            AnsiColorTerminalAppender appends log events to the standard output stream
-            or the error output stream using a layout specified by the 
-            user. It also allows the color of a specific level of message to be set.
-            </para>
-            <note>
-            This appender expects the terminal to understand the VT100 control set 
-            in order to interpret the color codes. If the terminal or console does not
-            understand the control codes the behavior is not defined.
-            </note>
-            <para>
-            By default, all output is written to the console's standard output stream.
-            The <see cref="P:log4net.Appender.AnsiColorTerminalAppender.Target"/> property can be set to direct the output to the
-            error stream.
-            </para>
-            <para>
-            NOTE: This appender writes each message to the <c>System.Console.Out</c> or 
-            <c>System.Console.Error</c> that is set at the time the event is appended.
-            Therefore it is possible to programmatically redirect the output of this appender 
-            (for example NUnit does this to capture program output). While this is the desired
-            behavior of this appender it may have security implications in your application. 
-            </para>
-            <para>
-            When configuring the ANSI colored terminal appender, a mapping should be
-            specified to map a logging level to a color. For example:
-            </para>
-            <code lang="XML" escaped="true">
-            <mapping>
-            	<level value="ERROR"/>
-            	<foreColor value="White"/>
-            	<backColor value="Red"/>
-                <attributes value="Bright,Underscore"/>
-            </mapping>
-            <mapping>
-            	<level value="DEBUG"/>
-            	<backColor value="Green"/>
-            </mapping>
-            </code>
-            <para>
-            The Level is the standard log4net logging level and ForeColor and BackColor can be any
-            of the following values:
-            <list type="bullet">
-            <item><term>Blue</term><description></description></item>
-            <item><term>Green</term><description></description></item>
-            <item><term>Red</term><description></description></item>
-            <item><term>White</term><description></description></item>
-            <item><term>Yellow</term><description></description></item>
-            <item><term>Purple</term><description></description></item>
-            <item><term>Cyan</term><description></description></item>
-            </list>
-            These color values cannot be combined together to make new colors.
-            </para>
-            <para>
-            The attributes can be any combination of the following:
-            <list type="bullet">
-            <item><term>Bright</term><description>foreground is brighter</description></item>
-            <item><term>Dim</term><description>foreground is dimmer</description></item>
-            <item><term>Underscore</term><description>message is underlined</description></item>
-            <item><term>Blink</term><description>foreground is blinking (does not work on all terminals)</description></item>
-            <item><term>Reverse</term><description>foreground and background are reversed</description></item>
-            <item><term>Hidden</term><description>output is hidden</description></item>
-            <item><term>Strikethrough</term><description>message has a line through it</description></item>
-            </list>
-            While any of these attributes may be combined together not all combinations
-            work well together, for example setting both <i>Bright</i> and <i>Dim</i> attributes makes
-            no sense.
-            </para>
-            </remarks>
-            <author>Patrick Wagstrom</author>
-            <author>Nicko Cadell</author>
-        </member>
-        <member name="F:log4net.Appender.AnsiColorTerminalAppender.ConsoleOut">
-            <summary>
-            The <see cref="P:log4net.Appender.AnsiColorTerminalAppender.Target"/> to use when writing to the Console 
-            standard output stream.
-            </summary>
-            <remarks>
-            <para>
-            The <see cref="P:log4net.Appender.AnsiColorTerminalAppender.Target"/> to use when writing to the Console 
-            standard output stream.
-            </para>
-            </remarks>
-        </member>
-        <member name="F:log4net.Appender.AnsiColorTerminalAppender.ConsoleError">
-            <summary>
-            The <see cref="P:log4net.Appender.AnsiColorTerminalAppender.Target"/> to use when writing to the Console 
-            standard error output stream.
-            </summary>
-            <remarks>
-            <para>
-            The <see cref="P:log4net.Appender.AnsiColorTerminalAppender.Target"/> to use when writing to the Console 
-            standard error output stream.
-            </para>
-            </remarks>
-        </member>
-        <member name="F:log4net.Appender.AnsiColorTerminalAppender.PostEventCodes">
-            <summary>
-            Ansi code to reset terminal
-            </summary>
-        </member>
-        <member name="M:log4net.Appender.AnsiColorTerminalAppender.#ctor">
-            <summary>
-            Initializes a new instance of the <see cref="T:log4net.Appender.AnsiColorTerminalAppender"/> class.
-            </summary>
-            <remarks>
-            The instance of the <see cref="T:log4net.Appender.AnsiColorTerminalAppender"/> class is set up to write 
-            to the standard output stream.
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.AnsiColorTerminalAppender.AddMapping(log4net.Appender.AnsiColorTerminalAppender.LevelColors)">
-            <summary>
-            Add a mapping of level to color
-            </summary>
-            <param name="mapping">The mapping to add</param>
-            <remarks>
-            <para>
-            Add a <see cref="T:log4net.Appender.AnsiColorTerminalAppender.LevelColors"/> mapping to this appender.
-            Each mapping defines the foreground and background colours
-            for a level.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.AnsiColorTerminalAppender.Append(log4net.Core.LoggingEvent)">
-            <summary>
-            This method is called by the <see cref="M:log4net.Appender.AppenderSkeleton.DoAppend(log4net.Core.LoggingEvent)"/> method.
-            </summary>
-            <param name="loggingEvent">The event to log.</param>
-            <remarks>
-            <para>
-            Writes the event to the console.
-            </para>
-            <para>
-            The format of the output will depend on the appender's layout.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.AnsiColorTerminalAppender.ActivateOptions">
-            <summary>
-            Initialize the options for this appender
-            </summary>
-            <remarks>
-            <para>
-            Initialize the level to color mappings set on this appender.
-            </para>
-            </remarks>
-        </member>
-        <member name="F:log4net.Appender.AnsiColorTerminalAppender.m_writeToErrorStream">
-            <summary>
-            Flag to write output to the error stream rather than the standard output stream
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.AnsiColorTerminalAppender.m_levelMapping">
-            <summary>
-            Mapping from level object to color value
-            </summary>
-        </member>
-        <member name="P:log4net.Appender.AnsiColorTerminalAppender.Target">
-            <summary>
-            Target is the value of the console output stream.
-            </summary>
-            <value>
-            Target is the value of the console output stream.
-            This is either <c>"Console.Out"</c> or <c>"Console.Error"</c>.
-            </value>
-            <remarks>
-            <para>
-            Target is the value of the console output stream.
-            This is either <c>"Console.Out"</c> or <c>"Console.Error"</c>.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Appender.AnsiColorTerminalAppender.RequiresLayout">
-            <summary>
-            This appender requires a <see cref="N:log4net.Layout"/> to be set.
-            </summary>
-            <value><c>true</c></value>
-            <remarks>
-            <para>
-            This appender requires a <see cref="N:log4net.Layout"/> to be set.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Appender.AnsiColorTerminalAppender.AnsiAttributes">
-            <summary>
-            The enum of possible display attributes
-            </summary>
-            <remarks>
-            <para>
-            The following flags can be combined together to
-            form the ANSI color attributes.
-            </para>
-            </remarks>
-            <seealso cref="T:log4net.Appender.AnsiColorTerminalAppender"/>
-        </member>
-        <member name="F:log4net.Appender.AnsiColorTerminalAppender.AnsiAttributes.Bright">
-            <summary>
-            text is bright
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.AnsiColorTerminalAppender.AnsiAttributes.Dim">
-            <summary>
-            text is dim
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.AnsiColorTerminalAppender.AnsiAttributes.Underscore">
-            <summary>
-            text is underlined
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.AnsiColorTerminalAppender.AnsiAttributes.Blink">
-            <summary>
-            text is blinking
-            </summary>
-            <remarks>
-            Not all terminals support this attribute
-            </remarks>
-        </member>
-        <member name="F:log4net.Appender.AnsiColorTerminalAppender.AnsiAttributes.Reverse">
-            <summary>
-            text and background colors are reversed
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.AnsiColorTerminalAppender.AnsiAttributes.Hidden">
-            <summary>
-            text is hidden
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.AnsiColorTerminalAppender.AnsiAttributes.Strikethrough">
-            <summary>
-            text is displayed with a strikethrough
-            </summary>
-        </member>
-        <member name="T:log4net.Appender.AnsiColorTerminalAppender.AnsiColor">
-            <summary>
-            The enum of possible foreground or background color values for 
-            use with the color mapping method
-            </summary>
-            <remarks>
-            <para>
-            The output can be in one for the following ANSI colors.
-            </para>
-            </remarks>
-            <seealso cref="T:log4net.Appender.AnsiColorTerminalAppender"/>
-        </member>
-        <member name="F:log4net.Appender.AnsiColorTerminalAppender.AnsiColor.Black">
-            <summary>
-            color is black
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.AnsiColorTerminalAppender.AnsiColor.Red">
-            <summary>
-            color is red
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.AnsiColorTerminalAppender.AnsiColor.Green">
-            <summary>
-            color is green
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.AnsiColorTerminalAppender.AnsiColor.Yellow">
-            <summary>
-            color is yellow
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.AnsiColorTerminalAppender.AnsiColor.Blue">
-            <summary>
-            color is blue
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.AnsiColorTerminalAppender.AnsiColor.Magenta">
-            <summary>
-            color is magenta
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.AnsiColorTerminalAppender.AnsiColor.Cyan">
-            <summary>
-            color is cyan
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.AnsiColorTerminalAppender.AnsiColor.White">
-            <summary>
-            color is white
-            </summary>
-        </member>
-        <member name="T:log4net.Appender.AnsiColorTerminalAppender.LevelColors">
-            <summary>
-            A class to act as a mapping between the level that a logging call is made at and
-            the color it should be displayed as.
-            </summary>
-            <remarks>
-            <para>
-            Defines the mapping between a level and the color it should be displayed in.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Util.LevelMappingEntry">
-            <summary>
-            An entry in the <see cref="T:log4net.Util.LevelMapping"/>
-            </summary>
-            <remarks>
-            <para>
-            This is an abstract base class for types that are stored in the
-            <see cref="T:log4net.Util.LevelMapping"/> object.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-        </member>
-        <member name="M:log4net.Util.LevelMappingEntry.#ctor">
-            <summary>
-            Default protected constructor
-            </summary>
-            <remarks>
-            <para>
-            Default protected constructor
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.LevelMappingEntry.ActivateOptions">
-            <summary>
-            Initialize any options defined on this entry
-            </summary>
-            <remarks>
-            <para>
-            Should be overridden by any classes that need to initialise based on their options
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Util.LevelMappingEntry.Level">
-            <summary>
-            The level that is the key for this mapping 
-            </summary>
-            <value>
-            The <see cref="P:log4net.Util.LevelMappingEntry.Level"/> that is the key for this mapping 
-            </value>
-            <remarks>
-            <para>
-            Get or set the <see cref="P:log4net.Util.LevelMappingEntry.Level"/> that is the key for this
-            mapping subclass.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.AnsiColorTerminalAppender.LevelColors.ActivateOptions">
-            <summary>
-            Initialize the options for the object
-            </summary>
-            <remarks>
-            <para>
-            Combine the <see cref="P:log4net.Appender.AnsiColorTerminalAppender.LevelColors.ForeColor"/> and <see cref="P:log4net.Appender.AnsiColorTerminalAppender.LevelColors.BackColor"/> together
-            and append the attributes.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Appender.AnsiColorTerminalAppender.LevelColors.ForeColor">
-            <summary>
-            The mapped foreground color for the specified level
-            </summary>
-            <remarks>
-            <para>
-            Required property.
-            The mapped foreground color for the specified level
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Appender.AnsiColorTerminalAppender.LevelColors.BackColor">
-            <summary>
-            The mapped background color for the specified level
-            </summary>
-            <remarks>
-            <para>
-            Required property.
-            The mapped background color for the specified level
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Appender.AnsiColorTerminalAppender.LevelColors.Attributes">
-            <summary>
-            The color attributes for the specified level
-            </summary>
-            <remarks>
-            <para>
-            Required property.
-            The color attributes for the specified level
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Appender.AnsiColorTerminalAppender.LevelColors.CombinedColor">
-            <summary>
-            The combined <see cref="P:log4net.Appender.AnsiColorTerminalAppender.LevelColors.ForeColor"/>, <see cref="P:log4net.Appender.AnsiColorTerminalAppender.LevelColors.BackColor"/> and
-            <see cref="P:log4net.Appender.AnsiColorTerminalAppender.LevelColors.Attributes"/> suitable for setting the ansi terminal color.
-            </summary>
-        </member>
-        <member name="T:log4net.Appender.AppenderCollection">
-            <summary>
-            A strongly-typed collection of <see cref="T:log4net.Appender.IAppender"/> objects.
-            </summary>
-            <author>Nicko Cadell</author>
-        </member>
-        <member name="M:log4net.Appender.AppenderCollection.ReadOnly(log4net.Appender.AppenderCollection)">
-            <summary>
-            Creates a read-only wrapper for a <c>AppenderCollection</c> instance.
-            </summary>
-            <param name="list">list to create a readonly wrapper arround</param>
-            <returns>
-            An <c>AppenderCollection</c> wrapper that is read-only.
-            </returns>
-        </member>
-        <member name="F:log4net.Appender.AppenderCollection.EmptyCollection">
-            <summary>
-            An empty readonly static AppenderCollection
-            </summary>
-        </member>
-        <member name="M:log4net.Appender.AppenderCollection.#ctor">
-            <summary>
-            Initializes a new instance of the <c>AppenderCollection</c> class
-            that is empty and has the default initial capacity.
-            </summary>
-        </member>
-        <member name="M:log4net.Appender.AppenderCollection.#ctor(System.Int32)">
-            <summary>
-            Initializes a new instance of the <c>AppenderCollection</c> class
-            that has the specified initial capacity.
-            </summary>
-            <param name="capacity">
-            The number of elements that the new <c>AppenderCollection</c> is initially capable of storing.
-            </param>
-        </member>
-        <member name="M:log4net.Appender.AppenderCollection.#ctor(log4net.Appender.AppenderCollection)">
-            <summary>
-            Initializes a new instance of the <c>AppenderCollection</c> class
-            that contains elements copied from the specified <c>AppenderCollection</c>.
-            </summary>
-            <param name="c">The <c>AppenderCollection</c> whose elements are copied to the new collection.</param>
-        </member>
-        <member name="M:log4net.Appender.AppenderCollection.#ctor(log4net.Appender.IAppender[])">
-            <summary>
-            Initializes a new instance of the <c>AppenderCollection</c> class
-            that contains elements copied from the specified <see cref="T:log4net.Appender.IAppender"/> array.
-            </summary>
-            <param name="a">The <see cref="T:log4net.Appender.IAppender"/> array whose elements are copied to the new list.</param>
-        </member>
-        <member name="M:log4net.Appender.AppenderCollection.#ctor(System.Collections.ICollection)">
-            <summary>
-            Initializes a new instance of the <c>AppenderCollection</c> class
-            that contains elements copied from the specified <see cref="T:log4net.Appender.IAppender"/> collection.
-            </summary>
-            <param name="col">The <see cref="T:log4net.Appender.IAppender"/> collection whose elements are copied to the new list.</param>
-        </member>
-        <member name="M:log4net.Appender.AppenderCollection.#ctor(log4net.Appender.AppenderCollection.Tag)">
-            <summary>
-            Allow subclasses to avoid our default constructors
-            </summary>
-            <param name="tag"></param>
-            <exclude/>
-        </member>
-        <member name="M:log4net.Appender.AppenderCollection.CopyTo(log4net.Appender.IAppender[])">
-            <summary>
-            Copies the entire <c>AppenderCollection</c> to a one-dimensional
-            <see cref="T:log4net.Appender.IAppender"/> array.
-            </summary>
-            <param name="array">The one-dimensional <see cref="T:log4net.Appender.IAppender"/> array to copy to.</param>
-        </member>
-        <member name="M:log4net.Appender.AppenderCollection.CopyTo(log4net.Appender.IAppender[],System.Int32)">
-            <summary>
-            Copies the entire <c>AppenderCollection</c> to a one-dimensional
-            <see cref="T:log4net.Appender.IAppender"/> array, starting at the specified index of the target array.
-            </summary>
-            <param name="array">The one-dimensional <see cref="T:log4net.Appender.IAppender"/> array to copy to.</param>
-            <param name="start">The zero-based index in <paramref name="array"/> at which copying begins.</param>
-        </member>
-        <member name="M:log4net.Appender.AppenderCollection.Add(log4net.Appender.IAppender)">
-            <summary>
-            Adds a <see cref="T:log4net.Appender.IAppender"/> to the end of the <c>AppenderCollection</c>.
-            </summary>
-            <param name="item">The <see cref="T:log4net.Appender.IAppender"/> to be added to the end of the <c>AppenderCollection</c>.</param>
-            <returns>The index at which the value has been added.</returns>
-        </member>
-        <member name="M:log4net.Appender.AppenderCollection.Clear">
-            <summary>
-            Removes all elements from the <c>AppenderCollection</c>.
-            </summary>
-        </member>
-        <member name="M:log4net.Appender.AppenderCollection.Clone">
-            <summary>
-            Creates a shallow copy of the <see cref="T:log4net.Appender.AppenderCollection"/>.
-            </summary>
-            <returns>A new <see cref="T:log4net.Appender.AppenderCollection"/> with a shallow copy of the collection data.</returns>
-        </member>
-        <member name="M:log4net.Appender.AppenderCollection.Contains(log4net.Appender.IAppender)">
-            <summary>
-            Determines whether a given <see cref="T:log4net.Appender.IAppender"/> is in the <c>AppenderCollection</c>.
-            </summary>
-            <param name="item">The <see cref="T:log4net.Appender.IAppender"/> to check for.</param>
-            <returns><c>true</c> if <paramref name="item"/> is found in the <c>AppenderCollection</c>; otherwise, <c>false</c>.</returns>
-        </member>
-        <member name="M:log4net.Appender.AppenderCollection.IndexOf(log4net.Appender.IAppender)">
-            <summary>
-            Returns the zero-based index of the first occurrence of a <see cref="T:log4net.Appender.IAppender"/>
-            in the <c>AppenderCollection</c>.
-            </summary>
-            <param name="item">The <see cref="T:log4net.Appender.IAppender"/> to locate in the <c>AppenderCollection</c>.</param>
-            <returns>
-            The zero-based index of the first occurrence of <paramref name="item"/> 
-            in the entire <c>AppenderCollection</c>, if found; otherwise, -1.
-            </returns>
-        </member>
-        <member name="M:log4net.Appender.AppenderCollection.Insert(System.Int32,log4net.Appender.IAppender)">
-            <summary>
-            Inserts an element into the <c>AppenderCollection</c> at the specified index.
-            </summary>
-            <param name="index">The zero-based index at which <paramref name="item"/> should be inserted.</param>
-            <param name="item">The <see cref="T:log4net.Appender.IAppender"/> to insert.</param>
-            <exception cref="T:System.ArgumentOutOfRangeException">
-            <para><paramref name="index"/> is less than zero</para>
-            <para>-or-</para>
-            <para><paramref name="index"/> is equal to or greater than <see cref="P:log4net.Appender.AppenderCollection.Count"/>.</para>
-            </exception>
-        </member>
-        <member name="M:log4net.Appender.AppenderCollection.Remove(log4net.Appender.IAppender)">
-            <summary>
-            Removes the first occurrence of a specific <see cref="T:log4net.Appender.IAppender"/> from the <c>AppenderCollection</c>.
-            </summary>
-            <param name="item">The <see cref="T:log4net.Appender.IAppender"/> to remove from the <c>AppenderCollection</c>.</param>
-            <exception cref="T:System.ArgumentException">
-            The specified <see cref="T:log4net.Appender.IAppender"/> was not found in the <c>AppenderCollection</c>.
-            </exception>
-        </member>
-        <member name="M:log4net.Appender.AppenderCollection.RemoveAt(System.Int32)">
-            <summary>
-            Removes the element at the specified index of the <c>AppenderCollection</c>.
-            </summary>
-            <param name="index">The zero-based index of the element to remove.</param>
-            <exception cref="T:System.ArgumentOutOfRangeException">
-            <para><paramref name="index"/> is less than zero</para>
-            <para>-or-</para>
-            <para><paramref name="index"/> is equal to or greater than <see cref="P:log4net.Appender.AppenderCollection.Count"/>.</para>
-            </exception>
-        </member>
-        <member name="M:log4net.Appender.AppenderCollection.GetEnumerator">
-            <summary>
-            Returns an enumerator that can iterate through the <c>AppenderCollection</c>.
-            </summary>
-            <returns>An <see cref="T:log4net.Appender.AppenderCollection.Enumerator"/> for the entire <c>AppenderCollection</c>.</returns>
-        </member>
-        <member name="M:log4net.Appender.AppenderCollection.AddRange(log4net.Appender.AppenderCollection)">
-            <summary>
-            Adds the elements of another <c>AppenderCollection</c> to the current <c>AppenderCollection</c>.
-            </summary>
-            <param name="x">The <c>AppenderCollection</c> whose elements should be added to the end of the current <c>AppenderCollection</c>.</param>
-            <returns>The new <see cref="P:log4net.Appender.AppenderCollection.Count"/> of the <c>AppenderCollection</c>.</returns>
-        </member>
-        <member name="M:log4net.Appender.AppenderCollection.AddRange(log4net.Appender.IAppender[])">
-            <summary>
-            Adds the elements of a <see cref="T:log4net.Appender.IAppender"/> array to the current <c>AppenderCollection</c>.
-            </summary>
-            <param name="x">The <see cref="T:log4net.Appender.IAppender"/> array whose elements should be added to the end of the <c>AppenderCollection</c>.</param>
-            <returns>The new <see cref="P:log4net.Appender.AppenderCollection.Count"/> of the <c>AppenderCollection</c>.</returns>
-        </member>
-        <member name="M:log4net.Appender.AppenderCollection.AddRange(System.Collections.ICollection)">
-            <summary>
-            Adds the elements of a <see cref="T:log4net.Appender.IAppender"/> collection to the current <c>AppenderCollection</c>.
-            </summary>
-            <param name="col">The <see cref="T:log4net.Appender.IAppender"/> collection whose elements should be added to the end of the <c>AppenderCollection</c>.</param>
-            <returns>The new <see cref="P:log4net.Appender.AppenderCollection.Count"/> of the <c>AppenderCollection</c>.</returns>
-        </member>
-        <member name="M:log4net.Appender.AppenderCollection.TrimToSize">
-            <summary>
-            Sets the capacity to the actual number of elements.
-            </summary>
-        </member>
-        <member name="M:log4net.Appender.AppenderCollection.ToArray">
-            <summary>
-            Return the collection elements as an array
-            </summary>
-            <returns>the array</returns>
-        </member>
-        <member name="M:log4net.Appender.AppenderCollection.ValidateIndex(System.Int32)">
-            <exception cref="T:System.ArgumentOutOfRangeException">
-            <para><paramref name="index"/> is less than zero</para>
-            <para>-or-</para>
-            <para><paramref name="index"/> is equal to or greater than <see cref="P:log4net.Appender.AppenderCollection.Count"/>.</para>
-            </exception>
-        </member>
-        <member name="M:log4net.Appender.AppenderCollection.ValidateIndex(System.Int32,System.Boolean)">
-            <exception cref="T:System.ArgumentOutOfRangeException">
-            <para><paramref name="index"/> is less than zero</para>
-            <para>-or-</para>
-            <para><paramref name="index"/> is equal to or greater than <see cref="P:log4net.Appender.AppenderCollection.Count"/>.</para>
-            </exception>
-        </member>
-        <member name="P:log4net.Appender.AppenderCollection.Count">
-            <summary>
-            Gets the number of elements actually contained in the <c>AppenderCollection</c>.
-            </summary>
-        </member>
-        <member name="P:log4net.Appender.AppenderCollection.IsSynchronized">
-            <summary>
-            Gets a value indicating whether access to the collection is synchronized (thread-safe).
-            </summary>
-            <returns>true if access to the ICollection is synchronized (thread-safe); otherwise, false.</returns>
-        </member>
-        <member name="P:log4net.Appender.AppenderCollection.SyncRoot">
-            <summary>
-            Gets an object that can be used to synchronize access to the collection.
-            </summary>
-        </member>
-        <member name="P:log4net.Appender.AppenderCollection.Item(System.Int32)">
-            <summary>
-            Gets or sets the <see cref="T:log4net.Appender.IAppender"/> at the specified index.
-            </summary>
-            <param name="index">The zero-based index of the element to get or set.</param>
-            <exception cref="T:System.ArgumentOutOfRangeException">
-            	<para><paramref name="index"/> is less than zero</para>
-            	<para>-or-</para>
-            	<para><paramref name="index"/> is equal to or greater than <see cref="P:log4net.Appender.AppenderCollection.Count"/>.</para>
-            </exception>
-        </member>
-        <member name="P:log4net.Appender.AppenderCollection.IsFixedSize">
-            <summary>
-            Gets a value indicating whether the collection has a fixed size.
-            </summary>
-            <value>true if the collection has a fixed size; otherwise, false. The default is false</value>
-        </member>
-        <member name="P:log4net.Appender.AppenderCollection.IsReadOnly">
-            <summary>
-            Gets a value indicating whether the IList is read-only.
-            </summary>
-            <value>true if the collection is read-only; otherwise, false. The default is false</value>
-        </member>
-        <member name="P:log4net.Appender.AppenderCollection.Capacity">
-            <summary>
-            Gets or sets the number of elements the <c>AppenderCollection</c> can contain.
-            </summary>
-        </member>
-        <member name="T:log4net.Appender.AppenderCollection.IAppenderCollectionEnumerator">
-            <summary>
-            Supports type-safe iteration over a <see cref="T:log4net.Appender.AppenderCollection"/>.
-            </summary>
-            <exclude/>
-        </member>
-        <member name="M:log4net.Appender.AppenderCollection.IAppenderCollectionEnumerator.MoveNext">
-            <summary>
-            Advances the enumerator to the next element in the collection.
-            </summary>
-            <returns>
-            <c>true</c> if the enumerator was successfully advanced to the next element; 
-            <c>false</c> if the enumerator has passed the end of the collection.
-            </returns>
-            <exception cref="T:System.InvalidOperationException">
-            The collection was modified after the enumerator was created.
-            </exception>
-        </member>
-        <member name="M:log4net.Appender.AppenderCollection.IAppenderCollectionEnumerator.Reset">
-            <summary>
-            Sets the enumerator to its initial position, before the first element in the collection.
-            </summary>
-        </member>
-        <member name="P:log4net.Appender.AppenderCollection.IAppenderCollectionEnumerator.Current">
-            <summary>
-            Gets the current element in the collection.
-            </summary>
-        </member>
-        <member name="T:log4net.Appender.AppenderCollection.Tag">
-            <summary>
-            Type visible only to our subclasses
-            Used to access protected constructor
-            </summary>
-            <exclude/>
-        </member>
-        <member name="F:log4net.Appender.AppenderCollection.Tag.Default">
-            <summary>
-            A value
-            </summary>
-        </member>
-        <member name="T:log4net.Appender.AppenderCollection.Enumerator">
-            <summary>
-            Supports simple iteration over a <see cref="T:log4net.Appender.AppenderCollection"/>.
-            </summary>
-            <exclude/>
-        </member>
-        <member name="M:log4net.Appender.AppenderCollection.Enumerator.#ctor(log4net.Appender.AppenderCollection)">
-            <summary>
-            Initializes a new instance of the <c>Enumerator</c> class.
-            </summary>
-            <param name="tc"></param>
-        </member>
-        <member name="M:log4net.Appender.AppenderCollection.Enumerator.MoveNext">
-            <summary>
-            Advances the enumerator to the next element in the collection.
-            </summary>
-            <returns>
-            <c>true</c> if the enumerator was successfully advanced to the next element; 
-            <c>false</c> if the enumerator has passed the end of the collection.
-            </returns>
-            <exception cref="T:System.InvalidOperationException">
-            The collection was modified after the enumerator was created.
-            </exception>
-        </member>
-        <member name="M:log4net.Appender.AppenderCollection.Enumerator.Reset">
-            <summary>
-            Sets the enumerator to its initial position, before the first element in the collection.
-            </summary>
-        </member>
-        <member name="P:log4net.Appender.AppenderCollection.Enumerator.Current">
-            <summary>
-            Gets the current element in the collection.
-            </summary>
-        </member>
-        <member name="T:log4net.Appender.AppenderCollection.ReadOnlyAppenderCollection">
-            <exclude/>
-        </member>
-        <member name="T:log4net.Appender.AspNetTraceAppender">
-            <summary>
-            <para>
-            Appends log events to the ASP.NET <see cref="T:System.Web.TraceContext"/> system.
-            </para>
-            </summary>
-            <remarks>
-            <para>
-            Diagnostic information and tracing messages that you specify are appended to the output 
-            of the page that is sent to the requesting browser. Optionally, you can view this information
-            from a separate trace viewer (Trace.axd) that displays trace information for every page in a 
-            given application.
-            </para>
-            <para>
-            Trace statements are processed and displayed only when tracing is enabled. You can control 
-            whether tracing is displayed to a page, to the trace viewer, or both.
-            </para>
-            <para>
-            The logging event is passed to the <see cref="M:System.Web.TraceContext.Write(System.String)"/> or 
-            <see cref="M:System.Web.TraceContext.Warn(System.String)"/> method depending on the level of the logging event.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-        </member>
-        <member name="M:log4net.Appender.AspNetTraceAppender.#ctor">
-            <summary>
-            Initializes a new instance of the <see cref="T:log4net.Appender.AspNetTraceAppender"/> class.
-            </summary>
-            <remarks>
-            <para>
-            Default constructor.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.AspNetTraceAppender.Append(log4net.Core.LoggingEvent)">
-            <summary>
-            Write the logging event to the ASP.NET trace
-            </summary>
-            <param name="loggingEvent">the event to log</param>
-            <remarks>
-            <para>
-            Write the logging event to the ASP.NET trace
-            <c>HttpContext.Current.Trace</c> 
-            (<see cref="T:System.Web.TraceContext"/>).
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Appender.AspNetTraceAppender.RequiresLayout">
-            <summary>
-            This appender requires a <see cref="N:log4net.Layout"/> to be set.
-            </summary>
-            <value><c>true</c></value>
-            <remarks>
-            <para>
-            This appender requires a <see cref="N:log4net.Layout"/> to be set.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Appender.BufferingForwardingAppender">
-            <summary>
-            Buffers events and then forwards them to attached appenders.
-            </summary>
-            <remarks>
-            <para>
-            The events are buffered in this appender until conditions are
-            met to allow the appender to deliver the events to the attached 
-            appenders. See <see cref="T:log4net.Appender.BufferingAppenderSkeleton"/> for the
-            conditions that cause the buffer to be sent.
-            </para>
-            <para>The forwarding appender can be used to specify different 
-            thresholds and filters for the same appender at different locations 
-            within the hierarchy.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-        </member>
-        <member name="T:log4net.Core.IAppenderAttachable">
-            <summary>
-            Interface for attaching appenders to objects.
-            </summary>
-            <remarks>
-            <para>
-            Interface for attaching, removing and retrieving appenders.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-        </member>
-        <member name="M:log4net.Core.IAppenderAttachable.AddAppender(log4net.Appender.IAppender)">
-            <summary>
-            Attaches an appender.
-            </summary>
-            <param name="appender">The appender to add.</param>
-            <remarks>
-            <para>
-            Add the specified appender. The implementation may
-            choose to allow or deny duplicate appenders.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.IAppenderAttachable.GetAppender(System.String)">
-            <summary>
-            Gets an attached appender with the specified name.
-            </summary>
-            <param name="name">The name of the appender to get.</param>
-            <returns>
-            The appender with the name specified, or <c>null</c> if no appender with the
-            specified name is found.
-            </returns>
-            <remarks>
-            <para>
-            Returns an attached appender with the <paramref name="name"/> specified.
-            If no appender with the specified name is found <c>null</c> will be
-            returned.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.IAppenderAttachable.RemoveAllAppenders">
-            <summary>
-            Removes all attached appenders.
-            </summary>
-            <remarks>
-            <para>
-            Removes and closes all attached appenders
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.IAppenderAttachable.RemoveAppender(log4net.Appender.IAppender)">
-            <summary>
-            Removes the specified appender from the list of attached appenders.
-            </summary>
-            <param name="appender">The appender to remove.</param>
-            <returns>The appender removed from the list</returns>
-            <remarks>
-            <para>
-            The appender removed is not closed.
-            If you are discarding the appender you must call
-            <see cref="M:log4net.Appender.IAppender.Close"/> on the appender removed.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.IAppenderAttachable.RemoveAppender(System.String)">
-            <summary>
-            Removes the appender with the specified name from the list of appenders.
-            </summary>
-            <param name="name">The name of the appender to remove.</param>
-            <returns>The appender removed from the list</returns>
-            <remarks>
-            <para>
-            The appender removed is not closed.
-            If you are discarding the appender you must call
-            <see cref="M:log4net.Appender.IAppender.Close"/> on the appender removed.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Core.IAppenderAttachable.Appenders">
-            <summary>
-            Gets all attached appenders.
-            </summary>
-            <value>
-            A collection of attached appenders.
-            </value>
-            <remarks>
-            <para>
-            Gets a collection of attached appenders.
-            If there are no attached appenders the
-            implementation should return an empty 
-            collection rather than <c>null</c>.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.BufferingForwardingAppender.#ctor">
-            <summary>
-            Initializes a new instance of the <see cref="T:log4net.Appender.BufferingForwardingAppender"/> class.
-            </summary>
-            <remarks>
-            <para>
-            Default constructor.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.BufferingForwardingAppender.OnClose">
-            <summary>
-            Closes the appender and releases resources.
-            </summary>
-            <remarks>
-            <para>
-            Releases any resources allocated within the appender such as file handles, 
-            network connections, etc.
-            </para>
-            <para>
-            It is a programming error to append to a closed appender.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.BufferingForwardingAppender.SendBuffer(log4net.Core.LoggingEvent[])">
-            <summary>
-            Send the events.
-            </summary>
-            <param name="events">The events that need to be send.</param>
-            <remarks>
-            <para>
-            Forwards the events to the attached appenders.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.BufferingForwardingAppender.AddAppender(log4net.Appender.IAppender)">
-            <summary>
-            Adds an <see cref="T:log4net.Appender.IAppender"/> to the list of appenders of this
-            instance.
-            </summary>
-            <param name="newAppender">The <see cref="T:log4net.Appender.IAppender"/> to add to this appender.</param>
-            <remarks>
-            <para>
-            If the specified <see cref="T:log4net.Appender.IAppender"/> is already in the list of
-            appenders, then it won't be added again.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.BufferingForwardingAppender.GetAppender(System.String)">
-            <summary>
-            Looks for the appender with the specified name.
-            </summary>
-            <param name="name">The name of the appender to lookup.</param>
-            <returns>
-            The appender with the specified name, or <c>null</c>.
-            </returns>
-            <remarks>
-            <para>
-            Get the named appender attached to this buffering appender.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.BufferingForwardingAppender.RemoveAllAppenders">
-            <summary>
-            Removes all previously added appenders from this appender.
-            </summary>
-            <remarks>
-            <para>
-            This is useful when re-reading configuration information.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.BufferingForwardingAppender.RemoveAppender(log4net.Appender.IAppender)">
-            <summary>
-            Removes the specified appender from the list of appenders.
-            </summary>
-            <param name="appender">The appender to remove.</param>
-            <returns>The appender removed from the list</returns>
-            <remarks>
-            The appender removed is not closed.
-            If you are discarding the appender you must call
-            <see cref="M:log4net.Appender.IAppender.Close"/> on the appender removed.
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.BufferingForwardingAppender.RemoveAppender(System.String)">
-            <summary>
-            Removes the appender with the specified name from the list of appenders.
-            </summary>
-            <param name="name">The name of the appender to remove.</param>
-            <returns>The appender removed from the list</returns>
-            <remarks>
-            The appender removed is not closed.
-            If you are discarding the appender you must call
-            <see cref="M:log4net.Appender.IAppender.Close"/> on the appender removed.
-            </remarks>
-        </member>
-        <member name="F:log4net.Appender.BufferingForwardingAppender.m_appenderAttachedImpl">
-            <summary>
-            Implementation of the <see cref="T:log4net.Core.IAppenderAttachable"/> interface
-            </summary>
-        </member>
-        <member name="P:log4net.Appender.BufferingForwardingAppender.Appenders">
-            <summary>
-            Gets the appenders contained in this appender as an 
-            <see cref="T:System.Collections.ICollection"/>.
-            </summary>
-            <remarks>
-            If no appenders can be found, then an <see cref="T:log4net.Util.EmptyCollection"/> 
-            is returned.
-            </remarks>
-            <returns>
-            A collection of the appenders in this appender.
-            </returns>
-        </member>
-        <member name="T:log4net.Appender.ColoredConsoleAppender">
-            <summary>
-            Appends logging events to the console.
-            </summary>
-            <remarks>
-            <para>
-            ColoredConsoleAppender appends log events to the standard output stream
-            or the error output stream using a layout specified by the 
-            user. It also allows the color of a specific type of message to be set.
-            </para>
-            <para>
-            By default, all output is written to the console's standard output stream.
-            The <see cref="P:log4net.Appender.ColoredConsoleAppender.Target"/> property can be set to direct the output to the
-            error stream.
-            </para>
-            <para>
-            NOTE: This appender writes directly to the application's attached console
-            not to the <c>System.Console.Out</c> or <c>System.Console.Error</c> <c>TextWriter</c>.
-            The <c>System.Console.Out</c> and <c>System.Console.Error</c> streams can be
-            programmatically redirected (for example NUnit does this to capture program output).
-            This appender will ignore these redirections because it needs to use Win32
-            API calls to colorize the output. To respect these redirections the <see cref="T:log4net.Appender.ConsoleAppender"/>
-            must be used.
-            </para>
-            <para>
-            When configuring the colored console appender, mapping should be
-            specified to map a logging level to a color. For example:
-            </para>
-            <code lang="XML" escaped="true">
-            <mapping>
-            	<level value="ERROR"/>
-            	<foreColor value="White"/>
-            	<backColor value="Red, HighIntensity"/>
-            </mapping>
-            <mapping>
-            	<level value="DEBUG"/>
-            	<backColor value="Green"/>
-            </mapping>
-            </code>
-            <para>
-            The Level is the standard log4net logging level and ForeColor and BackColor can be any
-            combination of the following values:
-            <list type="bullet">
-            <item><term>Blue</term><description></description></item>
-            <item><term>Green</term><description></description></item>
-            <item><term>Red</term><description></description></item>
-            <item><term>White</term><description></description></item>
-            <item><term>Yellow</term><description></description></item>
-            <item><term>Purple</term><description></description></item>
-            <item><term>Cyan</term><description></description></item>
-            <item><term>HighIntensity</term><description></description></item>
-            </list>
-            </para>
-            </remarks>
-            <author>Rick Hobbs</author>
-            <author>Nicko Cadell</author>
-        </member>
-        <member name="F:log4net.Appender.ColoredConsoleAppender.ConsoleOut">
-            <summary>
-            The <see cref="P:log4net.Appender.ColoredConsoleAppender.Target"/> to use when writing to the Console 
-            standard output stream.
-            </summary>
-            <remarks>
-            <para>
-            The <see cref="P:log4net.Appender.ColoredConsoleAppender.Target"/> to use when writing to the Console 
-            standard output stream.
-            </para>
-            </remarks>
-        </member>
-        <member name="F:log4net.Appender.ColoredConsoleAppender.ConsoleError">
-            <summary>
-            The <see cref="P:log4net.Appender.ColoredConsoleAppender.Target"/> to use when writing to the Console 
-            standard error output stream.
-            </summary>
-            <remarks>
-            <para>
-            The <see cref="P:log4net.Appender.ColoredConsoleAppender.Target"/> to use when writing to the Console 
-            standard error output stream.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.ColoredConsoleAppender.#ctor">
-            <summary>
-            Initializes a new instance of the <see cref="T:log4net.Appender.ColoredConsoleAppender"/> class.
-            </summary>
-            <remarks>
-            The instance of the <see cref="T:log4net.Appender.ColoredConsoleAppender"/> class is set up to write 
-            to the standard output stream.
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.ColoredConsoleAppender.#ctor(log4net.Layout.ILayout)">
-            <summary>
-            Initializes a new instance of the <see cref="T:log4net.Appender.ColoredConsoleAppender"/> class
-            with the specified layout.
-            </summary>
-            <param name="layout">the layout to use for this appender</param>
-            <remarks>
-            The instance of the <see cref="T:log4net.Appender.ColoredConsoleAppender"/> class is set up to write 
-            to the standard output stream.
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.ColoredConsoleAppender.#ctor(log4net.Layout.ILayout,System.Boolean)">
-            <summary>
-            Initializes a new instance of the <see cref="T:log4net.Appender.ColoredConsoleAppender"/> class
-            with the specified layout.
-            </summary>
-            <param name="layout">the layout to use for this appender</param>
-            <param name="writeToErrorStream">flag set to <c>true</c> to write to the console error stream</param>
-            <remarks>
-            When <paramref name="writeToErrorStream"/> is set to <c>true</c>, output is written to
-            the standard error output stream.  Otherwise, output is written to the standard
-            output stream.
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.ColoredConsoleAppender.AddMapping(log4net.Appender.ColoredConsoleAppender.LevelColors)">
-            <summary>
-            Add a mapping of level to color - done by the config file
-            </summary>
-            <param name="mapping">The mapping to add</param>
-            <remarks>
-            <para>
-            Add a <see cref="T:log4net.Appender.ColoredConsoleAppender.LevelColors"/> mapping to this appender.
-            Each mapping defines the foreground and background colors
-            for a level.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.ColoredConsoleAppender.Append(log4net.Core.LoggingEvent)">
-            <summary>
-            This method is called by the <see cref="M:log4net.Appender.AppenderSkeleton.DoAppend(log4net.Core.LoggingEvent)"/> method.
-            </summary>
-            <param name="loggingEvent">The event to log.</param>
-            <remarks>
-            <para>
-            Writes the event to the console.
-            </para>
-            <para>
-            The format of the output will depend on the appender's layout.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.ColoredConsoleAppender.ActivateOptions">
-            <summary>
-            Initialize the options for this appender
-            </summary>
-            <remarks>
-            <para>
-            Initialize the level to color mappings set on this appender.
-            </para>
-            </remarks>
-        </member>
-        <member name="F:log4net.Appender.ColoredConsoleAppender.m_writeToErrorStream">
-            <summary>
-            Flag to write output to the error stream rather than the standard output stream
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.ColoredConsoleAppender.m_levelMapping">
-            <summary>
-            Mapping from level object to color value
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.ColoredConsoleAppender.m_consoleOutputWriter">
-            <summary>
-            The console output stream writer to write to
-            </summary>
-            <remarks>
-            <para>
-            This writer is not thread safe.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Appender.ColoredConsoleAppender.Target">
-            <summary>
-            Target is the value of the console output stream.
-            This is either <c>"Console.Out"</c> or <c>"Console.Error"</c>.
-            </summary>
-            <value>
-            Target is the value of the console output stream.
-            This is either <c>"Console.Out"</c> or <c>"Console.Error"</c>.
-            </value>
-            <remarks>
-            <para>
-            Target is the value of the console output stream.
-            This is either <c>"Console.Out"</c> or <c>"Console.Error"</c>.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Appender.ColoredConsoleAppender.RequiresLayout">
-            <summary>
-            This appender requires a <see cref="N:log4net.Layout"/> to be set.
-            </summary>
-            <value><c>true</c></value>
-            <remarks>
-            <para>
-            This appender requires a <see cref="N:log4net.Layout"/> to be set.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Appender.ColoredConsoleAppender.Colors">
-            <summary>
-            The enum of possible color values for use with the color mapping method
-            </summary>
-            <remarks>
-            <para>
-            The following flags can be combined together to
-            form the colors.
-            </para>
-            </remarks>
-            <seealso cref="T:log4net.Appender.ColoredConsoleAppender"/>
-        </member>
-        <member name="F:log4net.Appender.ColoredConsoleAppender.Colors.Blue">
-            <summary>
-            color is blue
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.ColoredConsoleAppender.Colors.Green">
-            <summary>
-            color is green
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.ColoredConsoleAppender.Colors.Red">
-            <summary>
-            color is red
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.ColoredConsoleAppender.Colors.White">
-            <summary>
-            color is white
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.ColoredConsoleAppender.Colors.Yellow">
-            <summary>
-            color is yellow
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.ColoredConsoleAppender.Colors.Purple">
-            <summary>
-            color is purple
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.ColoredConsoleAppender.Colors.Cyan">
-            <summary>
-            color is cyan
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.ColoredConsoleAppender.Colors.HighIntensity">
-            <summary>
-            color is intensified
-            </summary>
-        </member>
-        <member name="T:log4net.Appender.ColoredConsoleAppender.LevelColors">
-            <summary>
-            A class to act as a mapping between the level that a logging call is made at and
-            the color it should be displayed as.
-            </summary>
-            <remarks>
-            <para>
-            Defines the mapping between a level and the color it should be displayed in.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.ColoredConsoleAppender.LevelColors.ActivateOptions">
-            <summary>
-            Initialize the options for the object
-            </summary>
-            <remarks>
-            <para>
-            Combine the <see cref="P:log4net.Appender.ColoredConsoleAppender.LevelColors.ForeColor"/> and <see cref="P:log4net.Appender.ColoredConsoleAppender.LevelColors.BackColor"/> together.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Appender.ColoredConsoleAppender.LevelColors.ForeColor">
-            <summary>
-            The mapped foreground color for the specified level
-            </summary>
-            <remarks>
-            <para>
-            Required property.
-            The mapped foreground color for the specified level.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Appender.ColoredConsoleAppender.LevelColors.BackColor">
-            <summary>
-            The mapped background color for the specified level
-            </summary>
-            <remarks>
-            <para>
-            Required property.
-            The mapped background color for the specified level.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Appender.ColoredConsoleAppender.LevelColors.CombinedColor">
-            <summary>
-            The combined <see cref="P:log4net.Appender.ColoredConsoleAppender.LevelColors.ForeColor"/> and <see cref="P:log4net.Appender.ColoredConsoleAppender.LevelColors.BackColor"/> suitable for 
-            setting the console color.
-            </summary>
-        </member>
-        <member name="T:log4net.Appender.ConsoleAppender">
-            <summary>
-            Appends logging events to the console.
-            </summary>
-            <remarks>
-            <para>
-            ConsoleAppender appends log events to the standard output stream
-            or the error output stream using a layout specified by the 
-            user.
-            </para>
-            <para>
-            By default, all output is written to the console's standard output stream.
-            The <see cref="P:log4net.Appender.ConsoleAppender.Target"/> property can be set to direct the output to the
-            error stream.
-            </para>
-            <para>
-            NOTE: This appender writes each message to the <c>System.Console.Out</c> or 
-            <c>System.Console.Error</c> that is set at the time the event is appended.
-            Therefore it is possible to programmatically redirect the output of this appender 
-            (for example NUnit does this to capture program output). While this is the desired
-            behavior of this appender it may have security implications in your application. 
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-        </member>
-        <member name="F:log4net.Appender.ConsoleAppender.ConsoleOut">
-            <summary>
-            The <see cref="P:log4net.Appender.ConsoleAppender.Target"/> to use when writing to the Console 
-            standard output stream.
-            </summary>
-            <remarks>
-            <para>
-            The <see cref="P:log4net.Appender.ConsoleAppender.Target"/> to use when writing to the Console 
-            standard output stream.
-            </para>
-            </remarks>
-        </member>
-        <member name="F:log4net.Appender.ConsoleAppender.ConsoleError">
-            <summary>
-            The <see cref="P:log4net.Appender.ConsoleAppender.Target"/> to use when writing to the Console 
-            standard error output stream.
-            </summary>
-            <remarks>
-            <para>
-            The <see cref="P:log4net.Appender.ConsoleAppender.Target"/> to use when writing to the Console 
-            standard error output stream.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.ConsoleAppender.#ctor">
-            <summary>
-            Initializes a new instance of the <see cref="T:log4net.Appender.ConsoleAppender"/> class.
-            </summary>
-            <remarks>
-            The instance of the <see cref="T:log4net.Appender.ConsoleAppender"/> class is set up to write 
-            to the standard output stream.
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.ConsoleAppender.#ctor(log4net.Layout.ILayout)">
-            <summary>
-            Initializes a new instance of the <see cref="T:log4net.Appender.ConsoleAppender"/> class
-            with the specified layout.
-            </summary>
-            <param name="layout">the layout to use for this appender</param>
-            <remarks>
-            The instance of the <see cref="T:log4net.Appender.ConsoleAppender"/> class is set up to write 
-            to the standard output stream.
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.ConsoleAppender.#ctor(log4net.Layout.ILayout,System.Boolean)">
-            <summary>
-            Initializes a new instance of the <see cref="T:log4net.Appender.ConsoleAppender"/> class
-            with the specified layout.
-            </summary>
-            <param name="layout">the layout to use for this appender</param>
-            <param name="writeToErrorStream">flag set to <c>true</c> to write to the console error stream</param>
-            <remarks>
-            When <paramref name="writeToErrorStream"/> is set to <c>true</c>, output is written to
-            the standard error output stream.  Otherwise, output is written to the standard
-            output stream.
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.ConsoleAppender.Append(log4net.Core.LoggingEvent)">
-            <summary>
-            This method is called by the <see cref="M:log4net.Appender.AppenderSkeleton.DoAppend(log4net.Core.LoggingEvent)"/> method.
-            </summary>
-            <param name="loggingEvent">The event to log.</param>
-            <remarks>
-            <para>
-            Writes the event to the console.
-            </para>
-            <para>
-            The format of the output will depend on the appender's layout.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Appender.ConsoleAppender.Target">
-            <summary>
-            Target is the value of the console output stream.
-            This is either <c>"Console.Out"</c> or <c>"Console.Error"</c>.
-            </summary>
-            <value>
-            Target is the value of the console output stream.
-            This is either <c>"Console.Out"</c> or <c>"Console.Error"</c>.
-            </value>
-            <remarks>
-            <para>
-            Target is the value of the console output stream.
-            This is either <c>"Console.Out"</c> or <c>"Console.Error"</c>.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Appender.ConsoleAppender.RequiresLayout">
-            <summary>
-            This appender requires a <see cref="N:log4net.Layout"/> to be set.
-            </summary>
-            <value><c>true</c></value>
-            <remarks>
-            <para>
-            This appender requires a <see cref="N:log4net.Layout"/> to be set.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Appender.DebugAppender">
-            <summary>
-            Appends log events to the <see cref="T:System.Diagnostics.Debug"/> system.
-            </summary>
-            <remarks>
-            <para>
-            The application configuration file can be used to control what listeners 
-            are actually used. See the MSDN documentation for the 
-            <see cref="T:System.Diagnostics.Debug"/> class for details on configuring the
-            debug system.
-            </para>
-            <para>
-            Events are written using the <see cref="M:System.Diagnostics.Debug.Write(System.String,System.String)"/>
-            method. The event's logger name is passed as the value for the category name to the Write method.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-        </member>
-        <member name="M:log4net.Appender.DebugAppender.#ctor">
-            <summary>
-            Initializes a new instance of the <see cref="T:log4net.Appender.DebugAppender"/>.
-            </summary>
-            <remarks>
-            <para>
-            Default constructor.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.DebugAppender.#ctor(log4net.Layout.ILayout)">
-            <summary>
-            Initializes a new instance of the <see cref="T:log4net.Appender.DebugAppender"/> 
-            with a specified layout.
-            </summary>
-            <param name="layout">The layout to use with this appender.</param>
-            <remarks>
-            <para>
-            Obsolete constructor.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.DebugAppender.Append(log4net.Core.LoggingEvent)">
-            <summary>
-            Writes the logging event to the <see cref="T:System.Diagnostics.Debug"/> system.
-            </summary>
-            <param name="loggingEvent">The event to log.</param>
-            <remarks>
-            <para>
-            Writes the logging event to the <see cref="T:System.Diagnostics.Debug"/> system.
-            If <see cref="P:log4net.Appender.DebugAppender.ImmediateFlush"/> is <c>true</c> then the <see cref="M:System.Diagnostics.Debug.Flush"/>
-            is called.
-            </para>
-            </remarks>
-        </member>
-        <member name="F:log4net.Appender.DebugAppender.m_immediateFlush">
-            <summary>
-            Immediate flush means that the underlying writer or output stream
-            will be flushed at the end of each append operation.
-            </summary>
-            <remarks>
-            <para>
-            Immediate flush is slower but ensures that each append request is 
-            actually written. If <see cref="P:log4net.Appender.DebugAppender.ImmediateFlush"/> is set to
-            <c>false</c>, then there is a good chance that the last few
-            logs events are not actually written to persistent media if and
-            when the application crashes.
-            </para>
-            <para>
-            The default value is <c>true</c>.</para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Appender.DebugAppender.ImmediateFlush">
-            <summary>
-            Gets or sets a value that indicates whether the appender will 
-            flush at the end of each write.
-            </summary>
-            <remarks>
-            <para>The default behavior is to flush at the end of each 
-            write. If the option is set to<c>false</c>, then the underlying 
-            stream can defer writing to physical medium to a later time. 
-            </para>
-            <para>
-            Avoiding the flush operation at the end of each append results 
-            in a performance gain of 10 to 20 percent. However, there is safety
-            trade-off involved in skipping flushing. Indeed, when flushing is
-            skipped, then it is likely that the last few log events will not
-            be recorded on disk when the application exits. This is a high
-            price to pay even for a 20% performance gain.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Appender.DebugAppender.RequiresLayout">
-            <summary>
-            This appender requires a <see cref="N:log4net.Layout"/> to be set.
-            </summary>
-            <value><c>true</c></value>
-            <remarks>
-            <para>
-            This appender requires a <see cref="N:log4net.Layout"/> to be set.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Appender.EventLogAppender">
-            <summary>
-            Writes events to the system event log.
-            </summary>
-            <remarks>
-            <para>
-            The <c>EventID</c> of the event log entry can be
-            set using the <c>EventLogEventID</c> property (<see cref="P:log4net.Core.LoggingEvent.Properties"/>)
-            on the <see cref="T:log4net.Core.LoggingEvent"/>.
-            </para>
-            <para>
-            There is a limit of 32K characters for an event log message
-            </para>
-            <para>
-            When configuring the EventLogAppender a mapping can be
-            specified to map a logging level to an event log entry type. For example:
-            </para>
-            <code lang="XML">
-            &lt;mapping&gt;
-            	&lt;level value="ERROR" /&gt;
-            	&lt;eventLogEntryType value="Error" /&gt;
-            &lt;/mapping&gt;
-            &lt;mapping&gt;
-            	&lt;level value="DEBUG" /&gt;
-            	&lt;eventLogEntryType value="Information" /&gt;
-            &lt;/mapping&gt;
-            </code>
-            <para>
-            The Level is the standard log4net logging level and eventLogEntryType can be any value
-            from the <see cref="T:System.Diagnostics.EventLogEntryType"/> enum, i.e.:
-            <list type="bullet">
-            <item><term>Error</term><description>an error event</description></item>
-            <item><term>Warning</term><description>a warning event</description></item>
-            <item><term>Information</term><description>an informational event</description></item>
-            </list>
-            </para>
-            </remarks>
-            <author>Aspi Havewala</author>
-            <author>Douglas de la Torre</author>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-            <author>Thomas Voss</author>
-        </member>
-        <member name="M:log4net.Appender.EventLogAppender.#ctor">
-            <summary>
-            Initializes a new instance of the <see cref="T:log4net.Appender.EventLogAppender"/> class.
-            </summary>
-            <remarks>
-            <para>
-            Default constructor.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.EventLogAppender.#ctor(log4net.Layout.ILayout)">
-            <summary>
-            Initializes a new instance of the <see cref="T:log4net.Appender.EventLogAppender"/> class
-            with the specified <see cref="T:log4net.Layout.ILayout"/>.
-            </summary>
-            <param name="layout">The <see cref="T:log4net.Layout.ILayout"/> to use with this appender.</param>
-            <remarks>
-            <para>
-            Obsolete constructor.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.EventLogAppender.AddMapping(log4net.Appender.EventLogAppender.Level2EventLogEntryType)">
-            <summary>
-            Add a mapping of level to <see cref="T:System.Diagnostics.EventLogEntryType"/> - done by the config file
-            </summary>
-            <param name="mapping">The mapping to add</param>
-            <remarks>
-            <para>
-            Add a <see cref="T:log4net.Appender.EventLogAppender.Level2EventLogEntryType"/> mapping to this appender.
-            Each mapping defines the event log entry type for a level.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.EventLogAppender.ActivateOptions">
-            <summary>
-            Initialize the appender based on the options set
-            </summary>
-            <remarks>
-            <para>
-            This is part of the <see cref="T:log4net.Core.IOptionHandler"/> delayed object
-            activation scheme. The <see cref="M:log4net.Appender.EventLogAppender.ActivateOptions"/> method must 
-            be called on this object after the configuration properties have
-            been set. Until <see cref="M:log4net.Appender.EventLogAppender.ActivateOptions"/> is called this
-            object is in an undefined state and must not be used. 
-            </para>
-            <para>
-            If any of the configuration properties are modified then 
-            <see cref="M:log4net.Appender.EventLogAppender.ActivateOptions"/> must be called again.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.EventLogAppender.CreateEventSource(System.String,System.String,System.String)">
-            <summary>
-            Create an event log source
-            </summary>
-            <remarks>
-            Uses different API calls under NET_2_0
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.EventLogAppender.Append(log4net.Core.LoggingEvent)">
-            <summary>
-            This method is called by the <see cref="M:log4net.Appender.AppenderSkeleton.DoAppend(log4net.Core.LoggingEvent)"/>
-            method. 
-            </summary>
-            <param name="loggingEvent">the event to log</param>
-            <remarks>
-            <para>Writes the event to the system event log using the 
-            <see cref="P:log4net.Appender.EventLogAppender.ApplicationName"/>.</para>
-            
-            <para>If the event has an <c>EventID</c> property (see <see cref="P:log4net.Core.LoggingEvent.Properties"/>)
-            set then this integer will be used as the event log event id.</para>
-            
-            <para>
-            There is a limit of 32K characters for an event log message
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.EventLogAppender.GetEntryType(log4net.Core.Level)">
-            <summary>
-            Get the equivalent <see cref="T:System.Diagnostics.EventLogEntryType"/> for a <see cref="T:log4net.Core.Level"/> <paramref name="p"/>
-            </summary>
-            <param name="level">the Level to convert to an EventLogEntryType</param>
-            <returns>The equivalent <see cref="T:System.Diagnostics.EventLogEntryType"/> for a <see cref="T:log4net.Core.Level"/> <paramref name="p"/></returns>
-            <remarks>
-            Because there are fewer applicable <see cref="T:System.Diagnostics.EventLogEntryType"/>
-            values to use in logging levels than there are in the 
-            <see cref="T:log4net.Core.Level"/> this is a one way mapping. There is
-            a loss of information during the conversion.
-            </remarks>
-        </member>
-        <member name="F:log4net.Appender.EventLogAppender.m_logName">
-            <summary>
-            The log name is the section in the event logs where the messages
-            are stored.
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.EventLogAppender.m_applicationName">
-            <summary>
-            Name of the application to use when logging.  This appears in the
-            application column of the event log named by <see cref="F:log4net.Appender.EventLogAppender.m_logName"/>.
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.EventLogAppender.m_machineName">
-            <summary>
-            The name of the machine which holds the event log. This is
-            currently only allowed to be '.' i.e. the current machine.
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.EventLogAppender.m_levelMapping">
-            <summary>
-            Mapping from level object to EventLogEntryType
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.EventLogAppender.m_securityContext">
-            <summary>
-            The security context to use for privileged calls
-            </summary>
-        </member>
-        <member name="P:log4net.Appender.EventLogAppender.LogName">
-            <summary>
-            The name of the log where messages will be stored.
-            </summary>
-            <value>
-            The string name of the log where messages will be stored.
-            </value>
-            <remarks>
-            <para>This is the name of the log as it appears in the Event Viewer
-            tree. The default value is to log into the <c>Application</c>
-            log, this is where most applications write their events. However
-            if you need a separate log for your application (or applications)
-            then you should set the <see cref="P:log4net.Appender.EventLogAppender.LogName"/> appropriately.</para>
-            <para>This should not be used to distinguish your event log messages
-            from those of other applications, the <see cref="P:log4net.Appender.EventLogAppender.ApplicationName"/>
-            property should be used to distinguish events. This property should be 
-            used to group together events into a single log.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Appender.EventLogAppender.ApplicationName">
-            <summary>
-            Property used to set the Application name.  This appears in the
-            event logs when logging.
-            </summary>
-            <value>
-            The string used to distinguish events from different sources.
-            </value>
-            <remarks>
-            Sets the event log source property.
-            </remarks>
-        </member>
-        <member name="P:log4net.Appender.EventLogAppender.MachineName">
-            <summary>
-            This property is used to return the name of the computer to use
-            when accessing the event logs.  Currently, this is the current
-            computer, denoted by a dot "."
-            </summary>
-            <value>
-            The string name of the machine holding the event log that 
-            will be logged into.
-            </value>
-            <remarks>
-            This property cannot be changed. It is currently set to '.'
-            i.e. the local machine. This may be changed in future.
-            </remarks>
-        </member>
-        <member name="P:log4net.Appender.EventLogAppender.SecurityContext">
-            <summary>
-            Gets or sets the <see cref="P:log4net.Appender.EventLogAppender.SecurityContext"/> used to write to the EventLog.
-            </summary>
-            <value>
-            The <see cref="P:log4net.Appender.EventLogAppender.SecurityContext"/> used to write to the EventLog.
-            </value>
-            <remarks>
-            <para>
-            The system security context used to write to the EventLog.
-            </para>
-            <para>
-            Unless a <see cref="P:log4net.Appender.EventLogAppender.SecurityContext"/> specified here for this appender
-            the <see cref="P:log4net.Core.SecurityContextProvider.DefaultProvider"/> is queried for the
-            security context to use. The default behavior is to use the security context
-            of the current thread.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Appender.EventLogAppender.RequiresLayout">
-            <summary>
-            This appender requires a <see cref="N:log4net.Layout"/> to be set.
-            </summary>
-            <value><c>true</c></value>
-            <remarks>
-            <para>
-            This appender requires a <see cref="N:log4net.Layout"/> to be set.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Appender.EventLogAppender.Level2EventLogEntryType">
-            <summary>
-            A class to act as a mapping between the level that a logging call is made at and
-            the color it should be displayed as.
-            </summary>
-            <remarks>
-            <para>
-            Defines the mapping between a level and its event log entry type.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Appender.EventLogAppender.Level2EventLogEntryType.EventLogEntryType">
-            <summary>
-            The <see cref="P:log4net.Appender.EventLogAppender.Level2EventLogEntryType.EventLogEntryType"/> for this entry
-            </summary>
-            <remarks>
-            <para>
-            Required property.
-            The <see cref="P:log4net.Appender.EventLogAppender.Level2EventLogEntryType.EventLogEntryType"/> for this entry
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Appender.FileAppender">
-            <summary>
-            Appends logging events to a file.
-            </summary>
-            <remarks>
-            <para>
-            Logging events are sent to the file specified by
-            the <see cref="P:log4net.Appender.FileAppender.File"/> property.
-            </para>
-            <para>
-            The file can be opened in either append or overwrite mode 
-            by specifying the <see cref="P:log4net.Appender.FileAppender.AppendToFile"/> property.
-            If the file path is relative it is taken as relative from 
-            the application base directory. The file encoding can be
-            specified by setting the <see cref="P:log4net.Appender.FileAppender.Encoding"/> property.
-            </para>
-            <para>
-            The layout's <see cref="P:log4net.Layout.ILayout.Header"/> and <see cref="P:log4net.Layout.ILayout.Footer"/>
-            values will be written each time the file is opened and closed
-            respectively. If the <see cref="P:log4net.Appender.FileAppender.AppendToFile"/> property is <see langword="true"/>
-            then the file may contain multiple copies of the header and footer.
-            </para>
-            <para>
-            This appender will first try to open the file for writing when <see cref="M:log4net.Appender.FileAppender.ActivateOptions"/>
-            is called. This will typically be during configuration.
-            If the file cannot be opened for writing the appender will attempt
-            to open the file again each time a message is logged to the appender.
-            If the file cannot be opened for writing when a message is logged then
-            the message will be discarded by this appender.
-            </para>
-            <para>
-            The <see cref="T:log4net.Appender.FileAppender"/> supports pluggable file locking models via
-            the <see cref="P:log4net.Appender.FileAppender.LockingModel"/> property.
-            The default behavior, implemented by <see cref="T:log4net.Appender.FileAppender.ExclusiveLock"/> 
-            is to obtain an exclusive write lock on the file until this appender is closed.
-            The alternative model, <see cref="T:log4net.Appender.FileAppender.MinimalLock"/>, only holds a
-            write lock while the appender is writing a logging event.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-            <author>Rodrigo B. de Oliveira</author>
-            <author>Douglas de la Torre</author>
-            <author>Niall Daley</author>
-        </member>
-        <member name="T:log4net.Appender.TextWriterAppender">
-            <summary>
-            Sends logging events to a <see cref="T:System.IO.TextWriter"/>.
-            </summary>
-            <remarks>
-            <para>
-            An Appender that writes to a <see cref="T:System.IO.TextWriter"/>.
-            </para>
-            <para>
-            This appender may be used stand alone if initialized with an appropriate
-            writer, however it is typically used as a base class for an appender that
-            can open a <see cref="T:System.IO.TextWriter"/> to write to.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-            <author>Douglas de la Torre</author>
-        </member>
-        <member name="M:log4net.Appender.TextWriterAppender.#ctor">
-            <summary>
-            Initializes a new instance of the <see cref="T:log4net.Appender.TextWriterAppender"/> class.
-            </summary>
-            <remarks>
-            <para>
-            Default constructor.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.TextWriterAppender.#ctor(log4net.Layout.ILayout,System.IO.Stream)">
-            <summary>
-            Initializes a new instance of the <see cref="T:log4net.Appender.TextWriterAppender"/> class and
-            sets the output destination to a new <see cref="T:System.IO.StreamWriter"/> initialized 
-            with the specified <see cref="T:System.IO.Stream"/>.
-            </summary>
-            <param name="layout">The layout to use with this appender.</param>
-            <param name="os">The <see cref="T:System.IO.Stream"/> to output to.</param>
-            <remarks>
-            <para>
-            Obsolete constructor.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.TextWriterAppender.#ctor(log4net.Layout.ILayout,System.IO.TextWriter)">
-            <summary>
-            Initializes a new instance of the <see cref="T:log4net.Appender.TextWriterAppender"/> class and sets
-            the output destination to the specified <see cref="T:System.IO.StreamWriter"/>.
-            </summary>
-            <param name="layout">The layout to use with this appender</param>
-            <param name="writer">The <see cref="T:System.IO.TextWriter"/> to output to</param>
-            <remarks>
-            The <see cref="T:System.IO.TextWriter"/> must have been previously opened.
-            </remarks>
-            <remarks>
-            <para>
-            Obsolete constructor.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.TextWriterAppender.PreAppendCheck">
-            <summary>
-            This method determines if there is a sense in attempting to append.
-            </summary>
-            <remarks>
-            <para>
-            This method checked if an output target has been set and if a
-            layout has been set. 
-            </para>
-            </remarks>
-            <returns><c>false</c> if any of the preconditions fail.</returns>
-        </member>
-        <member name="M:log4net.Appender.TextWriterAppender.Append(log4net.Core.LoggingEvent)">
-            <summary>
-            This method is called by the <see cref="M:log4net.Appender.AppenderSkeleton.DoAppend(log4net.Core.LoggingEvent)"/>
-            method. 
-            </summary>
-            <param name="loggingEvent">The event to log.</param>
-            <remarks>
-            <para>
-            Writes a log statement to the output stream if the output stream exists 
-            and is writable.  
-            </para>
-            <para>
-            The format of the output will depend on the appender's layout.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.TextWriterAppender.Append(log4net.Core.LoggingEvent[])">
-            <summary>
-            This method is called by the <see cref="M:log4net.Appender.AppenderSkeleton.DoAppend(log4net.Core.LoggingEvent[])"/>
-            method. 
-            </summary>
-            <param name="loggingEvents">The array of events to log.</param>
-            <remarks>
-            <para>
-            This method writes all the bulk logged events to the output writer
-            before flushing the stream.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.TextWriterAppender.OnClose">
-            <summary>
-            Close this appender instance. The underlying stream or writer is also closed.
-            </summary>
-            <remarks>
-            Closed appenders cannot be reused.
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.TextWriterAppender.WriteFooterAndCloseWriter">
-            <summary>
-            Writes the footer and closes the underlying <see cref="T:System.IO.TextWriter"/>.
-            </summary>
-            <remarks>
-            <para>
-            Writes the footer and closes the underlying <see cref="T:System.IO.TextWriter"/>.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.TextWriterAppender.CloseWriter">
-            <summary>
-            Closes the underlying <see cref="T:System.IO.TextWriter"/>.
-            </summary>
-            <remarks>
-            <para>
-            Closes the underlying <see cref="T:System.IO.TextWriter"/>.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.TextWriterAppender.Reset">
-            <summary>
-            Clears internal references to the underlying <see cref="T:System.IO.TextWriter"/> 
-            and other variables.
-            </summary>
-            <remarks>
-            <para>
-            Subclasses can override this method for an alternate closing behavior.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.TextWriterAppender.WriteFooter">
-            <summary>
-            Writes a footer as produced by the embedded layout's <see cref="P:log4net.Layout.ILayout.Footer"/> property.
-            </summary>
-            <remarks>
-            <para>
-            Writes a footer as produced by the embedded layout's <see cref="P:log4net.Layout.ILayout.Footer"/> property.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.TextWriterAppender.WriteHeader">
-            <summary>
-            Writes a header produced by the embedded layout's <see cref="P:log4net.Layout.ILayout.Header"/> property.
-            </summary>
-            <remarks>
-            <para>
-            Writes a header produced by the embedded layout's <see cref="P:log4net.Layout.ILayout.Header"/> property.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.TextWriterAppender.PrepareWriter">
-            <summary>
-            Called to allow a subclass to lazily initialize the writer
-            </summary>
-            <remarks>
-            <para>
-            This method is called when an event is logged and the <see cref="P:log4net.Appender.TextWriterAppender.Writer"/> or
-            <see cref="P:log4net.Appender.TextWriterAppender.QuietWriter"/> have not been set. This allows a subclass to
-            attempt to initialize the writer multiple times.
-            </para>
-            </remarks>
-        </member>
-        <member name="F:log4net.Appender.TextWriterAppender.m_qtw">
-            <summary>
-            This is the <see cref="T:log4net.Util.QuietTextWriter"/> where logging events
-            will be written to. 
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.TextWriterAppender.m_immediateFlush">
-            <summary>
-            Immediate flush means that the underlying <see cref="T:System.IO.TextWriter"/> 
-            or output stream will be flushed at the end of each append operation.
-            </summary>
-            <remarks>
-            <para>
-            Immediate flush is slower but ensures that each append request is 
-            actually written. If <see cref="P:log4net.Appender.TextWriterAppender.ImmediateFlush"/> is set to
-            <c>false</c>, then there is a good chance that the last few
-            logging events are not actually persisted if and when the application 
-            crashes.
-            </para>
-            <para>
-            The default value is <c>true</c>.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Appender.TextWriterAppender.ImmediateFlush">
-            <summary>
-            Gets or set whether the appender will flush at the end 
-            of each append operation.
-            </summary>
-            <value>
-            <para>
-            The default behavior is to flush at the end of each 
-            append operation.
-            </para>
-            <para>
-            If this option is set to <c>false</c>, then the underlying 
-            stream can defer persisting the logging event to a later 
-            time.
-            </para>
-            </value>
-            <remarks>
-            Avoiding the flush operation at the end of each append results in
-            a performance gain of 10 to 20 percent. However, there is safety
-            trade-off involved in skipping flushing. Indeed, when flushing is
-            skipped, then it is likely that the last few log events will not
-            be recorded on disk when the application exits. This is a high
-            price to pay even for a 20% performance gain.
-            </remarks>
-        </member>
-        <member name="P:log4net.Appender.TextWriterAppender.Writer">
-            <summary>
-            Sets the <see cref="T:System.IO.TextWriter"/> where the log output will go.
-            </summary>
-            <remarks>
-            <para>
-            The specified <see cref="T:System.IO.TextWriter"/> must be open and writable.
-            </para>
-            <para>
-            The <see cref="T:System.IO.TextWriter"/> will be closed when the appender 
-            instance is closed.
-            </para>
-            <para>
-            <b>Note:</b> Logging to an unopened <see cref="T:System.IO.TextWriter"/> will fail.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Appender.TextWriterAppender.ErrorHandler">
-            <summary>
-            Gets or set the <see cref="T:log4net.Core.IErrorHandler"/> and the underlying 
-            <see cref="T:log4net.Util.QuietTextWriter"/>, if any, for this appender. 
-            </summary>
-            <value>
-            The <see cref="T:log4net.Core.IErrorHandler"/> for this appender.
-            </value>
-        </member>
-        <member name="P:log4net.Appender.TextWriterAppender.RequiresLayout">
-            <summary>
-            This appender requires a <see cref="N:log4net.Layout"/> to be set.
-            </summary>
-            <value><c>true</c></value>
-            <remarks>
-            <para>
-            This appender requires a <see cref="N:log4net.Layout"/> to be set.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Appender.TextWriterAppender.QuietWriter">
-            <summary>
-            Gets or sets the <see cref="T:log4net.Util.QuietTextWriter"/> where logging events
-            will be written to. 
-            </summary>
-            <value>
-            The <see cref="T:log4net.Util.QuietTextWriter"/> where logging events are written.
-            </value>
-            <remarks>
-            <para>
-            This is the <see cref="T:log4net.Util.QuietTextWriter"/> where logging events
-            will be written to. 
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.FileAppender.#ctor">
-            <summary>
-            Default constructor
-            </summary>
-            <remarks>
-            <para>
-            Default constructor
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.FileAppender.#ctor(log4net.Layout.ILayout,System.String,System.Boolean)">
-            <summary>
-            Construct a new appender using the layout, file and append mode.
-            </summary>
-            <param name="layout">the layout to use with this appender</param>
-            <param name="filename">the full path to the file to write to</param>
-            <param name="append">flag to indicate if the file should be appended to</param>
-            <remarks>
-            <para>
-            Obsolete constructor.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.FileAppender.#ctor(log4net.Layout.ILayout,System.String)">
-            <summary>
-            Construct a new appender using the layout and file specified.
-            The file will be appended to.
-            </summary>
-            <param name="layout">the layout to use with this appender</param>
-            <param name="filename">the full path to the file to write to</param>
-            <remarks>
-            <para>
-            Obsolete constructor.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.FileAppender.ActivateOptions">
-            <summary>
-            Activate the options on the file appender. 
-            </summary>
-            <remarks>
-            <para>
-            This is part of the <see cref="T:log4net.Core.IOptionHandler"/> delayed object
-            activation scheme. The <see cref="M:log4net.Appender.FileAppender.ActivateOptions"/> method must 
-            be called on this object after the configuration properties have
-            been set. Until <see cref="M:log4net.Appender.FileAppender.ActivateOptions"/> is called this
-            object is in an undefined state and must not be used. 
-            </para>
-            <para>
-            If any of the configuration properties are modified then 
-            <see cref="M:log4net.Appender.FileAppender.ActivateOptions"/> must be called again.
-            </para>
-            <para>
-            This will cause the file to be opened.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.FileAppender.Reset">
-            <summary>
-            Closes any previously opened file and calls the parent's <see cref="M:log4net.Appender.TextWriterAppender.Reset"/>.
-            </summary>
-            <remarks>
-            <para>
-            Resets the filename and the file stream.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.FileAppender.PrepareWriter">
-            <summary>
-            Called to initialize the file writer
-            </summary>
-            <remarks>
-            <para>
-            Will be called for each logged message until the file is
-            successfully opened.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.FileAppender.Append(log4net.Core.LoggingEvent)">
-            <summary>
-            This method is called by the <see cref="M:log4net.Appender.AppenderSkeleton.DoAppend(log4net.Core.LoggingEvent)"/>
-            method. 
-            </summary>
-            <param name="loggingEvent">The event to log.</param>
-            <remarks>
-            <para>
-            Writes a log statement to the output stream if the output stream exists 
-            and is writable.  
-            </para>
-            <para>
-            The format of the output will depend on the appender's layout.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.FileAppender.Append(log4net.Core.LoggingEvent[])">
-            <summary>
-            This method is called by the <see cref="M:log4net.Appender.AppenderSkeleton.DoAppend(log4net.Core.LoggingEvent[])"/>
-            method. 
-            </summary>
-            <param name="loggingEvents">The array of events to log.</param>
-            <remarks>
-            <para>
-            Acquires the output file locks once before writing all the events to
-            the stream.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.FileAppender.WriteFooter">
-            <summary>
-            Writes a footer as produced by the embedded layout's <see cref="P:log4net.Layout.ILayout.Footer"/> property.
-            </summary>
-            <remarks>
-            <para>
-            Writes a footer as produced by the embedded layout's <see cref="P:log4net.Layout.ILayout.Footer"/> property.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.FileAppender.WriteHeader">
-            <summary>
-            Writes a header produced by the embedded layout's <see cref="P:log4net.Layout.ILayout.Header"/> property.
-            </summary>
-            <remarks>
-            <para>
-            Writes a header produced by the embedded layout's <see cref="P:log4net.Layout.ILayout.Header"/> property.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.FileAppender.CloseWriter">
-            <summary>
-            Closes the underlying <see cref="T:System.IO.TextWriter"/>.
-            </summary>
-            <remarks>
-            <para>
-            Closes the underlying <see cref="T:System.IO.TextWriter"/>.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.FileAppender.CloseFile">
-            <summary>
-            Closes the previously opened file.
-            </summary>
-            <remarks>
-            <para>
-            Writes the <see cref="P:log4net.Layout.ILayout.Footer"/> to the file and then
-            closes the file.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.FileAppender.SafeOpenFile(System.String,System.Boolean)">
-            <summary>
-            Sets and <i>opens</i> the file where the log output will go. The specified file must be writable.
-            </summary>
-            <param name="fileName">The path to the log file. Must be a fully qualified path.</param>
-            <param name="append">If true will append to fileName. Otherwise will truncate fileName</param>
-            <remarks>
-            <para>
-            Calls <see cref="M:log4net.Appender.FileAppender.OpenFile(System.String,System.Boolean)"/> but guarantees not to throw an exception.
-            Errors are passed to the <see cref="P:log4net.Appender.TextWriterAppender.ErrorHandler"/>.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.FileAppender.OpenFile(System.String,System.Boolean)">
-            <summary>
-            Sets and <i>opens</i> the file where the log output will go. The specified file must be writable.
-            </summary>
-            <param name="fileName">The path to the log file. Must be a fully qualified path.</param>
-            <param name="append">If true will append to fileName. Otherwise will truncate fileName</param>
-            <remarks>
-            <para>
-            If there was already an opened file, then the previous file
-            is closed first.
-            </para>
-            <para>
-            This method will ensure that the directory structure
-            for the <paramref name="fileName"/> specified exists.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.FileAppender.SetQWForFiles(System.IO.Stream)">
-            <summary>
-            Sets the quiet writer used for file output
-            </summary>
-            <param name="fileStream">the file stream that has been opened for writing</param>
-            <remarks>
-            <para>
-            This implementation of <see cref="M:log4net.Appender.FileAppender.SetQWForFiles(System.IO.Stream)"/> creates a <see cref="T:System.IO.StreamWriter"/>
-            over the <paramref name="fileStream"/> and passes it to the 
-            <see cref="M:log4net.Appender.FileAppender.SetQWForFiles(System.IO.TextWriter)"/> method.
-            </para>
-            <para>
-            This method can be overridden by sub classes that want to wrap the
-            <see cref="T:System.IO.Stream"/> in some way, for example to encrypt the output
-            data using a <c>System.Security.Cryptography.CryptoStream</c>.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.FileAppender.SetQWForFiles(System.IO.TextWriter)">
-            <summary>
-            Sets the quiet writer being used.
-            </summary>
-            <param name="writer">the writer over the file stream that has been opened for writing</param>
-            <remarks>
-            <para>
-            This method can be overridden by sub classes that want to
-            wrap the <see cref="T:System.IO.TextWriter"/> in some way.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.FileAppender.ConvertToFullPath(System.String)">
-            <summary>
-            Convert a path into a fully qualified path.
-            </summary>
-            <param name="path">The path to convert.</param>
-            <returns>The fully qualified path.</returns>
-            <remarks>
-            <para>
-            Converts the path specified to a fully
-            qualified path. If the path is relative it is
-            taken as relative from the application base 
-            directory.
-            </para>
-            </remarks>
-        </member>
-        <member name="F:log4net.Appender.FileAppender.m_appendToFile">
-            <summary>
-            Flag to indicate if we should append to the file
-            or overwrite the file. The default is to append.
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.FileAppender.m_fileName">
-            <summary>
-            The name of the log file.
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.FileAppender.m_encoding">
-            <summary>
-            The encoding to use for the file stream.
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.FileAppender.m_securityContext">
-            <summary>
-            The security context to use for privileged calls
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.FileAppender.m_stream">
-            <summary>
-            The stream to log to. Has added locking semantics
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.FileAppender.m_lockingModel">
-            <summary>
-            The locking model to use
-            </summary>
-        </member>
-        <member name="P:log4net.Appender.FileAppender.File">
-            <summary>
-            Gets or sets the path to the file that logging will be written to.
-            </summary>
-            <value>
-            The path to the file that logging will be written to.
-            </value>
-            <remarks>
-            <para>
-            If the path is relative it is taken as relative from 
-            the application base directory.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Appender.FileAppender.AppendToFile">
-            <summary>
-            Gets or sets a flag that indicates whether the file should be
-            appended to or overwritten.
-            </summary>
-            <value>
-            Indicates whether the file should be appended to or overwritten.
-            </value>
-            <remarks>
-            <para>
-            If the value is set to false then the file will be overwritten, if 
-            it is set to true then the file will be appended to.
-            </para>
-            The default value is true.
-            </remarks>
-        </member>
-        <member name="P:log4net.Appender.FileAppender.Encoding">
-            <summary>
-            Gets or sets <see cref="P:log4net.Appender.FileAppender.Encoding"/> used to write to the file.
-            </summary>
-            <value>
-            The <see cref="P:log4net.Appender.FileAppender.Encoding"/> used to write to the file.
-            </value>
-            <remarks>
-            <para>
-            The default encoding set is <see cref="P:System.Text.Encoding.Default"/>
-            which is the encoding for the system's current ANSI code page.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Appender.FileAppender.SecurityContext">
-            <summary>
-            Gets or sets the <see cref="P:log4net.Appender.FileAppender.SecurityContext"/> used to write to the file.
-            </summary>
-            <value>
-            The <see cref="P:log4net.Appender.FileAppender.SecurityContext"/> used to write to the file.
-            </value>
-            <remarks>
-            <para>
-            Unless a <see cref="P:log4net.Appender.FileAppender.SecurityContext"/> specified here for this appender
-            the <see cref="P:log4net.Core.SecurityContextProvider.DefaultProvider"/> is queried for the
-            security context to use. The default behavior is to use the security context
-            of the current thread.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Appender.FileAppender.LockingModel">
-            <summary>
-            Gets or sets the <see cref="P:log4net.Appender.FileAppender.LockingModel"/> used to handle locking of the file.
-            </summary>
-            <value>
-            The <see cref="P:log4net.Appender.FileAppender.LockingModel"/> used to lock the file.
-            </value>
-            <remarks>
-            <para>
-            Gets or sets the <see cref="P:log4net.Appender.FileAppender.LockingModel"/> used to handle locking of the file.
-            </para>
-            <para>
-            There are two built in locking models, <see cref="T:log4net.Appender.FileAppender.ExclusiveLock"/> and <see cref="T:log4net.Appender.FileAppender.MinimalLock"/>.
-            The former locks the file from the start of logging to the end and the 
-            later lock only for the minimal amount of time when logging each message.
-            </para>
-            <para>
-            The default locking model is the <see cref="T:log4net.Appender.FileAppender.ExclusiveLock"/>.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Appender.FileAppender.LockingStream">
-            <summary>
-            Write only <see cref="T:System.IO.Stream"/> that uses the <see cref="T:log4net.Appender.FileAppender.LockingModelBase"/> 
-            to manage access to an underlying resource.
-            </summary>
-        </member>
-        <member name="M:log4net.Appender.FileAppender.LockingStream.BeginWrite(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object)">
-            <summary>
-            True asynchronous writes are not supported, the implementation forces a synchronous write.
-            </summary>
-        </member>
-        <member name="T:log4net.Core.LogException">
-            <summary>
-            Exception base type for log4net.
-            </summary>
-            <remarks>
-            <para>
-            This type extends <see cref="T:System.ApplicationException"/>. It
-            does not add any new functionality but does differentiate the
-            type of exception being thrown.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-        </member>
-        <member name="M:log4net.Core.LogException.#ctor">
-            <summary>
-            Constructor
-            </summary>
-            <remarks>
-            <para>
-            Initializes a new instance of the <see cref="T:log4net.Core.LogException"/> class.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.LogException.#ctor(System.String)">
-            <summary>
-            Constructor
-            </summary>
-            <param name="message">A message to include with the exception.</param>
-            <remarks>
-            <para>
-            Initializes a new instance of the <see cref="T:log4net.Core.LogException"/> class with
-            the specified message.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.LogException.#ctor(System.String,System.Exception)">
-            <summary>
-            Constructor
-            </summary>
-            <param name="message">A message to include with the exception.</param>
-            <param name="innerException">A nested exception to include.</param>
-            <remarks>
-            <para>
-            Initializes a new instance of the <see cref="T:log4net.Core.LogException"/> class
-            with the specified message and inner exception.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.LogException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
-            <summary>
-            Serialization constructor
-            </summary>
-            <param name="info">The <see cref="T:System.Runtime.Serialization.SerializationInfo"/> that holds the serialized object data about the exception being thrown.</param>
-            <param name="context">The <see cref="T:System.Runtime.Serialization.StreamingContext"/> that contains contextual information about the source or destination.</param>
-            <remarks>
-            <para>
-            Initializes a new instance of the <see cref="T:log4net.Core.LogException"/> class 
-            with serialized data.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Appender.FileAppender.LockingModelBase">
-            <summary>
-            Locking model base class
-            </summary>
-            <remarks>
-            <para>
-            Base class for the locking models available to the <see cref="T:log4net.Appender.FileAppender"/> derived loggers.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.FileAppender.LockingModelBase.OpenFile(System.String,System.Boolean,System.Text.Encoding)">
-            <summary>
-            Open the output file
-            </summary>
-            <param name="filename">The filename to use</param>
-            <param name="append">Whether to append to the file, or overwrite</param>
-            <param name="encoding">The encoding to use</param>
-            <remarks>
-            <para>
-            Open the file specified and prepare for logging. 
-            No writes will be made until <see cref="M:log4net.Appender.FileAppender.LockingModelBase.AcquireLock"/> is called.
-            Must be called before any calls to <see cref="M:log4net.Appender.FileAppender.LockingModelBase.AcquireLock"/>,
-            <see cref="M:log4net.Appender.FileAppender.LockingModelBase.ReleaseLock"/> and <see cref="M:log4net.Appender.FileAppender.LockingModelBase.CloseFile"/>.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.FileAppender.LockingModelBase.CloseFile">
-            <summary>
-            Close the file
-            </summary>
-            <remarks>
-            <para>
-            Close the file. No further writes will be made.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.FileAppender.LockingModelBase.AcquireLock">
-            <summary>
-            Acquire the lock on the file
-            </summary>
-            <returns>A stream that is ready to be written to.</returns>
-            <remarks>
-            <para>
-            Acquire the lock on the file in preparation for writing to it. 
-            Return a stream pointing to the file. <see cref="M:log4net.Appender.FileAppender.LockingModelBase.ReleaseLock"/>
-            must be called to release the lock on the output file.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.FileAppender.LockingModelBase.ReleaseLock">
-            <summary>
-            Release the lock on the file
-            </summary>
-            <remarks>
-            <para>
-            Release the lock on the file. No further writes will be made to the 
-            stream until <see cref="M:log4net.Appender.FileAppender.LockingModelBase.AcquireLock"/> is called again.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Appender.FileAppender.LockingModelBase.CurrentAppender">
-            <summary>
-            Gets or sets the <see cref="T:log4net.Appender.FileAppender"/> for this LockingModel
-            </summary>
-            <value>
-            The <see cref="T:log4net.Appender.FileAppender"/> for this LockingModel
-            </value>
-            <remarks>
-            <para>
-            The file appender this locking model is attached to and working on
-            behalf of.
-            </para>
-            <para>
-            The file appender is used to locate the security context and the error handler to use.
-            </para>
-            <para>
-            The value of this property will be set before <see cref="M:log4net.Appender.FileAppender.LockingModelBase.OpenFile(System.String,System.Boolean,System.Text.Encoding)"/> is
-            called.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Appender.FileAppender.ExclusiveLock">
-            <summary>
-            Hold an exclusive lock on the output file
-            </summary>
-            <remarks>
-            <para>
-            Open the file once for writing and hold it open until <see cref="M:log4net.Appender.FileAppender.ExclusiveLock.CloseFile"/> is called. 
-            Maintains an exclusive lock on the file during this time.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.FileAppender.ExclusiveLock.OpenFile(System.String,System.Boolean,System.Text.Encoding)">
-            <summary>
-            Open the file specified and prepare for logging.
-            </summary>
-            <param name="filename">The filename to use</param>
-            <param name="append">Whether to append to the file, or overwrite</param>
-            <param name="encoding">The encoding to use</param>
-            <remarks>
-            <para>
-            Open the file specified and prepare for logging. 
-            No writes will be made until <see cref="M:log4net.Appender.FileAppender.ExclusiveLock.AcquireLock"/> is called.
-            Must be called before any calls to <see cref="M:log4net.Appender.FileAppender.ExclusiveLock.AcquireLock"/>,
-            <see cref="M:log4net.Appender.FileAppender.ExclusiveLock.ReleaseLock"/> and <see cref="M:log4net.Appender.FileAppender.ExclusiveLock.CloseFile"/>.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.FileAppender.ExclusiveLock.CloseFile">
-            <summary>
-            Close the file
-            </summary>
-            <remarks>
-            <para>
-            Close the file. No further writes will be made.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.FileAppender.ExclusiveLock.AcquireLock">
-            <summary>
-            Acquire the lock on the file
-            </summary>
-            <returns>A stream that is ready to be written to.</returns>
-            <remarks>
-            <para>
-            Does nothing. The lock is already taken
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.FileAppender.ExclusiveLock.ReleaseLock">
-            <summary>
-            Release the lock on the file
-            </summary>
-            <remarks>
-            <para>
-            Does nothing. The lock will be released when the file is closed.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Appender.FileAppender.MinimalLock">
-            <summary>
-            Acquires the file lock for each write
-            </summary>
-            <remarks>
-            <para>
-            Opens the file once for each <see cref="M:log4net.Appender.FileAppender.MinimalLock.AcquireLock"/>/<see cref="M:log4net.Appender.FileAppender.MinimalLock.ReleaseLock"/> cycle, 
-            thus holding the lock for the minimal amount of time. This method of locking
-            is considerably slower than <see cref="T:log4net.Appender.FileAppender.ExclusiveLock"/> but allows 
-            other processes to move/delete the log file whilst logging continues.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.FileAppender.MinimalLock.OpenFile(System.String,System.Boolean,System.Text.Encoding)">
-            <summary>
-            Prepares to open the file when the first message is logged.
-            </summary>
-            <param name="filename">The filename to use</param>
-            <param name="append">Whether to append to the file, or overwrite</param>
-            <param name="encoding">The encoding to use</param>
-            <remarks>
-            <para>
-            Open the file specified and prepare for logging. 
-            No writes will be made until <see cref="M:log4net.Appender.FileAppender.MinimalLock.AcquireLock"/> is called.
-            Must be called before any calls to <see cref="M:log4net.Appender.FileAppender.MinimalLock.AcquireLock"/>,
-            <see cref="M:log4net.Appender.FileAppender.MinimalLock.ReleaseLock"/> and <see cref="M:log4net.Appender.FileAppender.MinimalLock.CloseFile"/>.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.FileAppender.MinimalLock.CloseFile">
-            <summary>
-            Close the file
-            </summary>
-            <remarks>
-            <para>
-            Close the file. No further writes will be made.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.FileAppender.MinimalLock.AcquireLock">
-            <summary>
-            Acquire the lock on the file
-            </summary>
-            <returns>A stream that is ready to be written to.</returns>
-            <remarks>
-            <para>
-            Acquire the lock on the file in preparation for writing to it. 
-            Return a stream pointing to the file. <see cref="M:log4net.Appender.FileAppender.MinimalLock.ReleaseLock"/>
-            must be called to release the lock on the output file.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.FileAppender.MinimalLock.ReleaseLock">
-            <summary>
-            Release the lock on the file
-            </summary>
-            <remarks>
-            <para>
-            Release the lock on the file. No further writes will be made to the 
-            stream until <see cref="M:log4net.Appender.FileAppender.MinimalLock.AcquireLock"/> is called again.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Appender.ForwardingAppender">
-            <summary>
-            This appender forwards logging events to attached appenders.
-            </summary>
-            <remarks>
-            <para>
-            The forwarding appender can be used to specify different thresholds
-            and filters for the same appender at different locations within the hierarchy.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-        </member>
-        <member name="M:log4net.Appender.ForwardingAppender.#ctor">
-            <summary>
-            Initializes a new instance of the <see cref="T:log4net.Appender.ForwardingAppender"/> class.
-            </summary>
-            <remarks>
-            <para>
-            Default constructor.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.ForwardingAppender.OnClose">
-            <summary>
-            Closes the appender and releases resources.
-            </summary>
-            <remarks>
-            <para>
-            Releases any resources allocated within the appender such as file handles, 
-            network connections, etc.
-            </para>
-            <para>
-            It is a programming error to append to a closed appender.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.ForwardingAppender.Append(log4net.Core.LoggingEvent)">
-            <summary>
-            Forward the logging event to the attached appenders 
-            </summary>
-            <param name="loggingEvent">The event to log.</param>
-            <remarks>
-            <para>
-            Delivers the logging event to all the attached appenders.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.ForwardingAppender.Append(log4net.Core.LoggingEvent[])">
-            <summary>
-            Forward the logging events to the attached appenders 
-            </summary>
-            <param name="loggingEvents">The array of events to log.</param>
-            <remarks>
-            <para>
-            Delivers the logging events to all the attached appenders.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.ForwardingAppender.AddAppender(log4net.Appender.IAppender)">
-            <summary>
-            Adds an <see cref="T:log4net.Appender.IAppender"/> to the list of appenders of this
-            instance.
-            </summary>
-            <param name="newAppender">The <see cref="T:log4net.Appender.IAppender"/> to add to this appender.</param>
-            <remarks>
-            <para>
-            If the specified <see cref="T:log4net.Appender.IAppender"/> is already in the list of
-            appenders, then it won't be added again.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.ForwardingAppender.GetAppender(System.String)">
-            <summary>
-            Looks for the appender with the specified name.
-            </summary>
-            <param name="name">The name of the appender to lookup.</param>
-            <returns>
-            The appender with the specified name, or <c>null</c>.
-            </returns>
-            <remarks>
-            <para>
-            Get the named appender attached to this appender.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.ForwardingAppender.RemoveAllAppenders">
-            <summary>
-            Removes all previously added appenders from this appender.
-            </summary>
-            <remarks>
-            <para>
-            This is useful when re-reading configuration information.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.ForwardingAppender.RemoveAppender(log4net.Appender.IAppender)">
-            <summary>
-            Removes the specified appender from the list of appenders.
-            </summary>
-            <param name="appender">The appender to remove.</param>
-            <returns>The appender removed from the list</returns>
-            <remarks>
-            The appender removed is not closed.
-            If you are discarding the appender you must call
-            <see cref="M:log4net.Appender.IAppender.Close"/> on the appender removed.
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.ForwardingAppender.RemoveAppender(System.String)">
-            <summary>
-            Removes the appender with the specified name from the list of appenders.
-            </summary>
-            <param name="name">The name of the appender to remove.</param>
-            <returns>The appender removed from the list</returns>
-            <remarks>
-            The appender removed is not closed.
-            If you are discarding the appender you must call
-            <see cref="M:log4net.Appender.IAppender.Close"/> on the appender removed.
-            </remarks>
-        </member>
-        <member name="F:log4net.Appender.ForwardingAppender.m_appenderAttachedImpl">
-            <summary>
-            Implementation of the <see cref="T:log4net.Core.IAppenderAttachable"/> interface
-            </summary>
-        </member>
-        <member name="P:log4net.Appender.ForwardingAppender.Appenders">
-            <summary>
-            Gets the appenders contained in this appender as an 
-            <see cref="T:System.Collections.ICollection"/>.
-            </summary>
-            <remarks>
-            If no appenders can be found, then an <see cref="T:log4net.Util.EmptyCollection"/> 
-            is returned.
-            </remarks>
-            <returns>
-            A collection of the appenders in this appender.
-            </returns>
-        </member>
-        <member name="T:log4net.Appender.LocalSyslogAppender">
-            <summary>
-            Logs events to a local syslog service.
-            </summary>
-            <remarks>
-            <note>
-            This appender uses the POSIX libc library functions <c>openlog</c>, <c>syslog</c>, and <c>closelog</c>.
-            If these functions are not available on the local system then this appender will not work!
-            </note>
-            <para>
-            The functions <c>openlog</c>, <c>syslog</c>, and <c>closelog</c> are specified in SUSv2 and 
-            POSIX 1003.1-2001 standards. These are used to log messages to the local syslog service.
-            </para>
-            <para>
-            This appender talks to a local syslog service. If you need to log to a remote syslog
-            daemon and you cannot configure your local syslog service to do this you may be
-            able to use the <see cref="T:log4net.Appender.RemoteSyslogAppender"/> to log via UDP.
-            </para>
-            <para>
-            Syslog messages must have a facility and and a severity. The severity
-            is derived from the Level of the logging event.
-            The facility must be chosen from the set of defined syslog 
-            <see cref="T:log4net.Appender.LocalSyslogAppender.SyslogFacility"/> values. The facilities list is predefined
-            and cannot be extended.
-            </para>
-            <para>
-            An identifier is specified with each log message. This can be specified
-            by setting the <see cref="P:log4net.Appender.LocalSyslogAppender.Identity"/> property. The identity (also know 
-            as the tag) must not contain white space. The default value for the
-            identity is the application name (from <see cref="P:log4net.Util.SystemInfo.ApplicationFriendlyName"/>).
-            </para>
-            </remarks>
-            <author>Rob Lyon</author>
-            <author>Nicko Cadell</author>
-        </member>
-        <member name="M:log4net.Appender.LocalSyslogAppender.#ctor">
-            <summary>
-            Initializes a new instance of the <see cref="T:log4net.Appender.LocalSyslogAppender"/> class.
-            </summary>
-            <remarks>
-            This instance of the <see cref="T:log4net.Appender.LocalSyslogAppender"/> class is set up to write 
-            to a local syslog service.
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.LocalSyslogAppender.AddMapping(log4net.Appender.LocalSyslogAppender.LevelSeverity)">
-            <summary>
-            Add a mapping of level to severity
-            </summary>
-            <param name="mapping">The mapping to add</param>
-            <remarks>
-            <para>
-            Adds a <see cref="T:log4net.Appender.LocalSyslogAppender.LevelSeverity"/> to this appender.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.LocalSyslogAppender.ActivateOptions">
-            <summary>
-            Initialize the appender based on the options set.
-            </summary>
-            <remarks>
-            <para>
-            This is part of the <see cref="T:log4net.Core.IOptionHandler"/> delayed object
-            activation scheme. The <see cref="M:log4net.Appender.LocalSyslogAppender.ActivateOptions"/> method must 
-            be called on this object after the configuration properties have
-            been set. Until <see cref="M:log4net.Appender.LocalSyslogAppender.ActivateOptions"/> is called this
-            object is in an undefined state and must not be used. 
-            </para>
-            <para>
-            If any of the configuration properties are modified then 
-            <see cref="M:log4net.Appender.LocalSyslogAppender.ActivateOptions"/> must be called again.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.LocalSyslogAppender.Append(log4net.Core.LoggingEvent)">
-            <summary>
-            This method is called by the <see cref="M:log4net.Appender.AppenderSkeleton.DoAppend(log4net.Core.LoggingEvent)"/> method.
-            </summary>
-            <param name="loggingEvent">The event to log.</param>
-            <remarks>
-            <para>
-            Writes the event to a remote syslog daemon.
-            </para>
-            <para>
-            The format of the output will depend on the appender's layout.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.LocalSyslogAppender.OnClose">
-            <summary>
-            Close the syslog when the appender is closed
-            </summary>
-            <remarks>
-            <para>
-            Close the syslog when the appender is closed
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.LocalSyslogAppender.GetSeverity(log4net.Core.Level)">
-            <summary>
-            Translates a log4net level to a syslog severity.
-            </summary>
-            <param name="level">A log4net level.</param>
-            <returns>A syslog severity.</returns>
-            <remarks>
-            <para>
-            Translates a log4net level to a syslog severity.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.LocalSyslogAppender.GeneratePriority(log4net.Appender.LocalSyslogAppender.SyslogFacility,log4net.Appender.LocalSyslogAppender.SyslogSeverity)">
-            <summary>
-            Generate a syslog priority.
-            </summary>
-            <param name="facility">The syslog facility.</param>
-            <param name="severity">The syslog severity.</param>
-            <returns>A syslog priority.</returns>
-        </member>
-        <member name="F:log4net.Appender.LocalSyslogAppender.m_facility">
-            <summary>
-            The facility. The default facility is <see cref="F:log4net.Appender.LocalSyslogAppender.SyslogFacility.User"/>.
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.LocalSyslogAppender.m_identity">
-            <summary>
-            The message identity
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.LocalSyslogAppender.m_handleToIdentity">
-            <summary>
-            Marshaled handle to the identity string. We have to hold on to the
-            string as the <c>openlog</c> and <c>syslog</c> APIs just hold the
-            pointer to the ident and dereference it for each log message.
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.LocalSyslogAppender.m_levelMapping">
-            <summary>
-            Mapping from level object to syslog severity
-            </summary>
-        </member>
-        <member name="M:log4net.Appender.LocalSyslogAppender.openlog(System.IntPtr,System.Int32,log4net.Appender.LocalSyslogAppender.SyslogFacility)">
-            <summary>
-            Open connection to system logger.
-            </summary>
-        </member>
-        <member name="M:log4net.Appender.LocalSyslogAppender.syslog(System.Int32,System.String,System.String)">
-            <summary>
-            Generate a log message.
-            </summary>
-            <remarks>
-            <para>
-            The libc syslog method takes a format string and a variable argument list similar
-            to the classic printf function. As this type of vararg list is not supported
-            by C# we need to specify the arguments explicitly. Here we have specified the
-            format string with a single message argument. The caller must set the format 
-            string to <c>"%s"</c>.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.LocalSyslogAppender.closelog">
-            <summary>
-            Close descriptor used to write to system logger.
-            </summary>
-        </member>
-        <member name="P:log4net.Appender.LocalSyslogAppender.Identity">
-            <summary>
-            Message identity
-            </summary>
-            <remarks>
-            <para>
-            An identifier is specified with each log message. This can be specified
-            by setting the <see cref="P:log4net.Appender.LocalSyslogAppender.Identity"/> property. The identity (also know 
-            as the tag) must not contain white space. The default value for the
-            identity is the application name (from <see cref="P:log4net.Util.SystemInfo.ApplicationFriendlyName"/>).
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Appender.LocalSyslogAppender.Facility">
-            <summary>
-            Syslog facility
-            </summary>
-            <remarks>
-            Set to one of the <see cref="T:log4net.Appender.LocalSyslogAppender.SyslogFacility"/> values. The list of
-            facilities is predefined and cannot be extended. The default value
-            is <see cref="F:log4net.Appender.LocalSyslogAppender.SyslogFacility.User"/>.
-            </remarks>
-        </member>
-        <member name="P:log4net.Appender.LocalSyslogAppender.RequiresLayout">
-            <summary>
-            This appender requires a <see cref="P:log4net.Appender.AppenderSkeleton.Layout"/> to be set.
-            </summary>
-            <value><c>true</c></value>
-            <remarks>
-            <para>
-            This appender requires a <see cref="P:log4net.Appender.AppenderSkeleton.Layout"/> to be set.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Appender.LocalSyslogAppender.SyslogSeverity">
-            <summary>
-            syslog severities
-            </summary>
-            <remarks>
-            <para>
-            The log4net Level maps to a syslog severity using the
-            <see cref="M:log4net.Appender.LocalSyslogAppender.AddMapping(log4net.Appender.LocalSyslogAppender.LevelSeverity)"/> method and the <see cref="T:log4net.Appender.LocalSyslogAppender.LevelSeverity"/>
-            class. The severity is set on <see cref="P:log4net.Appender.LocalSyslogAppender.LevelSeverity.Severity"/>.
-            </para>
-            </remarks>
-        </member>
-        <member name="F:log4net.Appender.LocalSyslogAppender.SyslogSeverity.Emergency">
-            <summary>
-            system is unusable
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.LocalSyslogAppender.SyslogSeverity.Alert">
-            <summary>
-            action must be taken immediately
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.LocalSyslogAppender.SyslogSeverity.Critical">
-            <summary>
-            critical conditions
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.LocalSyslogAppender.SyslogSeverity.Error">
-            <summary>
-            error conditions
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.LocalSyslogAppender.SyslogSeverity.Warning">
-            <summary>
-            warning conditions
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.LocalSyslogAppender.SyslogSeverity.Notice">
-            <summary>
-            normal but significant condition
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.LocalSyslogAppender.SyslogSeverity.Informational">
-            <summary>
-            informational
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.LocalSyslogAppender.SyslogSeverity.Debug">
-            <summary>
-            debug-level messages
-            </summary>
-        </member>
-        <member name="T:log4net.Appender.LocalSyslogAppender.SyslogFacility">
-            <summary>
-            syslog facilities
-            </summary>
-            <remarks>
-            <para>
-            The syslog facility defines which subsystem the logging comes from.
-            This is set on the <see cref="P:log4net.Appender.LocalSyslogAppender.Facility"/> property.
-            </para>
-            </remarks>
-        </member>
-        <member name="F:log4net.Appender.LocalSyslogAppender.SyslogFacility.Kernel">
-            <summary>
-            kernel messages
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.LocalSyslogAppender.SyslogFacility.User">
-            <summary>
-            random user-level messages
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.LocalSyslogAppender.SyslogFacility.Mail">
-            <summary>
-            mail system
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.LocalSyslogAppender.SyslogFacility.Daemons">
-            <summary>
-            system daemons
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.LocalSyslogAppender.SyslogFacility.Authorization">
-            <summary>
-            security/authorization messages
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.LocalSyslogAppender.SyslogFacility.Syslog">
-            <summary>
-            messages generated internally by syslogd
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.LocalSyslogAppender.SyslogFacility.Printer">
-            <summary>
-            line printer subsystem
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.LocalSyslogAppender.SyslogFacility.News">
-            <summary>
-            network news subsystem
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.LocalSyslogAppender.SyslogFacility.Uucp">
-            <summary>
-            UUCP subsystem
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.LocalSyslogAppender.SyslogFacility.Clock">
-            <summary>
-            clock (cron/at) daemon
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.LocalSyslogAppender.SyslogFacility.Authorization2">
-            <summary>
-            security/authorization  messages (private)
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.LocalSyslogAppender.SyslogFacility.Ftp">
-            <summary>
-            ftp daemon
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.LocalSyslogAppender.SyslogFacility.Ntp">
-            <summary>
-            NTP subsystem
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.LocalSyslogAppender.SyslogFacility.Audit">
-            <summary>
-            log audit
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.LocalSyslogAppender.SyslogFacility.Alert">
-            <summary>
-            log alert
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.LocalSyslogAppender.SyslogFacility.Clock2">
-            <summary>
-            clock daemon
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.LocalSyslogAppender.SyslogFacility.Local0">
-            <summary>
-            reserved for local use
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.LocalSyslogAppender.SyslogFacility.Local1">
-            <summary>
-            reserved for local use
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.LocalSyslogAppender.SyslogFacility.Local2">
-            <summary>
-            reserved for local use
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.LocalSyslogAppender.SyslogFacility.Local3">
-            <summary>
-            reserved for local use
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.LocalSyslogAppender.SyslogFacility.Local4">
-            <summary>
-            reserved for local use
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.LocalSyslogAppender.SyslogFacility.Local5">
-            <summary>
-            reserved for local use
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.LocalSyslogAppender.SyslogFacility.Local6">
-            <summary>
-            reserved for local use
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.LocalSyslogAppender.SyslogFacility.Local7">
-            <summary>
-            reserved for local use
-            </summary>
-        </member>
-        <member name="T:log4net.Appender.LocalSyslogAppender.LevelSeverity">
-            <summary>
-            A class to act as a mapping between the level that a logging call is made at and
-            the syslog severity that is should be logged at.
-            </summary>
-            <remarks>
-            <para>
-            A class to act as a mapping between the level that a logging call is made at and
-            the syslog severity that is should be logged at.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Appender.LocalSyslogAppender.LevelSeverity.Severity">
-            <summary>
-            The mapped syslog severity for the specified level
-            </summary>
-            <remarks>
-            <para>
-            Required property.
-            The mapped syslog severity for the specified level
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Appender.MemoryAppender">
-            <summary>
-            Stores logging events in an array.
-            </summary>
-            <remarks>
-            <para>
-            The memory appender stores all the logging events
-            that are appended in an in-memory array.
-            </para>
-            <para>
-            Use the <see cref="M:log4net.Appender.MemoryAppender.GetEvents"/> method to get
-            the current list of events that have been appended.
-            </para>
-            <para>
-            Use the <see cref="M:log4net.Appender.MemoryAppender.Clear"/> method to clear the
-            current list of events.
-            </para>
-            </remarks>
-            <author>Julian Biddle</author>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-        </member>
-        <member name="M:log4net.Appender.MemoryAppender.#ctor">
-            <summary>
-            Initializes a new instance of the <see cref="T:log4net.Appender.MemoryAppender"/> class.
-            </summary>
-            <remarks>
-            <para>
-            Default constructor.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.MemoryAppender.GetEvents">
-            <summary>
-            Gets the events that have been logged.
-            </summary>
-            <returns>The events that have been logged</returns>
-            <remarks>
-            <para>
-            Gets the events that have been logged.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.MemoryAppender.Append(log4net.Core.LoggingEvent)">
-            <summary>
-            This method is called by the <see cref="M:log4net.Appender.AppenderSkeleton.DoAppend(log4net.Core.LoggingEvent)"/> method. 
-            </summary>
-            <param name="loggingEvent">the event to log</param>
-            <remarks>
-            <para>Stores the <paramref name="loggingEvent"/> in the events list.</para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.MemoryAppender.Clear">
-            <summary>
-            Clear the list of events
-            </summary>
-            <remarks>
-            Clear the list of events
-            </remarks>
-        </member>
-        <member name="F:log4net.Appender.MemoryAppender.m_eventsList">
-            <summary>
-            The list of events that have been appended.
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.MemoryAppender.m_fixFlags">
-            <summary>
-            Value indicating which fields in the event should be fixed
-            </summary>
-            <remarks>
-            By default all fields are fixed
-            </remarks>
-        </member>
-        <member name="P:log4net.Appender.MemoryAppender.OnlyFixPartialEventData">
-            <summary>
-            Gets or sets a value indicating whether only part of the logging event 
-            data should be fixed.
-            </summary>
-            <value>
-            <c>true</c> if the appender should only fix part of the logging event 
-            data, otherwise <c>false</c>. The default is <c>false</c>.
-            </value>
-            <remarks>
-            <para>
-            Setting this property to <c>true</c> will cause only part of the event 
-            data to be fixed and stored in the appender, hereby improving performance. 
-            </para>
-            <para>
-            See <see cref="M:log4net.Core.LoggingEvent.FixVolatileData(System.Boolean)"/> for more information.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Appender.MemoryAppender.Fix">
-            <summary>
-            Gets or sets the fields that will be fixed in the event
-            </summary>
-            <remarks>
-            <para>
-            The logging event needs to have certain thread specific values 
-            captured before it can be buffered. See <see cref="P:log4net.Core.LoggingEvent.Fix"/>
-            for details.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Appender.NetSendAppender">
-            <summary>
-            Logs entries by sending network messages using the 
-            <see cref="M:log4net.Appender.NetSendAppender.NetMessageBufferSend(System.String,System.String,System.String,System.String,System.Int32)"/> native function.
-            </summary>
-            <remarks>
-            <para>
-            You can send messages only to names that are active 
-            on the network. If you send the message to a user name, 
-            that user must be logged on and running the Messenger 
-            service to receive the message.
-            </para>
-            <para>
-            The receiver will get a top most window displaying the 
-            messages one at a time, therefore this appender should 
-            not be used to deliver a high volume of messages.
-            </para>
-            <para>
-            The following table lists some possible uses for this appender :
-            </para>
-            <para>
-            <list type="table">
-                <listheader>
-                    <term>Action</term>
-                    <description>Property Value(s)</description>
-                </listheader>
-                <item>
-                    <term>Send a message to a user account on the local machine</term>
-                    <description>
-                        <para>
-                        <paramref name="Server"/> = &lt;name of the local machine&gt;
-                        </para>
-                        <para>
-                        <paramref name="Recipient"/> = &lt;user name&gt;
-                        </para>
-                    </description>
-                </item>
-                <item>
-                    <term>Send a message to a user account on a remote machine</term>
-                    <description>
-                        <para>
-                        <paramref name="Server"/> = &lt;name of the remote machine&gt;
-                        </para>
-                        <para>
-                        <paramref name="Recipient"/> = &lt;user name&gt;
-                        </para>
-                    </description>
-                </item>
-                <item>
-                    <term>Send a message to a domain user account</term>
-                    <description>
-                        <para>
-                        <paramref name="Server"/> = &lt;name of a domain controller | uninitialized&gt;
-                        </para>
-                        <para>
-                        <paramref name="Recipient"/> = &lt;user name&gt;
-                        </para>
-                    </description>
-                </item>
-                <item>
-                    <term>Send a message to all the names in a workgroup or domain</term>
-                    <description>
-                        <para>
-                        <paramref name="Recipient"/> = &lt;workgroup name | domain name&gt;*
-                        </para>
-                    </description>
-                </item>
-                <item>
-                    <term>Send a message from the local machine to a remote machine</term>
-                    <description>
-                        <para>
-                        <paramref name="Server"/> = &lt;name of the local machine | uninitialized&gt;
-                        </para>
-                        <para>
-                        <paramref name="Recipient"/> = &lt;name of the remote machine&gt;
-                        </para>
-                    </description>
-                </item>
-            </list>
-            </para>
-            <para>
-            <b>Note :</b> security restrictions apply for sending 
-            network messages, see <see cref="M:log4net.Appender.NetSendAppender.NetMessageBufferSend(System.String,System.String,System.String,System.String,System.Int32)"/> 
-            for more information.
-            </para>
-            </remarks>
-            <example>
-            <para>
-            An example configuration section to log information 
-            using this appender from the local machine, named 
-            LOCAL_PC, to machine OPERATOR_PC :
-            </para>
-            <code lang="XML" escaped="true">
-            <appender name="NetSendAppender_Operator" type="log4net.Appender.NetSendAppender">
-                <server value="LOCAL_PC"/>
-                <recipient value="OPERATOR_PC"/>
-                <layout type="log4net.Layout.PatternLayout" value="%-5p %c [%x] - %m%n"/>
-            </appender>
-            </code>
-            </example>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-        </member>
-        <member name="F:log4net.Appender.NetSendAppender.m_server">
-            <summary>
-            The DNS or NetBIOS name of the server on which the function is to execute.
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.NetSendAppender.m_sender">
-            <summary>
-            The sender of the network message.
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.NetSendAppender.m_recipient">
-            <summary>
-            The message alias to which the message should be sent.
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.NetSendAppender.m_securityContext">
-            <summary>
-            The security context to use for privileged calls
-            </summary>
-        </member>
-        <member name="M:log4net.Appender.NetSendAppender.#ctor">
-            <summary>
-            Initializes the appender.
-            </summary>
-            <remarks>
-            The default constructor initializes all fields to their default values.
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.NetSendAppender.ActivateOptions">
-            <summary>
-            Initialize the appender based on the options set.
-            </summary>
-            <remarks>
-            <para>
-            This is part of the <see cref="T:log4net.Core.IOptionHandler"/> delayed object
-            activation scheme. The <see cref="M:log4net.Appender.NetSendAppender.ActivateOptions"/> method must 
-            be called on this object after the configuration properties have
-            been set. Until <see cref="M:log4net.Appender.NetSendAppender.ActivateOptions"/> is called this
-            object is in an undefined state and must not be used. 
-            </para>
-            <para>
-            If any of the configuration properties are modified then 
-            <see cref="M:log4net.Appender.NetSendAppender.ActivateOptions"/> must be called again.
-            </para>
-            <para>
-            The appender will be ignored if no <see cref="P:log4net.Appender.NetSendAppender.Recipient"/> was specified.
-            </para>
-            </remarks>
-            <exception cref="T:System.ArgumentNullException">The required property <see cref="P:log4net.Appender.NetSendAppender.Recipient"/> was not specified.</exception>
-        </member>
-        <member name="M:log4net.Appender.NetSendAppender.Append(log4net.Core.LoggingEvent)">
-            <summary>
-            This method is called by the <see cref="M:log4net.Appender.AppenderSkeleton.DoAppend(log4net.Core.LoggingEvent)"/> method.
-            </summary>
-            <param name="loggingEvent">The event to log.</param>
-            <remarks>
-            <para>
-            Sends the event using a network message.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.NetSendAppender.NetMessageBufferSend(System.String,System.String,System.String,System.String,System.Int32)">
-            <summary>
-            Sends a buffer of information to a registered message alias.
-            </summary>
-            <param name="serverName">The DNS or NetBIOS name of the server on which the function is to execute.</param>
-            <param name="msgName">The message alias to which the message buffer should be sent</param>
-            <param name="fromName">The originator of the message.</param>
-            <param name="buffer">The message text.</param>
-            <param name="bufferSize">The length, in bytes, of the message text.</param>
-            <remarks>
-            <para>
-            The following restrictions apply for sending network messages:
-            </para>
-            <para>
-            <list type="table">
-                <listheader>
-                    <term>Platform</term>
-                    <description>Requirements</description>
-                </listheader>
-                <item>
-                    <term>Windows NT</term>
-                    <description>
-                        <para>
-                        No special group membership is required to send a network message.
-                        </para>
-                        <para>
-                        Admin, Accounts, Print, or Server Operator group membership is required to 
-                        successfully send a network message on a remote server.
-                        </para>
-                    </description>
-                </item>
-                <item>
-                    <term>Windows 2000 or later</term>
-                    <description>
-                        <para>
-                        If you send a message on a domain controller that is running Active Directory, 
-                        access is allowed or denied based on the access control list (ACL) for the securable 
-                        object. The default ACL permits only Domain Admins and Account Operators to send a network message. 
-                        </para>
-                        <para>
-                        On a member server or workstation, only Administrators and Server Operators can send a network message. 
-                        </para>
-                    </description>
-                </item>
-            </list>
-            </para>
-            <para>
-            For more information see <a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/netmgmt/netmgmt/security_requirements_for_the_network_management_functions.asp">Security Requirements for the Network Management Functions</a>.
-            </para>
-            </remarks>
-            <returns>
-            <para>
-            If the function succeeds, the return value is zero.
-            </para>
-            </returns>
-        </member>
-        <member name="P:log4net.Appender.NetSendAppender.Sender">
-            <summary>
-            Gets or sets the sender of the message.
-            </summary>
-            <value>
-            The sender of the message.
-            </value>
-            <remarks>
-            If this property is not specified, the message is sent from the local computer.
-            </remarks>
-        </member>
-        <member name="P:log4net.Appender.NetSendAppender.Recipient">
-            <summary>
-            Gets or sets the message alias to which the message should be sent.
-            </summary>
-            <value>
-            The recipient of the message.
-            </value>
-            <remarks>
-            This property should always be specified in order to send a message.
-            </remarks>
-        </member>
-        <member name="P:log4net.Appender.NetSendAppender.Server">
-            <summary>
-            Gets or sets the DNS or NetBIOS name of the remote server on which the function is to execute.
-            </summary>
-            <value>
-            DNS or NetBIOS name of the remote server on which the function is to execute.
-            </value>
-            <remarks>
-            <para>
-            For Windows NT 4.0 and earlier, the string should begin with \\.
-            </para>
-            <para>
-            If this property is not specified, the local computer is used. 
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Appender.NetSendAppender.SecurityContext">
-            <summary>
-            Gets or sets the <see cref="P:log4net.Appender.NetSendAppender.SecurityContext"/> used to call the NetSend method.
-            </summary>
-            <value>
-            The <see cref="P:log4net.Appender.NetSendAppender.SecurityContext"/> used to call the NetSend method.
-            </value>
-            <remarks>
-            <para>
-            Unless a <see cref="P:log4net.Appender.NetSendAppender.SecurityContext"/> specified here for this appender
-            the <see cref="P:log4net.Core.SecurityContextProvider.DefaultProvider"/> is queried for the
-            security context to use. The default behavior is to use the security context
-            of the current thread.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Appender.NetSendAppender.RequiresLayout">
-            <summary>
-            This appender requires a <see cref="N:log4net.Layout"/> to be set.
-            </summary>
-            <value><c>true</c></value>
-            <remarks>
-            <para>
-            This appender requires a <see cref="N:log4net.Layout"/> to be set.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Appender.OutputDebugStringAppender">
-            <summary>
-            Appends log events to the OutputDebugString system.
-            </summary>
-            <remarks>
-            <para>
-            OutputDebugStringAppender appends log events to the
-            OutputDebugString system.
-            </para>
-            <para>
-            The string is passed to the native <c>OutputDebugString</c> 
-            function.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-        </member>
-        <member name="M:log4net.Appender.OutputDebugStringAppender.#ctor">
-            <summary>
-            Initializes a new instance of the <see cref="T:log4net.Appender.OutputDebugStringAppender"/> class.
-            </summary>
-            <remarks>
-            <para>
-            Default constructor.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.OutputDebugStringAppender.Append(log4net.Core.LoggingEvent)">
-            <summary>
-            Write the logging event to the output debug string API
-            </summary>
-            <param name="loggingEvent">the event to log</param>
-            <remarks>
-            <para>
-            Write the logging event to the output debug string API
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.OutputDebugStringAppender.OutputDebugString(System.String)">
-            <summary>
-            Stub for OutputDebugString native method
-            </summary>
-            <param name="message">the string to output</param>
-            <remarks>
-            <para>
-            Stub for OutputDebugString native method
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Appender.OutputDebugStringAppender.RequiresLayout">
-            <summary>
-            This appender requires a <see cref="N:log4net.Layout"/> to be set.
-            </summary>
-            <value><c>true</c></value>
-            <remarks>
-            <para>
-            This appender requires a <see cref="N:log4net.Layout"/> to be set.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Appender.RemoteSyslogAppender">
-            <summary>
-            Logs events to a remote syslog daemon.
-            </summary>
-            <remarks>
-            <para>
-            The BSD syslog protocol is used to remotely log to
-            a syslog daemon. The syslogd listens for for messages
-            on UDP port 514.
-            </para>
-            <para>
-            The syslog UDP protocol is not authenticated. Most syslog daemons
-            do not accept remote log messages because of the security implications.
-            You may be able to use the LocalSyslogAppender to talk to a local
-            syslog service.
-            </para>
-            <para>
-            There is an RFC 3164 that claims to document the BSD Syslog Protocol.
-            This RFC can be seen here: http://www.faqs.org/rfcs/rfc3164.html.
-            This appender generates what the RFC calls an "Original Device Message",
-            i.e. does not include the TIMESTAMP or HOSTNAME fields. By observation
-            this format of message will be accepted by all current syslog daemon
-            implementations. The daemon will attach the current time and the source
-            hostname or IP address to any messages received.
-            </para>
-            <para>
-            Syslog messages must have a facility and and a severity. The severity
-            is derived from the Level of the logging event.
-            The facility must be chosen from the set of defined syslog 
-            <see cref="T:log4net.Appender.RemoteSyslogAppender.SyslogFacility"/> values. The facilities list is predefined
-            and cannot be extended.
-            </para>
-            <para>
-            An identifier is specified with each log message. This can be specified
-            by setting the <see cref="P:log4net.Appender.RemoteSyslogAppender.Identity"/> property. The identity (also know 
-            as the tag) must not contain white space. The default value for the
-            identity is the application name (from <see cref="P:log4net.Core.LoggingEvent.Domain"/>).
-            </para>
-            </remarks>
-            <author>Rob Lyon</author>
-            <author>Nicko Cadell</author>
-        </member>
-        <member name="T:log4net.Appender.UdpAppender">
-            <summary>
-            Sends logging events as connectionless UDP datagrams to a remote host or a 
-            multicast group using an <see cref="T:System.Net.Sockets.UdpClient"/>.
-            </summary>
-            <remarks>
-            <para>
-            UDP guarantees neither that messages arrive, nor that they arrive in the correct order.
-            </para>
-            <para>
-            To view the logging results, a custom application can be developed that listens for logging 
-            events.
-            </para>
-            <para>
-            When decoding events send via this appender remember to use the same encoding
-            to decode the events as was used to send the events. See the <see cref="P:log4net.Appender.UdpAppender.Encoding"/>
-            property to specify the encoding to use.
-            </para>
-            </remarks>
-            <example>
-            This example shows how to log receive logging events that are sent 
-            on IP address 244.0.0.1 and port 8080 to the console. The event is 
-            encoded in the packet as a unicode string and it is decoded as such. 
-            <code lang="C#">
-            IPEndPoint remoteEndPoint = new IPEndPoint(IPAddress.Any, 0);
-            UdpClient udpClient;
-            byte[] buffer;
-            string loggingEvent;
-            
-            try 
-            {
-                udpClient = new UdpClient(8080);
-                
-                while(true) 
-                {
-                    buffer = udpClient.Receive(ref remoteEndPoint);
-                    loggingEvent = System.Text.Encoding.Unicode.GetString(buffer);
-                    Console.WriteLine(loggingEvent);
-                }
-            } 
-            catch(Exception e) 
-            {
-                Console.WriteLine(e.ToString());
-            }
-            </code>
-            <code lang="Visual Basic">
-            Dim remoteEndPoint as IPEndPoint
-            Dim udpClient as UdpClient
-            Dim buffer as Byte()
-            Dim loggingEvent as String
-            
-            Try 
-                remoteEndPoint = new IPEndPoint(IPAddress.Any, 0)
-                udpClient = new UdpClient(8080)
-            
-                While True
-                    buffer = udpClient.Receive(ByRef remoteEndPoint)
-                    loggingEvent = System.Text.Encoding.Unicode.GetString(buffer)
-                    Console.WriteLine(loggingEvent)
-                Wend
-            Catch e As Exception
-                Console.WriteLine(e.ToString())
-            End Try
-            </code>
-            <para>
-            An example configuration section to log information using this appender to the 
-            IP 224.0.0.1 on port 8080:
-            </para>
-            <code lang="XML" escaped="true">
-            <appender name="UdpAppender" type="log4net.Appender.UdpAppender">
-                <remoteAddress value="224.0.0.1"/>
-                <remotePort value="8080"/>
-                <layout type="log4net.Layout.PatternLayout" value="%-5level %logger [%ndc] - %message%newline"/>
-            </appender>
-            </code>
-            </example>
-            <author>Gert Driesen</author>
-            <author>Nicko Cadell</author>
-        </member>
-        <member name="M:log4net.Appender.UdpAppender.#ctor">
-            <summary>
-            Initializes a new instance of the <see cref="T:log4net.Appender.UdpAppender"/> class.
-            </summary>
-            <remarks>
-            The default constructor initializes all fields to their default values.
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.UdpAppender.ActivateOptions">
-            <summary>
-            Initialize the appender based on the options set.
-            </summary>
-            <remarks>
-            <para>
-            This is part of the <see cref="T:log4net.Core.IOptionHandler"/> delayed object
-            activation scheme. The <see cref="M:log4net.Appender.UdpAppender.ActivateOptions"/> method must 
-            be called on this object after the configuration properties have
-            been set. Until <see cref="M:log4net.Appender.UdpAppender.ActivateOptions"/> is called this
-            object is in an undefined state and must not be used. 
-            </para>
-            <para>
-            If any of the configuration properties are modified then 
-            <see cref="M:log4net.Appender.UdpAppender.ActivateOptions"/> must be called again.
-            </para>
-            <para>
-            The appender will be ignored if no <see cref="P:log4net.Appender.UdpAppender.RemoteAddress"/> was specified or 
-            an invalid remote or local TCP port number was specified.
-            </para>
-            </remarks>
-            <exception cref="T:System.ArgumentNullException">The required property <see cref="P:log4net.Appender.UdpAppender.RemoteAddress"/> was not specified.</exception>
-            <exception cref="T:System.ArgumentOutOfRangeException">The TCP port number assigned to <see cref="P:log4net.Appender.UdpAppender.LocalPort"/> or <see cref="P:log4net.Appender.UdpAppender.RemotePort"/> is less than <see cref="F:System.Net.IPEndPoint.MinPort"/> or greater than <see cref="F:System.Net.IPEndPoint.MaxPort"/>.</exception>
-        </member>
-        <member name="M:log4net.Appender.UdpAppender.Append(log4net.Core.LoggingEvent)">
-            <summary>
-            This method is called by the <see cref="M:log4net.Appender.AppenderSkeleton.DoAppend(log4net.Core.LoggingEvent)"/> method.
-            </summary>
-            <param name="loggingEvent">The event to log.</param>
-            <remarks>
-            <para>
-            Sends the event using an UDP datagram.
-            </para>
-            <para>
-            Exceptions are passed to the <see cref="P:log4net.Appender.AppenderSkeleton.ErrorHandler"/>.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.UdpAppender.OnClose">
-            <summary>
-            Closes the UDP connection and releases all resources associated with 
-            this <see cref="T:log4net.Appender.UdpAppender"/> instance.
-            </summary>
-            <remarks>
-            <para>
-            Disables the underlying <see cref="T:System.Net.Sockets.UdpClient"/> and releases all managed 
-            and unmanaged resources associated with the <see cref="T:log4net.Appender.UdpAppender"/>.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.UdpAppender.InitializeClientConnection">
-            <summary>
-            Initializes the underlying  <see cref="T:System.Net.Sockets.UdpClient"/> connection.
-            </summary>
-            <remarks>
-            <para>
-            The underlying <see cref="T:System.Net.Sockets.UdpClient"/> is initialized and binds to the 
-            port number from which you intend to communicate.
-            </para>
-            <para>
-            Exceptions are passed to the <see cref="P:log4net.Appender.AppenderSkeleton.ErrorHandler"/>.
-            </para>
-            </remarks>
-        </member>
-        <member name="F:log4net.Appender.UdpAppender.m_remoteAddress">
-            <summary>
-            The IP address of the remote host or multicast group to which 
-            the logging event will be sent.
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.UdpAppender.m_remotePort">
-            <summary>
-            The TCP port number of the remote host or multicast group to 
-            which the logging event will be sent.
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.UdpAppender.m_remoteEndPoint">
-            <summary>
-            The cached remote endpoint to which the logging events will be sent.
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.UdpAppender.m_localPort">
-            <summary>
-            The TCP port number from which the <see cref="T:System.Net.Sockets.UdpClient"/> will communicate.
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.UdpAppender.m_client">
-            <summary>
-            The <see cref="T:System.Net.Sockets.UdpClient"/> instance that will be used for sending the 
-            logging events.
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.UdpAppender.m_encoding">
-            <summary>
-            The encoding to use for the packet.
-            </summary>
-        </member>
-        <member name="P:log4net.Appender.UdpAppender.RemoteAddress">
-            <summary>
-            Gets or sets the IP address of the remote host or multicast group to which
-            the underlying <see cref="T:System.Net.Sockets.UdpClient"/> should sent the logging event.
-            </summary>
-            <value>
-            The IP address of the remote host or multicast group to which the logging event 
-            will be sent.
-            </value>
-            <remarks>
-            <para>
-            Multicast addresses are identified by IP class <b>D</b> addresses (in the range 224.0.0.0 to
-            239.255.255.255).  Multicast packets can pass across different networks through routers, so
-            it is possible to use multicasts in an Internet scenario as long as your network provider 
-            supports multicasting.
-            </para>
-            <para>
-            Hosts that want to receive particular multicast messages must register their interest by joining
-            the multicast group.  Multicast messages are not sent to networks where no host has joined
-            the multicast group.  Class <b>D</b> IP addresses are used for multicast groups, to differentiate
-            them from normal host addresses, allowing nodes to easily detect if a message is of interest.
-            </para>
-            <para>
-            Static multicast addresses that are needed globally are assigned by IANA.  A few examples are listed in the table below:
-            </para>
-            <para>
-            <list type="table">
-                <listheader>
-                    <term>IP Address</term>
-                    <description>Description</description>
-                </listheader>
-                <item>
-                    <term>224.0.0.1</term>
-                    <description>
-                        <para>
-                        Sends a message to all system on the subnet.
-                        </para>
-                    </description>
-                </item>
-                <item>
-                    <term>224.0.0.2</term>
-                    <description>
-                        <para>
-                        Sends a message to all routers on the subnet.
-                        </para>
-                    </description>
-                </item>
-                <item>
-                    <term>224.0.0.12</term>
-                    <description>
-                        <para>
-                        The DHCP server answers messages on the IP address 224.0.0.12, but only on a subnet.
-                        </para>
-                    </description>
-                </item>
-            </list>
-            </para>
-            <para>
-            A complete list of actually reserved multicast addresses and their owners in the ranges
-            defined by RFC 3171 can be found at the <A href="http://www.iana.org/assignments/multicast-addresses">IANA web site</A>. 
-            </para>
-            <para>
-            The address range 239.0.0.0 to 239.255.255.255 is reserved for administrative scope-relative 
-            addresses.  These addresses can be reused with other local groups.  Routers are typically 
-            configured with filters to prevent multicast traffic in this range from flowing outside
-            of the local network.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Appender.UdpAppender.RemotePort">
-            <summary>
-            Gets or sets the TCP port number of the remote host or multicast group to which 
-            the underlying <see cref="T:System.Net.Sockets.UdpClient"/> should sent the logging event.
-            </summary>
-            <value>
-            An integer value in the range <see cref="F:System.Net.IPEndPoint.MinPort"/> to <see cref="F:System.Net.IPEndPoint.MaxPort"/> 
-            indicating the TCP port number of the remote host or multicast group to which the logging event 
-            will be sent.
-            </value>
-            <remarks>
-            The underlying <see cref="T:System.Net.Sockets.UdpClient"/> will send messages to this TCP port number
-            on the remote host or multicast group.
-            </remarks>
-            <exception cref="T:System.ArgumentOutOfRangeException">The value specified is less than <see cref="F:System.Net.IPEndPoint.MinPort"/> or greater than <see cref="F:System.Net.IPEndPoint.MaxPort"/>.</exception>
-        </member>
-        <member name="P:log4net.Appender.UdpAppender.LocalPort">
-            <summary>
-            Gets or sets the TCP port number from which the underlying <see cref="T:System.Net.Sockets.UdpClient"/> will communicate.
-            </summary>
-            <value>
-            An integer value in the range <see cref="F:System.Net.IPEndPoint.MinPort"/> to <see cref="F:System.Net.IPEndPoint.MaxPort"/> 
-            indicating the TCP port number from which the underlying <see cref="T:System.Net.Sockets.UdpClient"/> will communicate.
-            </value>
-            <remarks>
-            <para>
-            The underlying <see cref="T:System.Net.Sockets.UdpClient"/> will bind to this port for sending messages.
-            </para>
-            <para>
-            Setting the value to 0 (the default) will cause the udp client not to bind to
-            a local port.
-            </para>
-            </remarks>
-            <exception cref="T:System.ArgumentOutOfRangeException">The value specified is less than <see cref="F:System.Net.IPEndPoint.MinPort"/> or greater than <see cref="F:System.Net.IPEndPoint.MaxPort"/>.</exception>
-        </member>
-        <member name="P:log4net.Appender.UdpAppender.Encoding">
-            <summary>
-            Gets or sets <see cref="P:log4net.Appender.UdpAppender.Encoding"/> used to write the packets.
-            </summary>
-            <value>
-            The <see cref="P:log4net.Appender.UdpAppender.Encoding"/> used to write the packets.
-            </value>
-            <remarks>
-            <para>
-            The <see cref="P:log4net.Appender.UdpAppender.Encoding"/> used to write the packets.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Appender.UdpAppender.Client">
-            <summary>
-            Gets or sets the underlying <see cref="T:System.Net.Sockets.UdpClient"/>.
-            </summary>
-            <value>
-            The underlying <see cref="T:System.Net.Sockets.UdpClient"/>.
-            </value>
-            <remarks>
-            <see cref="T:log4net.Appender.UdpAppender"/> creates a <see cref="T:System.Net.Sockets.UdpClient"/> to send logging events 
-            over a network.  Classes deriving from <see cref="T:log4net.Appender.UdpAppender"/> can use this
-            property to get or set this <see cref="T:System.Net.Sockets.UdpClient"/>.  Use the underlying <see cref="T:System.Net.Sockets.UdpClient"/>
-            returned from <see cref="P:log4net.Appender.UdpAppender.Client"/> if you require access beyond that which 
-            <see cref="T:log4net.Appender.UdpAppender"/> provides.
-            </remarks>
-        </member>
-        <member name="P:log4net.Appender.UdpAppender.RemoteEndPoint">
-            <summary>
-            Gets or sets the cached remote endpoint to which the logging events should be sent.
-            </summary>
-            <value>
-            The cached remote endpoint to which the logging events will be sent.
-            </value>
-            <remarks>
-            The <see cref="M:log4net.Appender.UdpAppender.ActivateOptions"/> method will initialize the remote endpoint 
-            with the values of the <see cref="P:log4net.Appender.UdpAppender.RemoteAddress"/> and <see cref="P:log4net.Appender.UdpAppender.RemotePort"/>
-            properties.
-            </remarks>
-        </member>
-        <member name="P:log4net.Appender.UdpAppender.RequiresLayout">
-            <summary>
-            This appender requires a <see cref="N:log4net.Layout"/> to be set.
-            </summary>
-            <value><c>true</c></value>
-            <remarks>
-            <para>
-            This appender requires a <see cref="N:log4net.Layout"/> to be set.
-            </para>
-            </remarks>
-        </member>
-        <member name="F:log4net.Appender.RemoteSyslogAppender.DefaultSyslogPort">
-            <summary>
-            Syslog port 514
-            </summary>
-        </member>
-        <member name="M:log4net.Appender.RemoteSyslogAppender.#ctor">
-            <summary>
-            Initializes a new instance of the <see cref="T:log4net.Appender.RemoteSyslogAppender"/> class.
-            </summary>
-            <remarks>
-            This instance of the <see cref="T:log4net.Appender.RemoteSyslogAppender"/> class is set up to write 
-            to a remote syslog daemon.
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.RemoteSyslogAppender.AddMapping(log4net.Appender.RemoteSyslogAppender.LevelSeverity)">
-            <summary>
-            Add a mapping of level to severity
-            </summary>
-            <param name="mapping">The mapping to add</param>
-            <remarks>
-            <para>
-            Add a <see cref="T:log4net.Appender.RemoteSyslogAppender.LevelSeverity"/> mapping to this appender.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.RemoteSyslogAppender.Append(log4net.Core.LoggingEvent)">
-            <summary>
-            This method is called by the <see cref="M:log4net.Appender.AppenderSkeleton.DoAppend(log4net.Core.LoggingEvent)"/> method.
-            </summary>
-            <param name="loggingEvent">The event to log.</param>
-            <remarks>
-            <para>
-            Writes the event to a remote syslog daemon.
-            </para>
-            <para>
-            The format of the output will depend on the appender's layout.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.RemoteSyslogAppender.ActivateOptions">
-            <summary>
-            Initialize the options for this appender
-            </summary>
-            <remarks>
-            <para>
-            Initialize the level to syslog severity mappings set on this appender.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.RemoteSyslogAppender.GetSeverity(log4net.Core.Level)">
-            <summary>
-            Translates a log4net level to a syslog severity.
-            </summary>
-            <param name="level">A log4net level.</param>
-            <returns>A syslog severity.</returns>
-            <remarks>
-            <para>
-            Translates a log4net level to a syslog severity.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.RemoteSyslogAppender.GeneratePriority(log4net.Appender.RemoteSyslogAppender.SyslogFacility,log4net.Appender.RemoteSyslogAppender.SyslogSeverity)">
-            <summary>
-            Generate a syslog priority.
-            </summary>
-            <param name="facility">The syslog facility.</param>
-            <param name="severity">The syslog severity.</param>
-            <returns>A syslog priority.</returns>
-            <remarks>
-            <para>
-            Generate a syslog priority.
-            </para>
-            </remarks>
-        </member>
-        <member name="F:log4net.Appender.RemoteSyslogAppender.m_facility">
-            <summary>
-            The facility. The default facility is <see cref="F:log4net.Appender.RemoteSyslogAppender.SyslogFacility.User"/>.
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.RemoteSyslogAppender.m_identity">
-            <summary>
-            The message identity
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.RemoteSyslogAppender.m_levelMapping">
-            <summary>
-            Mapping from level object to syslog severity
-            </summary>
-        </member>
-        <member name="P:log4net.Appender.RemoteSyslogAppender.Identity">
-            <summary>
-            Message identity
-            </summary>
-            <remarks>
-            <para>
-            An identifier is specified with each log message. This can be specified
-            by setting the <see cref="P:log4net.Appender.RemoteSyslogAppender.Identity"/> property. The identity (also know 
-            as the tag) must not contain white space. The default value for the
-            identity is the application name (from <see cref="P:log4net.Core.LoggingEvent.Domain"/>).
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Appender.RemoteSyslogAppender.Facility">
-            <summary>
-            Syslog facility
-            </summary>
-            <remarks>
-            Set to one of the <see cref="T:log4net.Appender.RemoteSyslogAppender.SyslogFacility"/> values. The list of
-            facilities is predefined and cannot be extended. The default value
-            is <see cref="F:log4net.Appender.RemoteSyslogAppender.SyslogFacility.User"/>.
-            </remarks>
-        </member>
-        <member name="T:log4net.Appender.RemoteSyslogAppender.SyslogSeverity">
-            <summary>
-            syslog severities
-            </summary>
-            <remarks>
-            <para>
-            The syslog severities.
-            </para>
-            </remarks>
-        </member>
-        <member name="F:log4net.Appender.RemoteSyslogAppender.SyslogSeverity.Emergency">
-            <summary>
-            system is unusable
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.RemoteSyslogAppender.SyslogSeverity.Alert">
-            <summary>
-            action must be taken immediately
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.RemoteSyslogAppender.SyslogSeverity.Critical">
-            <summary>
-            critical conditions
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.RemoteSyslogAppender.SyslogSeverity.Error">
-            <summary>
-            error conditions
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.RemoteSyslogAppender.SyslogSeverity.Warning">
-            <summary>
-            warning conditions
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.RemoteSyslogAppender.SyslogSeverity.Notice">
-            <summary>
-            normal but significant condition
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.RemoteSyslogAppender.SyslogSeverity.Informational">
-            <summary>
-            informational
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.RemoteSyslogAppender.SyslogSeverity.Debug">
-            <summary>
-            debug-level messages
-            </summary>
-        </member>
-        <member name="T:log4net.Appender.RemoteSyslogAppender.SyslogFacility">
-            <summary>
-            syslog facilities
-            </summary>
-            <remarks>
-            <para>
-            The syslog facilities
-            </para>
-            </remarks>
-        </member>
-        <member name="F:log4net.Appender.RemoteSyslogAppender.SyslogFacility.Kernel">
-            <summary>
-            kernel messages
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.RemoteSyslogAppender.SyslogFacility.User">
-            <summary>
-            random user-level messages
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.RemoteSyslogAppender.SyslogFacility.Mail">
-            <summary>
-            mail system
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.RemoteSyslogAppender.SyslogFacility.Daemons">
-            <summary>
-            system daemons
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.RemoteSyslogAppender.SyslogFacility.Authorization">
-            <summary>
-            security/authorization messages
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.RemoteSyslogAppender.SyslogFacility.Syslog">
-            <summary>
-            messages generated internally by syslogd
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.RemoteSyslogAppender.SyslogFacility.Printer">
-            <summary>
-            line printer subsystem
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.RemoteSyslogAppender.SyslogFacility.News">
-            <summary>
-            network news subsystem
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.RemoteSyslogAppender.SyslogFacility.Uucp">
-            <summary>
-            UUCP subsystem
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.RemoteSyslogAppender.SyslogFacility.Clock">
-            <summary>
-            clock (cron/at) daemon
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.RemoteSyslogAppender.SyslogFacility.Authorization2">
-            <summary>
-            security/authorization  messages (private)
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.RemoteSyslogAppender.SyslogFacility.Ftp">
-            <summary>
-            ftp daemon
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.RemoteSyslogAppender.SyslogFacility.Ntp">
-            <summary>
-            NTP subsystem
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.RemoteSyslogAppender.SyslogFacility.Audit">
-            <summary>
-            log audit
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.RemoteSyslogAppender.SyslogFacility.Alert">
-            <summary>
-            log alert
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.RemoteSyslogAppender.SyslogFacility.Clock2">
-            <summary>
-            clock daemon
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.RemoteSyslogAppender.SyslogFacility.Local0">
-            <summary>
-            reserved for local use
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.RemoteSyslogAppender.SyslogFacility.Local1">
-            <summary>
-            reserved for local use
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.RemoteSyslogAppender.SyslogFacility.Local2">
-            <summary>
-            reserved for local use
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.RemoteSyslogAppender.SyslogFacility.Local3">
-            <summary>
-            reserved for local use
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.RemoteSyslogAppender.SyslogFacility.Local4">
-            <summary>
-            reserved for local use
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.RemoteSyslogAppender.SyslogFacility.Local5">
-            <summary>
-            reserved for local use
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.RemoteSyslogAppender.SyslogFacility.Local6">
-            <summary>
-            reserved for local use
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.RemoteSyslogAppender.SyslogFacility.Local7">
-            <summary>
-            reserved for local use
-            </summary>
-        </member>
-        <member name="T:log4net.Appender.RemoteSyslogAppender.LevelSeverity">
-            <summary>
-            A class to act as a mapping between the level that a logging call is made at and
-            the syslog severity that is should be logged at.
-            </summary>
-            <remarks>
-            <para>
-            A class to act as a mapping between the level that a logging call is made at and
-            the syslog severity that is should be logged at.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Appender.RemoteSyslogAppender.LevelSeverity.Severity">
-            <summary>
-            The mapped syslog severity for the specified level
-            </summary>
-            <remarks>
-            <para>
-            Required property.
-            The mapped syslog severity for the specified level
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Appender.RemotingAppender">
-            <summary>
-            Delivers logging events to a remote logging sink. 
-            </summary>
-            <remarks>
-            <para>
-            This Appender is designed to deliver events to a remote sink. 
-            That is any object that implements the <see cref="T:log4net.Appender.RemotingAppender.IRemoteLoggingSink"/>
-            interface. It delivers the events using .NET remoting. The
-            object to deliver events to is specified by setting the
-            appenders <see cref="P:log4net.Appender.RemotingAppender.Sink"/> property.</para>
-            <para>
-            The RemotingAppender buffers events before sending them. This allows it to 
-            make more efficient use of the remoting infrastructure.</para>
-            <para>
-            Once the buffer is full the events are still not sent immediately. 
-            They are scheduled to be sent using a pool thread. The effect is that 
-            the send occurs asynchronously. This is very important for a 
-            number of non obvious reasons. The remoting infrastructure will 
-            flow thread local variables (stored in the <see cref="T:System.Runtime.Remoting.Messaging.CallContext"/>),
-            if they are marked as <see cref="T:System.Runtime.Remoting.Messaging.ILogicalThreadAffinative"/>, across the 
-            remoting boundary. If the server is not contactable then
-            the remoting infrastructure will clear the <see cref="T:System.Runtime.Remoting.Messaging.ILogicalThreadAffinative"/>
-            objects from the <see cref="T:System.Runtime.Remoting.Messaging.CallContext"/>. To prevent a logging failure from
-            having side effects on the calling application the remoting call must be made
-            from a separate thread to the one used by the application. A <see cref="T:System.Threading.ThreadPool"/>
-            thread is used for this. If no <see cref="T:System.Threading.ThreadPool"/> thread is available then
-            the events will block in the thread pool manager until a thread is available.</para>
-            <para>
-            Because the events are sent asynchronously using pool threads it is possible to close 
-            this appender before all the queued events have been sent.
-            When closing the appender attempts to wait until all the queued events have been sent, but 
-            this will timeout after 30 seconds regardless.</para>
-            <para>
-            If this appender is being closed because the <see cref="E:System.AppDomain.ProcessExit"/>
-            event has fired it may not be possible to send all the queued events. During process
-            exit the runtime limits the time that a <see cref="E:System.AppDomain.ProcessExit"/>
-            event handler is allowed to run for. If the runtime terminates the threads before
-            the queued events have been sent then they will be lost. To ensure that all events
-            are sent the appender must be closed before the application exits. See 
-            <see cref="M:log4net.Core.LoggerManager.Shutdown"/> for details on how to shutdown
-            log4net programmatically.</para>
-            </remarks>
-            <seealso cref="T:log4net.Appender.RemotingAppender.IRemoteLoggingSink"/>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-            <author>Daniel Cazzulino</author>
-        </member>
-        <member name="M:log4net.Appender.RemotingAppender.#ctor">
-            <summary>
-            Initializes a new instance of the <see cref="T:log4net.Appender.RemotingAppender"/> class.
-            </summary>
-            <remarks>
-            <para>
-            Default constructor.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.RemotingAppender.ActivateOptions">
-            <summary>
-            Initialize the appender based on the options set
-            </summary>
-            <remarks>
-            <para>
-            This is part of the <see cref="T:log4net.Core.IOptionHandler"/> delayed object
-            activation scheme. The <see cref="M:log4net.Appender.RemotingAppender.ActivateOptions"/> method must 
-            be called on this object after the configuration properties have
-            been set. Until <see cref="M:log4net.Appender.RemotingAppender.ActivateOptions"/> is called this
-            object is in an undefined state and must not be used. 
-            </para>
-            <para>
-            If any of the configuration properties are modified then 
-            <see cref="M:log4net.Appender.RemotingAppender.ActivateOptions"/> must be called again.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.RemotingAppender.SendBuffer(log4net.Core.LoggingEvent[])">
-            <summary>
-            Send the contents of the buffer to the remote sink.
-            </summary>
-            <remarks>
-            The events are not sent immediately. They are scheduled to be sent
-            using a pool thread. The effect is that the send occurs asynchronously.
-            This is very important for a number of non obvious reasons. The remoting
-            infrastructure will flow thread local variables (stored in the <see cref="T:System.Runtime.Remoting.Messaging.CallContext"/>),
-            if they are marked as <see cref="T:System.Runtime.Remoting.Messaging.ILogicalThreadAffinative"/>, across the 
-            remoting boundary. If the server is not contactable then
-            the remoting infrastructure will clear the <see cref="T:System.Runtime.Remoting.Messaging.ILogicalThreadAffinative"/>
-            objects from the <see cref="T:System.Runtime.Remoting.Messaging.CallContext"/>. To prevent a logging failure from
-            having side effects on the calling application the remoting call must be made
-            from a separate thread to the one used by the application. A <see cref="T:System.Threading.ThreadPool"/>
-            thread is used for this. If no <see cref="T:System.Threading.ThreadPool"/> thread is available then
-            the events will block in the thread pool manager until a thread is available.
-            </remarks>
-            <param name="events">The events to send.</param>
-        </member>
-        <member name="M:log4net.Appender.RemotingAppender.OnClose">
-            <summary>
-            Override base class close.
-            </summary>
-            <remarks>
-            <para>
-            This method waits while there are queued work items. The events are
-            sent asynchronously using <see cref="T:System.Threading.ThreadPool"/> work items. These items
-            will be sent once a thread pool thread is available to send them, therefore
-            it is possible to close the appender before all the queued events have been
-            sent.</para>
-            <para>
-            This method attempts to wait until all the queued events have been sent, but this 
-            method will timeout after 30 seconds regardless.</para>
-            <para>
-            If the appender is being closed because the <see cref="E:System.AppDomain.ProcessExit"/>
-            event has fired it may not be possible to send all the queued events. During process
-            exit the runtime limits the time that a <see cref="E:System.AppDomain.ProcessExit"/>
-            event handler is allowed to run for.</para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.RemotingAppender.BeginAsyncSend">
-            <summary>
-            A work item is being queued into the thread pool
-            </summary>
-        </member>
-        <member name="M:log4net.Appender.RemotingAppender.EndAsyncSend">
-            <summary>
-            A work item from the thread pool has completed
-            </summary>
-        </member>
-        <member name="M:log4net.Appender.RemotingAppender.SendBufferCallback(System.Object)">
-            <summary>
-            Send the contents of the buffer to the remote sink.
-            </summary>
-            <remarks>
-            This method is designed to be used with the <see cref="T:System.Threading.ThreadPool"/>.
-            This method expects to be passed an array of <see cref="T:log4net.Core.LoggingEvent"/>
-            objects in the state param.
-            </remarks>
-            <param name="state">the logging events to send</param>
-        </member>
-        <member name="F:log4net.Appender.RemotingAppender.m_sinkUrl">
-            <summary>
-            The URL of the remote sink.
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.RemotingAppender.m_sinkObj">
-            <summary>
-            The local proxy (.NET remoting) for the remote logging sink.
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.RemotingAppender.m_queuedCallbackCount">
-            <summary>
-            The number of queued callbacks currently waiting or executing
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.RemotingAppender.m_workQueueEmptyEvent">
-            <summary>
-            Event used to signal when there are no queued work items
-            </summary>
-            <remarks>
-            This event is set when there are no queued work items. In this
-            state it is safe to close the appender.
-            </remarks>
-        </member>
-        <member name="P:log4net.Appender.RemotingAppender.Sink">
-            <summary>
-            Gets or sets the URL of the well-known object that will accept 
-            the logging events.
-            </summary>
-            <value>
-            The well-known URL of the remote sink.
-            </value>
-            <remarks>
-            <para>
-            The URL of the remoting sink that will accept logging events.
-            The sink must implement the <see cref="T:log4net.Appender.RemotingAppender.IRemoteLoggingSink"/>
-            interface.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Appender.RemotingAppender.IRemoteLoggingSink">
-            <summary>
-            Interface used to deliver <see cref="T:log4net.Core.LoggingEvent"/> objects to a remote sink.
-            </summary>
-            <remarks>
-            This interface must be implemented by a remoting sink
-            if the <see cref="T:log4net.Appender.RemotingAppender"/> is to be used
-            to deliver logging events to the sink.
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.RemotingAppender.IRemoteLoggingSink.LogEvents(log4net.Core.LoggingEvent[])">
-            <summary>
-            Delivers logging events to the remote sink
-            </summary>
-            <param name="events">Array of events to log.</param>
-            <remarks>
-            <para>
-            Delivers logging events to the remote sink
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Appender.RollingFileAppender">
-            <summary>
-            Appender that rolls log files based on size or date or both.
-            </summary>
-            <remarks>
-            <para>
-            RollingFileAppender can roll log files based on size or date or both
-            depending on the setting of the <see cref="P:log4net.Appender.RollingFileAppender.RollingStyle"/> property.
-            When set to <see cref="F:log4net.Appender.RollingFileAppender.RollingMode.Size"/> the log file will be rolled
-            once its size exceeds the <see cref="P:log4net.Appender.RollingFileAppender.MaximumFileSize"/>.
-            When set to <see cref="F:log4net.Appender.RollingFileAppender.RollingMode.Date"/> the log file will be rolled
-            once the date boundary specified in the <see cref="P:log4net.Appender.RollingFileAppender.DatePattern"/> property
-            is crossed.
-            When set to <see cref="F:log4net.Appender.RollingFileAppender.RollingMode.Composite"/> the log file will be
-            rolled once the date boundary specified in the <see cref="P:log4net.Appender.RollingFileAppender.DatePattern"/> property
-            is crossed, but within a date boundary the file will also be rolled
-            once its size exceeds the <see cref="P:log4net.Appender.RollingFileAppender.MaximumFileSize"/>.
-            When set to <see cref="F:log4net.Appender.RollingFileAppender.RollingMode.Once"/> the log file will be rolled when
-            the appender is configured. This effectively means that the log file can be
-            rolled once per program execution.
-            </para>
-            <para>
-            A of few additional optional features have been added:
-            <list type="bullet">
-            <item>Attach date pattern for current log file <see cref="P:log4net.Appender.RollingFileAppender.StaticLogFileName"/></item>
-            <item>Backup number increments for newer files <see cref="P:log4net.Appender.RollingFileAppender.CountDirection"/></item>
-            <item>Infinite number of backups by file size <see cref="P:log4net.Appender.RollingFileAppender.MaxSizeRollBackups"/></item>
-            </list>
-            </para>
-            
-            <note>
-            <para>
-            For large or infinite numbers of backup files a <see cref="P:log4net.Appender.RollingFileAppender.CountDirection"/> 
-            greater than zero is highly recommended, otherwise all the backup files need
-            to be renamed each time a new backup is created.
-            </para>
-            <para>
-            When Date/Time based rolling is used setting <see cref="P:log4net.Appender.RollingFileAppender.StaticLogFileName"/> 
-            to <see langword="true"/> will reduce the number of file renamings to few or none.
-            </para>
-            </note>
-            
-            <note type="caution">
-            <para>
-            Changing <see cref="P:log4net.Appender.RollingFileAppender.StaticLogFileName"/> or <see cref="P:log4net.Appender.RollingFileAppender.CountDirection"/> without clearing
-            the log file directory of backup files will cause unexpected and unwanted side effects.  
-            </para>
-            </note>
-            
-            <para>
-            If Date/Time based rolling is enabled this appender will attempt to roll existing files
-            in the directory without a Date/Time tag based on the last write date of the base log file.
-            The appender only rolls the log file when a message is logged. If Date/Time based rolling 
-            is enabled then the appender will not roll the log file at the Date/Time boundary but
-            at the point when the next message is logged after the boundary has been crossed.
-            </para>
-            
-            <para>
-            The <see cref="T:log4net.Appender.RollingFileAppender"/> extends the <see cref="T:log4net.Appender.FileAppender"/> and
-            has the same behavior when opening the log file.
-            The appender will first try to open the file for writing when <see cref="M:log4net.Appender.RollingFileAppender.ActivateOptions"/>
-            is called. This will typically be during configuration.
-            If the file cannot be opened for writing the appender will attempt
-            to open the file again each time a message is logged to the appender.
-            If the file cannot be opened for writing when a message is logged then
-            the message will be discarded by this appender.
-            </para>
-            <para>
-            When rolling a backup file necessitates deleting an older backup file the
-            file to be deleted is moved to a temporary name before being deleted.
-            </para>
-            
-            <note type="caution">
-            <para>
-            A maximum number of backup files when rolling on date/time boundaries is not supported.
-            </para>
-            </note>
-            </remarks>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-            <author>Aspi Havewala</author>
-            <author>Douglas de la Torre</author>
-            <author>Edward Smit</author>
-        </member>
-        <member name="M:log4net.Appender.RollingFileAppender.#ctor">
-            <summary>
-            Initializes a new instance of the <see cref="T:log4net.Appender.RollingFileAppender"/> class.
-            </summary>
-            <remarks>
-            <para>
-            Default constructor.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.RollingFileAppender.SetQWForFiles(System.IO.TextWriter)">
-            <summary>
-            Sets the quiet writer being used.
-            </summary>
-            <remarks>
-            This method can be overridden by sub classes.
-            </remarks>
-            <param name="writer">the writer to set</param>
-        </member>
-        <member name="M:log4net.Appender.RollingFileAppender.Append(log4net.Core.LoggingEvent)">
-            <summary>
-            Write out a logging event.
-            </summary>
-            <param name="loggingEvent">the event to write to file.</param>
-            <remarks>
-            <para>
-            Handles append time behavior for RollingFileAppender.  This checks
-            if a roll over either by date (checked first) or time (checked second)
-            is need and then appends to the file last.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.RollingFileAppender.Append(log4net.Core.LoggingEvent[])">
-            <summary>
-            Write out an array of logging events.
-            </summary>
-            <param name="loggingEvents">the events to write to file.</param>
-            <remarks>
-            <para>
-            Handles append time behavior for RollingFileAppender.  This checks
-            if a roll over either by date (checked first) or time (checked second)
-            is need and then appends to the file last.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.RollingFileAppender.AdjustFileBeforeAppend">
-            <summary>
-            Performs any required rolling before outputting the next event
-            </summary>
-            <remarks>
-            <para>
-            Handles append time behavior for RollingFileAppender.  This checks
-            if a roll over either by date (checked first) or time (checked second)
-            is need and then appends to the file last.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.RollingFileAppender.OpenFile(System.String,System.Boolean)">
-            <summary>
-            Creates and opens the file for logging.  If <see cref="P:log4net.Appender.RollingFileAppender.StaticLogFileName"/>
-            is false then the fully qualified name is determined and used.
-            </summary>
-            <param name="fileName">the name of the file to open</param>
-            <param name="append">true to append to existing file</param>
-            <remarks>
-            <para>This method will ensure that the directory structure
-            for the <paramref name="fileName"/> specified exists.</para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.RollingFileAppender.GetNextOutputFileName(System.String)">
-            <summary>
-            Get the current output file name
-            </summary>
-            <param name="fileName">the base file name</param>
-            <returns>the output file name</returns>
-            <remarks>
-            The output file name is based on the base fileName specified.
-            If <see cref="P:log4net.Appender.RollingFileAppender.StaticLogFileName"/> is set then the output 
-            file name is the same as the base file passed in. Otherwise
-            the output file depends on the date pattern, on the count
-            direction or both.
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.RollingFileAppender.DetermineCurSizeRollBackups">
-            <summary>
-            Determines curSizeRollBackups (only within the current roll point)
-            </summary>
-        </member>
-        <member name="M:log4net.Appender.RollingFileAppender.GetWildcardPatternForFile(System.String)">
-            <summary>
-            Generates a wildcard pattern that can be used to find all files
-            that are similar to the base file name.
-            </summary>
-            <param name="baseFileName"></param>
-            <returns></returns>
-        </member>
-        <member name="M:log4net.Appender.RollingFileAppender.GetExistingFiles(System.String)">
-            <summary>
-            Builds a list of filenames for all files matching the base filename plus a file
-            pattern.
-            </summary>
-            <param name="baseFilePath"></param>
-            <returns></returns>
-        </member>
-        <member name="M:log4net.Appender.RollingFileAppender.RollOverIfDateBoundaryCrossing">
-            <summary>
-            Initiates a roll over if needed for crossing a date boundary since the last run.
-            </summary>
-        </member>
-        <member name="M:log4net.Appender.RollingFileAppender.ExistingInit">
-            <summary>
-            Initializes based on existing conditions at time of <see cref="M:log4net.Appender.RollingFileAppender.ActivateOptions"/>.
-            </summary>
-            <remarks>
-            <para>
-            Initializes based on existing conditions at time of <see cref="M:log4net.Appender.RollingFileAppender.ActivateOptions"/>.
-            The following is done
-            <list type="bullet">
-            <item>determine curSizeRollBackups (only within the current roll point)</item>
-            <item>initiates a roll over if needed for crossing a date boundary since the last run.</item>
-            </list>
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.RollingFileAppender.InitializeFromOneFile(System.String,System.String)">
-            <summary>
-            Does the work of bumping the 'current' file counter higher
-            to the highest count when an incremental file name is seen.
-            The highest count is either the first file (when count direction
-            is greater than 0) or the last file (when count direction less than 0).
-            In either case, we want to know the highest count that is present.
-            </summary>
-            <param name="baseFile"></param>
-            <param name="curFileName"></param>
-        </member>
-        <member name="M:log4net.Appender.RollingFileAppender.InitializeRollBackups(System.String,System.Collections.ArrayList)">
-            <summary>
-            Takes a list of files and a base file name, and looks for 
-            'incremented' versions of the base file.  Bumps the max
-            count up to the highest count seen.
-            </summary>
-            <param name="baseFile"></param>
-            <param name="arrayFiles"></param>
-        </member>
-        <member name="M:log4net.Appender.RollingFileAppender.ComputeCheckPeriod(System.String)">
-            <summary>
-            Calculates the RollPoint for the datePattern supplied.
-            </summary>
-            <param name="datePattern">the date pattern to calculate the check period for</param>
-            <returns>The RollPoint that is most accurate for the date pattern supplied</returns>
-            <remarks>
-            Essentially the date pattern is examined to determine what the
-            most suitable roll point is. The roll point chosen is the roll point
-            with the smallest period that can be detected using the date pattern
-            supplied. i.e. if the date pattern only outputs the year, month, day 
-            and hour then the smallest roll point that can be detected would be
-            and hourly roll point as minutes could not be detected.
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.RollingFileAppender.ActivateOptions">
-            <summary>
-            Initialize the appender based on the options set
-            </summary>
-            <remarks>
-            <para>
-            This is part of the <see cref="T:log4net.Core.IOptionHandler"/> delayed object
-            activation scheme. The <see cref="M:log4net.Appender.RollingFileAppender.ActivateOptions"/> method must 
-            be called on this object after the configuration properties have
-            been set. Until <see cref="M:log4net.Appender.RollingFileAppender.ActivateOptions"/> is called this
-            object is in an undefined state and must not be used. 
-            </para>
-            <para>
-            If any of the configuration properties are modified then 
-            <see cref="M:log4net.Appender.RollingFileAppender.ActivateOptions"/> must be called again.
-            </para>
-            <para>
-            Sets initial conditions including date/time roll over information, first check,
-            scheduledFilename, and calls <see cref="M:log4net.Appender.RollingFileAppender.ExistingInit"/> to initialize
-            the current number of backups.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.RollingFileAppender.RollOverTime(System.Boolean)">
-            <summary>
-            Rollover the file(s) to date/time tagged file(s).
-            </summary>
-            <param name="fileIsOpen">set to true if the file to be rolled is currently open</param>
-            <remarks>
-            <para>
-            Rollover the file(s) to date/time tagged file(s).
-            Resets curSizeRollBackups. 
-            If fileIsOpen is set then the new file is opened (through SafeOpenFile).
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.RollingFileAppender.RollFile(System.String,System.String)">
-            <summary>
-            Renames file <paramref name="fromFile"/> to file <paramref name="toFile"/>.
-            </summary>
-            <param name="fromFile">Name of existing file to roll.</param>
-            <param name="toFile">New name for file.</param>
-            <remarks>
-            <para>
-            Renames file <paramref name="fromFile"/> to file <paramref name="toFile"/>. It
-            also checks for existence of target file and deletes if it does.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.RollingFileAppender.FileExists(System.String)">
-            <summary>
-            Test if a file exists at a specified path
-            </summary>
-            <param name="path">the path to the file</param>
-            <returns>true if the file exists</returns>
-            <remarks>
-            <para>
-            Test if a file exists at a specified path
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.RollingFileAppender.DeleteFile(System.String)">
-            <summary>
-            Deletes the specified file if it exists.
-            </summary>
-            <param name="fileName">The file to delete.</param>
-            <remarks>
-            <para>
-            Delete a file if is exists.
-            The file is first moved to a new filename then deleted.
-            This allows the file to be removed even when it cannot
-            be deleted, but it still can be moved.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.RollingFileAppender.RollOverSize">
-            <summary>
-            Implements file roll base on file size.
-            </summary>
-            <remarks>
-            <para>
-            If the maximum number of size based backups is reached
-            (<c>curSizeRollBackups == maxSizeRollBackups</c>) then the oldest
-            file is deleted -- its index determined by the sign of countDirection.
-            If <c>countDirection</c> &lt; 0, then files
-            {<c>File.1</c>, ..., <c>File.curSizeRollBackups -1</c>}
-            are renamed to {<c>File.2</c>, ...,
-            <c>File.curSizeRollBackups</c>}. Moreover, <c>File</c> is
-            renamed <c>File.1</c> and closed.
-            </para>
-            <para>
-            A new file is created to receive further log output.
-            </para>
-            <para>
-            If <c>maxSizeRollBackups</c> is equal to zero, then the
-            <c>File</c> is truncated with no backup files created.
-            </para>
-            <para>
-            If <c>maxSizeRollBackups</c> &lt; 0, then <c>File</c> is
-            renamed if needed and no files are deleted.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.RollingFileAppender.RollOverRenameFiles(System.String)">
-            <summary>
-            Implements file roll.
-            </summary>
-            <param name="baseFileName">the base name to rename</param>
-            <remarks>
-            <para>
-            If the maximum number of size based backups is reached
-            (<c>curSizeRollBackups == maxSizeRollBackups</c>) then the oldest
-            file is deleted -- its index determined by the sign of countDirection.
-            If <c>countDirection</c> &lt; 0, then files
-            {<c>File.1</c>, ..., <c>File.curSizeRollBackups -1</c>}
-            are renamed to {<c>File.2</c>, ...,
-            <c>File.curSizeRollBackups</c>}. 
-            </para>
-            <para>
-            If <c>maxSizeRollBackups</c> is equal to zero, then the
-            <c>File</c> is truncated with no backup files created.
-            </para>
-            <para>
-            If <c>maxSizeRollBackups</c> &lt; 0, then <c>File</c> is
-            renamed if needed and no files are deleted.
-            </para>
-            <para>
-            This is called by <see cref="M:log4net.Appender.RollingFileAppender.RollOverSize"/> to rename the files.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.RollingFileAppender.NextCheckDate(System.DateTime,log4net.Appender.RollingFileAppender.RollPoint)">
-            <summary>
-            Get the start time of the next window for the current rollpoint
-            </summary>
-            <param name="currentDateTime">the current date</param>
-            <param name="rollPoint">the type of roll point we are working with</param>
-            <returns>the start time for the next roll point an interval after the currentDateTime date</returns>
-            <remarks>
-            <para>
-            Returns the date of the next roll point after the currentDateTime date passed to the method.
-            </para>
-            <para>
-            The basic strategy is to subtract the time parts that are less significant
-            than the rollpoint from the current time. This should roll the time back to
-            the start of the time window for the current rollpoint. Then we add 1 window
-            worth of time and get the start time of the next window for the rollpoint.
-            </para>
-            </remarks>
-        </member>
-        <member name="F:log4net.Appender.RollingFileAppender.m_dateTime">
-            <summary>
-            This object supplies the current date/time.  Allows test code to plug in
-            a method to control this class when testing date/time based rolling.
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.RollingFileAppender.m_datePattern">
-            <summary>
-            The date pattern. By default, the pattern is set to <c>".yyyy-MM-dd"</c> 
-            meaning daily rollover.
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.RollingFileAppender.m_scheduledFilename">
-            <summary>
-            The actual formatted filename that is currently being written to
-            or will be the file transferred to on roll over
-            (based on staticLogFileName).
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.RollingFileAppender.m_nextCheck">
-            <summary>
-            The timestamp when we shall next recompute the filename.
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.RollingFileAppender.m_now">
-            <summary>
-            Holds date of last roll over
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.RollingFileAppender.m_rollPoint">
-            <summary>
-            The type of rolling done
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.RollingFileAppender.m_maxFileSize">
-            <summary>
-            The default maximum file size is 10MB
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.RollingFileAppender.m_maxSizeRollBackups">
-            <summary>
-            There is zero backup files by default
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.RollingFileAppender.m_curSizeRollBackups">
-            <summary>
-            How many sized based backups have been made so far
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.RollingFileAppender.m_countDirection">
-            <summary>
-            The rolling file count direction. 
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.RollingFileAppender.m_rollingStyle">
-            <summary>
-            The rolling mode used in this appender.
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.RollingFileAppender.m_rollDate">
-            <summary>
-            Cache flag set if we are rolling by date.
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.RollingFileAppender.m_rollSize">
-            <summary>
-            Cache flag set if we are rolling by size.
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.RollingFileAppender.m_staticLogFileName">
-            <summary>
-            Value indicating whether to always log to the same file.
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.RollingFileAppender.m_baseFileName">
-            <summary>
-            FileName provided in configuration.  Used for rolling properly
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.RollingFileAppender.s_date1970">
-            <summary>
-            The 1st of January 1970 in UTC
-            </summary>
-        </member>
-        <member name="P:log4net.Appender.RollingFileAppender.DatePattern">
-            <summary>
-            Gets or sets the date pattern to be used for generating file names
-            when rolling over on date.
-            </summary>
-            <value>
-            The date pattern to be used for generating file names when rolling 
-            over on date.
-            </value>
-            <remarks>
-            <para>
-            Takes a string in the same format as expected by 
-            <see cref="T:log4net.DateFormatter.SimpleDateFormatter"/>.
-            </para>
-            <para>
-            This property determines the rollover schedule when rolling over
-            on date.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Appender.RollingFileAppender.MaxSizeRollBackups">
-            <summary>
-            Gets or sets the maximum number of backup files that are kept before
-            the oldest is erased.
-            </summary>
-            <value>
-            The maximum number of backup files that are kept before the oldest is
-            erased.
-            </value>
-            <remarks>
-            <para>
-            If set to zero, then there will be no backup files and the log file 
-            will be truncated when it reaches <see cref="P:log4net.Appender.RollingFileAppender.MaxFileSize"/>.  
-            </para>
-            <para>
-            If a negative number is supplied then no deletions will be made.  Note 
-            that this could result in very slow performance as a large number of 
-            files are rolled over unless <see cref="P:log4net.Appender.RollingFileAppender.CountDirection"/> is used.
-            </para>
-            <para>
-            The maximum applies to <b>each</b> time based group of files and 
-            <b>not</b> the total.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Appender.RollingFileAppender.MaxFileSize">
-            <summary>
-            Gets or sets the maximum size that the output file is allowed to reach
-            before being rolled over to backup files.
-            </summary>
-            <value>
-            The maximum size in bytes that the output file is allowed to reach before being 
-            rolled over to backup files.
-            </value>
-            <remarks>
-            <para>
-            This property is equivalent to <see cref="P:log4net.Appender.RollingFileAppender.MaximumFileSize"/> except
-            that it is required for differentiating the setter taking a
-            <see cref="T:System.Int64"/> argument from the setter taking a <see cref="T:System.String"/> 
-            argument.
-            </para>
-            <para>
-            The default maximum file size is 10MB (10*1024*1024).
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Appender.RollingFileAppender.MaximumFileSize">
-            <summary>
-            Gets or sets the maximum size that the output file is allowed to reach
-            before being rolled over to backup files.
-            </summary>
-            <value>
-            The maximum size that the output file is allowed to reach before being 
-            rolled over to backup files.
-            </value>
-            <remarks>
-            <para>
-            This property allows you to specify the maximum size with the
-            suffixes "KB", "MB" or "GB" so that the size is interpreted being 
-            expressed respectively in kilobytes, megabytes or gigabytes. 
-            </para>
-            <para>
-            For example, the value "10KB" will be interpreted as 10240 bytes.
-            </para>
-            <para>
-            The default maximum file size is 10MB.
-            </para>
-            <para>
-            If you have the option to set the maximum file size programmatically
-            consider using the <see cref="P:log4net.Appender.RollingFileAppender.MaxFileSize"/> property instead as this
-            allows you to set the size in bytes as a <see cref="T:System.Int64"/>.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Appender.RollingFileAppender.CountDirection">
-            <summary>
-            Gets or sets the rolling file count direction. 
-            </summary>
-            <value>
-            The rolling file count direction.
-            </value>
-            <remarks>
-            <para>
-            Indicates if the current file is the lowest numbered file or the
-            highest numbered file.
-            </para>
-            <para>
-            By default newer files have lower numbers (<see cref="P:log4net.Appender.RollingFileAppender.CountDirection"/> &lt; 0),
-            i.e. log.1 is most recent, log.5 is the 5th backup, etc...
-            </para>
-            <para>
-            <see cref="P:log4net.Appender.RollingFileAppender.CountDirection"/> &gt;= 0 does the opposite i.e.
-            log.1 is the first backup made, log.5 is the 5th backup made, etc.
-            For infinite backups use <see cref="P:log4net.Appender.RollingFileAppender.CountDirection"/> &gt;= 0 to reduce 
-            rollover costs.
-            </para>
-            <para>The default file count direction is -1.</para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Appender.RollingFileAppender.RollingStyle">
-            <summary>
-            Gets or sets the rolling style.
-            </summary>
-            <value>The rolling style.</value>
-            <remarks>
-            <para>
-            The default rolling style is <see cref="F:log4net.Appender.RollingFileAppender.RollingMode.Composite"/>.
-            </para>
-            <para>
-            When set to <see cref="F:log4net.Appender.RollingFileAppender.RollingMode.Once"/> this appender's
-            <see cref="P:log4net.Appender.FileAppender.AppendToFile"/> property is set to <c>false</c>, otherwise
-            the appender would append to a single file rather than rolling
-            the file each time it is opened.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Appender.RollingFileAppender.StaticLogFileName">
-            <summary>
-            Gets or sets a value indicating whether to always log to
-            the same file.
-            </summary>
-            <value>
-            <c>true</c> if always should be logged to the same file, otherwise <c>false</c>.
-            </value>
-            <remarks>
-            <para>
-            By default file.log is always the current file.  Optionally
-            file.log.yyyy-mm-dd for current formatted datePattern can by the currently
-            logging file (or file.log.curSizeRollBackup or even
-            file.log.yyyy-mm-dd.curSizeRollBackup).
-            </para>
-            <para>
-            This will make time based rollovers with a large number of backups 
-            much faster as the appender it won't have to rename all the backups!
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Appender.RollingFileAppender.RollingMode">
-            <summary>
-            Style of rolling to use
-            </summary>
-            <remarks>
-            <para>
-            Style of rolling to use
-            </para>
-            </remarks>
-        </member>
-        <member name="F:log4net.Appender.RollingFileAppender.RollingMode.Once">
-            <summary>
-            Roll files once per program execution
-            </summary>
-            <remarks>
-            <para>
-            Roll files once per program execution.
-            Well really once each time this appender is
-            configured.
-            </para>
-            <para>
-            Setting this option also sets <c>AppendToFile</c> to
-            <c>false</c> on the <c>RollingFileAppender</c>, otherwise
-            this appender would just be a normal file appender.
-            </para>
-            </remarks>
-        </member>
-        <member name="F:log4net.Appender.RollingFileAppender.RollingMode.Size">
-            <summary>
-            Roll files based only on the size of the file
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.RollingFileAppender.RollingMode.Date">
-            <summary>
-            Roll files based only on the date
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.RollingFileAppender.RollingMode.Composite">
-            <summary>
-            Roll files based on both the size and date of the file
-            </summary>
-        </member>
-        <member name="T:log4net.Appender.RollingFileAppender.RollPoint">
-            <summary>
-            The code assumes that the following 'time' constants are in a increasing sequence.
-            </summary>
-            <remarks>
-            <para>
-            The code assumes that the following 'time' constants are in a increasing sequence.
-            </para>
-            </remarks>
-        </member>
-        <member name="F:log4net.Appender.RollingFileAppender.RollPoint.InvalidRollPoint">
-            <summary>
-            Roll the log not based on the date
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.RollingFileAppender.RollPoint.TopOfMinute">
-            <summary>
-            Roll the log for each minute
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.RollingFileAppender.RollPoint.TopOfHour">
-            <summary>
-            Roll the log for each hour
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.RollingFileAppender.RollPoint.HalfDay">
-            <summary>
-            Roll the log twice a day (midday and midnight)
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.RollingFileAppender.RollPoint.TopOfDay">
-            <summary>
-            Roll the log each day (midnight)
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.RollingFileAppender.RollPoint.TopOfWeek">
-            <summary>
-            Roll the log each week
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.RollingFileAppender.RollPoint.TopOfMonth">
-            <summary>
-            Roll the log each month
-            </summary>
-        </member>
-        <member name="T:log4net.Appender.RollingFileAppender.IDateTime">
-            <summary>
-            This interface is used to supply Date/Time information to the <see cref="T:log4net.Appender.RollingFileAppender"/>.
-            </summary>
-            <remarks>
-            This interface is used to supply Date/Time information to the <see cref="T:log4net.Appender.RollingFileAppender"/>.
-            Used primarily to allow test classes to plug themselves in so they can
-            supply test date/times.
-            </remarks>
-        </member>
-        <member name="P:log4net.Appender.RollingFileAppender.IDateTime.Now">
-            <summary>
-            Gets the <i>current</i> time.
-            </summary>
-            <value>The <i>current</i> time.</value>
-            <remarks>
-            <para>
-            Gets the <i>current</i> time.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Appender.RollingFileAppender.DefaultDateTime">
-            <summary>
-            Default implementation of <see cref="T:log4net.Appender.RollingFileAppender.IDateTime"/> that returns the current time.
-            </summary>
-        </member>
-        <member name="P:log4net.Appender.RollingFileAppender.DefaultDateTime.Now">
-            <summary>
-            Gets the <b>current</b> time.
-            </summary>
-            <value>The <b>current</b> time.</value>
-            <remarks>
-            <para>
-            Gets the <b>current</b> time.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Appender.SmtpAppender">
-            <summary>
-            Send an e-mail when a specific logging event occurs, typically on errors 
-            or fatal errors.
-            </summary>
-            <remarks>
-            <para>
-            The number of logging events delivered in this e-mail depend on
-            the value of <see cref="P:log4net.Appender.BufferingAppenderSkeleton.BufferSize"/> option. The
-            <see cref="T:log4net.Appender.SmtpAppender"/> keeps only the last
-            <see cref="P:log4net.Appender.BufferingAppenderSkeleton.BufferSize"/> logging events in its 
-            cyclic buffer. This keeps memory requirements at a reasonable level while 
-            still delivering useful application context.
-            </para>
-            <note type="caution">
-            Authentication and setting the server Port are only available on the MS .NET 1.1 runtime.
-            For these features to be enabled you need to ensure that you are using a version of
-            the log4net assembly that is built against the MS .NET 1.1 framework and that you are
-            running the your application on the MS .NET 1.1 runtime. On all other platforms only sending
-            unauthenticated messages to a server listening on port 25 (the default) is supported.
-            </note>
-            <para>
-            Authentication is supported by setting the <see cref="P:log4net.Appender.SmtpAppender.Authentication"/> property to
-            either <see cref="F:log4net.Appender.SmtpAppender.SmtpAuthentication.Basic"/> or <see cref="F:log4net.Appender.SmtpAppender.SmtpAuthentication.Ntlm"/>.
-            If using <see cref="F:log4net.Appender.SmtpAppender.SmtpAuthentication.Basic"/> authentication then the <see cref="P:log4net.Appender.SmtpAppender.Username"/>
-            and <see cref="P:log4net.Appender.SmtpAppender.Password"/> properties must also be set.
-            </para>
-            <para>
-            To set the SMTP server port use the <see cref="P:log4net.Appender.SmtpAppender.Port"/> property. The default port is 25.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-        </member>
-        <member name="M:log4net.Appender.SmtpAppender.#ctor">
-            <summary>
-            Default constructor
-            </summary>
-            <remarks>
-            <para>
-            Default constructor
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.SmtpAppender.SendBuffer(log4net.Core.LoggingEvent[])">
-            <summary>
-            Sends the contents of the cyclic buffer as an e-mail message.
-            </summary>
-            <param name="events">The logging events to send.</param>
-        </member>
-        <member name="M:log4net.Appender.SmtpAppender.SendEmail(System.String)">
-            <summary>
-            Send the email message
-            </summary>
-            <param name="messageBody">the body text to include in the mail</param>
-        </member>
-        <member name="P:log4net.Appender.SmtpAppender.To">
-            <summary>
-            Gets or sets a semicolon-delimited list of recipient e-mail addresses.
-            </summary>
-            <value>
-            A semicolon-delimited list of e-mail addresses.
-            </value>
-            <remarks>
-            <para>
-            A semicolon-delimited list of recipient e-mail addresses.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Appender.SmtpAppender.From">
-            <summary>
-            Gets or sets the e-mail address of the sender.
-            </summary>
-            <value>
-            The e-mail address of the sender.
-            </value>
-            <remarks>
-            <para>
-            The e-mail address of the sender.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Appender.SmtpAppender.Subject">
-            <summary>
-            Gets or sets the subject line of the e-mail message.
-            </summary>
-            <value>
-            The subject line of the e-mail message.
-            </value>
-            <remarks>
-            <para>
-            The subject line of the e-mail message.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Appender.SmtpAppender.SmtpHost">
-            <summary>
-            Gets or sets the name of the SMTP relay mail server to use to send 
-            the e-mail messages.
-            </summary>
-            <value>
-            The name of the e-mail relay server. If SmtpServer is not set, the 
-            name of the local SMTP server is used.
-            </value>
-            <remarks>
-            <para>
-            The name of the e-mail relay server. If SmtpServer is not set, the 
-            name of the local SMTP server is used.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Appender.SmtpAppender.LocationInfo">
-            <summary>
-            Obsolete
-            </summary>
-            <remarks>
-            Use the BufferingAppenderSkeleton Fix methods instead 
-            </remarks>
-            <remarks>
-            <para>
-            Obsolete property.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Appender.SmtpAppender.Authentication">
-            <summary>
-            The mode to use to authentication with the SMTP server
-            </summary>
-            <remarks>
-            <note type="caution">Authentication is only available on the MS .NET 1.1 runtime.</note>
-            <para>
-            Valid Authentication mode values are: <see cref="F:log4net.Appender.SmtpAppender.SmtpAuthentication.None"/>, 
-            <see cref="F:log4net.Appender.SmtpAppender.SmtpAuthentication.Basic"/>, and <see cref="F:log4net.Appender.SmtpAppender.SmtpAuthentication.Ntlm"/>. 
-            The default value is <see cref="F:log4net.Appender.SmtpAppender.SmtpAuthentication.None"/>. When using 
-            <see cref="F:log4net.Appender.SmtpAppender.SmtpAuthentication.Basic"/> you must specify the <see cref="P:log4net.Appender.SmtpAppender.Username"/> 
-            and <see cref="P:log4net.Appender.SmtpAppender.Password"/> to use to authenticate.
-            When using <see cref="F:log4net.Appender.SmtpAppender.SmtpAuthentication.Ntlm"/> the Windows credentials for the current
-            thread, if impersonating, or the process will be used to authenticate. 
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Appender.SmtpAppender.Username">
-            <summary>
-            The username to use to authenticate with the SMTP server
-            </summary>
-            <remarks>
-            <note type="caution">Authentication is only available on the MS .NET 1.1 runtime.</note>
-            <para>
-            A <see cref="P:log4net.Appender.SmtpAppender.Username"/> and <see cref="P:log4net.Appender.SmtpAppender.Password"/> must be specified when 
-            <see cref="P:log4net.Appender.SmtpAppender.Authentication"/> is set to <see cref="F:log4net.Appender.SmtpAppender.SmtpAuthentication.Basic"/>, 
-            otherwise the username will be ignored. 
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Appender.SmtpAppender.Password">
-            <summary>
-            The password to use to authenticate with the SMTP server
-            </summary>
-            <remarks>
-            <note type="caution">Authentication is only available on the MS .NET 1.1 runtime.</note>
-            <para>
-            A <see cref="P:log4net.Appender.SmtpAppender.Username"/> and <see cref="P:log4net.Appender.SmtpAppender.Password"/> must be specified when 
-            <see cref="P:log4net.Appender.SmtpAppender.Authentication"/> is set to <see cref="F:log4net.Appender.SmtpAppender.SmtpAuthentication.Basic"/>, 
-            otherwise the password will be ignored. 
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Appender.SmtpAppender.Port">
-            <summary>
-            The port on which the SMTP server is listening
-            </summary>
-            <remarks>
-            <note type="caution">Server Port is only available on the MS .NET 1.1 runtime.</note>
-            <para>
-            The port on which the SMTP server is listening. The default
-            port is <c>25</c>. The Port can only be changed when running on
-            the MS .NET 1.1 runtime.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Appender.SmtpAppender.Priority">
-            <summary>
-            Gets or sets the priority of the e-mail message
-            </summary>
-            <value>
-            One of the <see cref="T:System.Web.Mail.MailPriority"/> values.
-            </value>
-            <remarks>
-            <para>
-            Sets the priority of the e-mails generated by this
-            appender. The default priority is <see cref="F:System.Web.Mail.MailPriority.Normal"/>.
-            </para>
-            <para>
-            If you are using this appender to report errors then
-            you may want to set the priority to <see cref="F:System.Web.Mail.MailPriority.High"/>.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Appender.SmtpAppender.RequiresLayout">
-            <summary>
-            This appender requires a <see cref="N:log4net.Layout"/> to be set.
-            </summary>
-            <value><c>true</c></value>
-            <remarks>
-            <para>
-            This appender requires a <see cref="N:log4net.Layout"/> to be set.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Appender.SmtpAppender.SmtpAuthentication">
-            <summary>
-            Values for the <see cref="P:log4net.Appender.SmtpAppender.Authentication"/> property.
-            </summary>
-            <remarks>
-            <para>
-            SMTP authentication modes.
-            </para>
-            </remarks>
-        </member>
-        <member name="F:log4net.Appender.SmtpAppender.SmtpAuthentication.None">
-            <summary>
-            No authentication
-            </summary>
-        </member>
-        <member name="F:log4net.Appender.SmtpAppender.SmtpAuthentication.Basic">
-            <summary>
-            Basic authentication.
-            </summary>
-            <remarks>
-            Requires a username and password to be supplied
-            </remarks>
-        </member>
-        <member name="F:log4net.Appender.SmtpAppender.SmtpAuthentication.Ntlm">
-            <summary>
-            Integrated authentication
-            </summary>
-            <remarks>
-            Uses the Windows credentials from the current thread or process to authenticate.
-            </remarks>
-        </member>
-        <member name="T:log4net.Appender.SmtpPickupDirAppender">
-            <summary>
-            Send an email when a specific logging event occurs, typically on errors 
-            or fatal errors. Rather than sending via smtp it writes a file into the
-            directory specified by <see cref="P:log4net.Appender.SmtpPickupDirAppender.PickupDir"/>. This allows services such
-            as the IIS SMTP agent to manage sending the messages.
-            </summary>
-            <remarks>
-            <para>
-            The configuration for this appender is identical to that of the <c>SMTPAppender</c>,
-            except that instead of specifying the <c>SMTPAppender.SMTPHost</c> you specify
-            <see cref="P:log4net.Appender.SmtpPickupDirAppender.PickupDir"/>.
-            </para>
-            <para>
-            The number of logging events delivered in this e-mail depend on
-            the value of <see cref="P:log4net.Appender.BufferingAppenderSkeleton.BufferSize"/> option. The
-            <see cref="T:log4net.Appender.SmtpPickupDirAppender"/> keeps only the last
-            <see cref="P:log4net.Appender.BufferingAppenderSkeleton.BufferSize"/> logging events in its 
-            cyclic buffer. This keeps memory requirements at a reasonable level while 
-            still delivering useful application context.
-            </para>
-            </remarks>
-            <author>Niall Daley</author>
-            <author>Nicko Cadell</author>
-        </member>
-        <member name="M:log4net.Appender.SmtpPickupDirAppender.#ctor">
-            <summary>
-            Default constructor
-            </summary>
-            <remarks>
-            <para>
-            Default constructor
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.SmtpPickupDirAppender.SendBuffer(log4net.Core.LoggingEvent[])">
-            <summary>
-            Sends the contents of the cyclic buffer as an e-mail message.
-            </summary>
-            <param name="events">The logging events to send.</param>
-            <remarks>
-            <para>
-            Sends the contents of the cyclic buffer as an e-mail message.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.SmtpPickupDirAppender.ActivateOptions">
-            <summary>
-            Activate the options on this appender. 
-            </summary>
-            <remarks>
-            <para>
-            This is part of the <see cref="T:log4net.Core.IOptionHandler"/> delayed object
-            activation scheme. The <see cref="M:log4net.Appender.SmtpPickupDirAppender.ActivateOptions"/> method must 
-            be called on this object after the configuration properties have
-            been set. Until <see cref="M:log4net.Appender.SmtpPickupDirAppender.ActivateOptions"/> is called this
-            object is in an undefined state and must not be used. 
-            </para>
-            <para>
-            If any of the configuration properties are modified then 
-            <see cref="M:log4net.Appender.SmtpPickupDirAppender.ActivateOptions"/> must be called again.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.SmtpPickupDirAppender.ConvertToFullPath(System.String)">
-            <summary>
-            Convert a path into a fully qualified path.
-            </summary>
-            <param name="path">The path to convert.</param>
-            <returns>The fully qualified path.</returns>
-            <remarks>
-            <para>
-            Converts the path specified to a fully
-            qualified path. If the path is relative it is
-            taken as relative from the application base 
-            directory.
-            </para>
-            </remarks>
-        </member>
-        <member name="F:log4net.Appender.SmtpPickupDirAppender.m_securityContext">
-            <summary>
-            The security context to use for privileged calls
-            </summary>
-        </member>
-        <member name="P:log4net.Appender.SmtpPickupDirAppender.To">
-            <summary>
-            Gets or sets a semicolon-delimited list of recipient e-mail addresses.
-            </summary>
-            <value>
-            A semicolon-delimited list of e-mail addresses.
-            </value>
-            <remarks>
-            <para>
-            A semicolon-delimited list of e-mail addresses.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Appender.SmtpPickupDirAppender.From">
-            <summary>
-            Gets or sets the e-mail address of the sender.
-            </summary>
-            <value>
-            The e-mail address of the sender.
-            </value>
-            <remarks>
-            <para>
-            The e-mail address of the sender.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Appender.SmtpPickupDirAppender.Subject">
-            <summary>
-            Gets or sets the subject line of the e-mail message.
-            </summary>
-            <value>
-            The subject line of the e-mail message.
-            </value>
-            <remarks>
-            <para>
-            The subject line of the e-mail message.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Appender.SmtpPickupDirAppender.PickupDir">
-            <summary>
-            Gets or sets the path to write the messages to.
-            </summary>
-            <remarks>
-            <para>
-            Gets or sets the path to write the messages to. This should be the same
-            as that used by the agent sending the messages.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Appender.SmtpPickupDirAppender.SecurityContext">
-            <summary>
-            Gets or sets the <see cref="P:log4net.Appender.SmtpPickupDirAppender.SecurityContext"/> used to write to the pickup directory.
-            </summary>
-            <value>
-            The <see cref="P:log4net.Appender.SmtpPickupDirAppender.SecurityContext"/> used to write to the pickup directory.
-            </value>
-            <remarks>
-            <para>
-            Unless a <see cref="P:log4net.Appender.SmtpPickupDirAppender.SecurityContext"/> specified here for this appender
-            the <see cref="P:log4net.Core.SecurityContextProvider.DefaultProvider"/> is queried for the
-            security context to use. The default behavior is to use the security context
-            of the current thread.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Appender.SmtpPickupDirAppender.RequiresLayout">
-            <summary>
-            This appender requires a <see cref="N:log4net.Layout"/> to be set.
-            </summary>
-            <value><c>true</c></value>
-            <remarks>
-            <para>
-            This appender requires a <see cref="N:log4net.Layout"/> to be set.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Appender.TelnetAppender">
-            <summary>
-            Appender that allows clients to connect via Telnet to receive log messages
-            </summary>
-            <remarks>	
-            <para>
-            The TelnetAppender accepts socket connections and streams logging messages
-            back to the client.  
-            The output is provided in a telnet-friendly way so that a log can be monitored 
-            over a TCP/IP socket.
-            This allows simple remote monitoring of application logging.
-            </para>
-            <para>
-            The default <see cref="P:log4net.Appender.TelnetAppender.Port"/> is 23 (the telnet port).
-            </para>
-            </remarks>
-            <author>Keith Long</author>
-            <author>Nicko Cadell</author>
-        </member>
-        <member name="M:log4net.Appender.TelnetAppender.#ctor">
-            <summary>
-            Default constructor
-            </summary>
-            <remarks>
-            <para>
-            Default constructor
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.TelnetAppender.OnClose">
-            <summary>
-            Overrides the parent method to close the socket handler
-            </summary>
-            <remarks>
-            <para>
-            Closes all the outstanding connections.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.TelnetAppender.ActivateOptions">
-            <summary>
-            Initialize the appender based on the options set.
-            </summary>
-            <remarks>
-            <para>
-            This is part of the <see cref="T:log4net.Core.IOptionHandler"/> delayed object
-            activation scheme. The <see cref="M:log4net.Appender.TelnetAppender.ActivateOptions"/> method must 
-            be called on this object after the configuration properties have
-            been set. Until <see cref="M:log4net.Appender.TelnetAppender.ActivateOptions"/> is called this
-            object is in an undefined state and must not be used. 
-            </para>
-            <para>
-            If any of the configuration properties are modified then 
-            <see cref="M:log4net.Appender.TelnetAppender.ActivateOptions"/> must be called again.
-            </para>
-            <para>
-            Create the socket handler and wait for connections
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.TelnetAppender.Append(log4net.Core.LoggingEvent)">
-            <summary>
-            Writes the logging event to each connected client.
-            </summary>
-            <param name="loggingEvent">The event to log.</param>
-            <remarks>
-            <para>
-            Writes the logging event to each connected client.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Appender.TelnetAppender.Port">
-            <summary>
-            Gets or sets the TCP port number on which this <see cref="T:log4net.Appender.TelnetAppender"/> will listen for connections.
-            </summary>
-            <value>
-            An integer value in the range <see cref="F:System.Net.IPEndPoint.MinPort"/> to <see cref="F:System.Net.IPEndPoint.MaxPort"/> 
-            indicating the TCP port number on which this <see cref="T:log4net.Appender.TelnetAppender"/> will listen for connections.
-            </value>
-            <remarks>
-            <para>
-            The default value is 23 (the telnet port).
-            </para>
-            </remarks>
-            <exception cref="T:System.ArgumentOutOfRangeException">The value specified is less than <see cref="F:System.Net.IPEndPoint.MinPort"/> 
-            or greater than <see cref="F:System.Net.IPEndPoint.MaxPort"/>.</exception>
-        </member>
-        <member name="P:log4net.Appender.TelnetAppender.RequiresLayout">
-            <summary>
-            This appender requires a <see cref="N:log4net.Layout"/> to be set.
-            </summary>
-            <value><c>true</c></value>
-            <remarks>
-            <para>
-            This appender requires a <see cref="N:log4net.Layout"/> to be set.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Appender.TelnetAppender.SocketHandler">
-            <summary>
-            Helper class to manage connected clients
-            </summary>
-            <remarks>
-            <para>
-            The SocketHandler class is used to accept connections from
-            clients.  It is threaded so that clients can connect/disconnect
-            asynchronously.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.TelnetAppender.SocketHandler.#ctor(System.Int32)">
-            <summary>
-            Opens a new server port on <paramref ref="port"/>
-            </summary>
-            <param name="port">the local port to listen on for connections</param>
-            <remarks>
-            <para>
-            Creates a socket handler on the specified local server port.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.TelnetAppender.SocketHandler.Send(System.String)">
-            <summary>
-            Sends a string message to each of the connected clients
-            </summary>
-            <param name="message">the text to send</param>
-            <remarks>
-            <para>
-            Sends a string message to each of the connected clients
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.TelnetAppender.SocketHandler.AddClient(log4net.Appender.TelnetAppender.SocketHandler.SocketClient)">
-            <summary>
-            Add a client to the internal clients list
-            </summary>
-            <param name="client">client to add</param>
-        </member>
-        <member name="M:log4net.Appender.TelnetAppender.SocketHandler.RemoveClient(log4net.Appender.TelnetAppender.SocketHandler.SocketClient)">
-            <summary>
-            Remove a client from the internal clients list
-            </summary>
-            <param name="client">client to remove</param>
-        </member>
-        <member name="M:log4net.Appender.TelnetAppender.SocketHandler.OnConnect(System.IAsyncResult)">
-            <summary>
-            Callback used to accept a connection on the server socket
-            </summary>
-            <param name="asyncResult">The result of the asynchronous operation</param>
-            <remarks>
-            <para>
-            On connection adds to the list of connections 
-            if there are two many open connections you will be disconnected
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.TelnetAppender.SocketHandler.Dispose">
-            <summary>
-            Close all network connections
-            </summary>
-            <remarks>
-            <para>
-            Make sure we close all network connections
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Appender.TelnetAppender.SocketHandler.HasConnections">
-            <summary>
-            Test if this handler has active connections
-            </summary>
-            <value>
-            <c>true</c> if this handler has active connections
-            </value>
-            <remarks>
-            <para>
-            This property will be <c>true</c> while this handler has
-            active connections, that is at least one connection that 
-            the handler will attempt to send a message to.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Appender.TelnetAppender.SocketHandler.SocketClient">
-            <summary>
-            Class that represents a client connected to this handler
-            </summary>
-            <remarks>
-            <para>
-            Class that represents a client connected to this handler
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.TelnetAppender.SocketHandler.SocketClient.#ctor(System.Net.Sockets.Socket)">
-            <summary>
-            Create this <see cref="T:log4net.Appender.TelnetAppender.SocketHandler.SocketClient"/> for the specified <see cref="T:System.Net.Sockets.Socket"/>
-            </summary>
-            <param name="socket">the client's socket</param>
-            <remarks>
-            <para>
-            Opens a stream writer on the socket.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.TelnetAppender.SocketHandler.SocketClient.Send(System.String)">
-            <summary>
-            Write a string to the client
-            </summary>
-            <param name="message">string to send</param>
-            <remarks>
-            <para>
-            Write a string to the client
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.TelnetAppender.SocketHandler.SocketClient.Dispose">
-            <summary>
-            Cleanup the clients connection
-            </summary>
-            <remarks>
-            <para>
-            Close the socket connection.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Appender.TraceAppender">
-            <summary>
-            Appends log events to the <see cref="T:System.Diagnostics.Trace"/> system.
-            </summary>
-            <remarks>
-            <para>
-            The application configuration file can be used to control what listeners 
-            are actually used. See the MSDN documentation for the 
-            <see cref="T:System.Diagnostics.Trace"/> class for details on configuring the
-            trace system.
-            </para>
-            <para>
-            Events are written using the <c>System.Diagnostics.Trace.Write(string,string)</c>
-            method. The event's logger name is passed as the value for the category name to the Write method.
-            </para>
-            <para>
-            <b>Compact Framework</b><br/>
-            The Compact Framework does not support the <see cref="T:System.Diagnostics.Trace"/>
-            class for any operation except <c>Assert</c>. When using the Compact Framework this
-            appender will write to the <see cref="T:System.Diagnostics.Debug"/> system rather than
-            the Trace system. This appender will therefore behave like the <see cref="T:log4net.Appender.DebugAppender"/>.
-            </para>
-            </remarks>
-            <author>Douglas de la Torre</author>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-        </member>
-        <member name="M:log4net.Appender.TraceAppender.#ctor">
-            <summary>
-            Initializes a new instance of the <see cref="T:log4net.Appender.TraceAppender"/>.
-            </summary>
-            <remarks>
-            <para>
-            Default constructor.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.TraceAppender.#ctor(log4net.Layout.ILayout)">
-            <summary>
-            Initializes a new instance of the <see cref="T:log4net.Appender.TraceAppender"/> 
-            with a specified layout.
-            </summary>
-            <param name="layout">The layout to use with this appender.</param>
-            <remarks>
-            <para>
-            Obsolete constructor.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Appender.TraceAppender.Append(log4net.Core.LoggingEvent)">
-            <summary>
-            Writes the logging event to the <see cref="T:System.Diagnostics.Trace"/> system.
-            </summary>
-            <param name="loggingEvent">The event to log.</param>
-            <remarks>
-            <para>
-            Writes the logging event to the <see cref="T:System.Diagnostics.Trace"/> system.
-            </para>
-            </remarks>
-        </member>
-        <member name="F:log4net.Appender.TraceAppender.m_immediateFlush">
-            <summary>
-            Immediate flush means that the underlying writer or output stream
-            will be flushed at the end of each append operation.
-            </summary>
-            <remarks>
-            <para>
-            Immediate flush is slower but ensures that each append request is 
-            actually written. If <see cref="P:log4net.Appender.TraceAppender.ImmediateFlush"/> is set to
-            <c>false</c>, then there is a good chance that the last few
-            logs events are not actually written to persistent media if and
-            when the application crashes.
-            </para>
-            <para>
-            The default value is <c>true</c>.</para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Appender.TraceAppender.ImmediateFlush">
-            <summary>
-            Gets or sets a value that indicates whether the appender will 
-            flush at the end of each write.
-            </summary>
-            <remarks>
-            <para>The default behavior is to flush at the end of each 
-            write. If the option is set to<c>false</c>, then the underlying 
-            stream can defer writing to physical medium to a later time. 
-            </para>
-            <para>
-            Avoiding the flush operation at the end of each append results 
-            in a performance gain of 10 to 20 percent. However, there is safety
-            trade-off involved in skipping flushing. Indeed, when flushing is
-            skipped, then it is likely that the last few log events will not
-            be recorded on disk when the application exits. This is a high
-            price to pay even for a 20% performance gain.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Appender.TraceAppender.RequiresLayout">
-            <summary>
-            This appender requires a <see cref="N:log4net.Layout"/> to be set.
-            </summary>
-            <value><c>true</c></value>
-            <remarks>
-            <para>
-            This appender requires a <see cref="N:log4net.Layout"/> to be set.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Config.AliasDomainAttribute">
-            <summary>
-            Assembly level attribute that specifies a domain to alias to this assembly's repository.
-            </summary>
-            <remarks>
-            <para>
-            <b>AliasDomainAttribute is obsolete. Use AliasRepositoryAttribute instead of AliasDomainAttribute.</b>
-            </para>
-            <para>
-            An assembly's logger repository is defined by its <see cref="T:log4net.Config.DomainAttribute"/>,
-            however this can be overridden by an assembly loaded before the target assembly.
-            </para>
-            <para>
-            An assembly can alias another assembly's domain to its repository by
-            specifying this attribute with the name of the target domain.
-            </para>
-            <para>
-            This attribute can only be specified on the assembly and may be used
-            as many times as necessary to alias all the required domains.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-        </member>
-        <member name="T:log4net.Config.AliasRepositoryAttribute">
-            <summary>
-            Assembly level attribute that specifies a repository to alias to this assembly's repository.
-            </summary>
-            <remarks>
-            <para>
-            An assembly's logger repository is defined by its <see cref="T:log4net.Config.RepositoryAttribute"/>,
-            however this can be overridden by an assembly loaded before the target assembly.
-            </para>
-            <para>
-            An assembly can alias another assembly's repository to its repository by
-            specifying this attribute with the name of the target repository.
-            </para>
-            <para>
-            This attribute can only be specified on the assembly and may be used
-            as many times as necessary to alias all the required repositories.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-        </member>
-        <member name="M:log4net.Config.AliasRepositoryAttribute.#ctor(System.String)">
-            <summary>
-            Initializes a new instance of the <see cref="T:log4net.Config.AliasRepositoryAttribute"/> class with 
-            the specified repository to alias to this assembly's repository.
-            </summary>
-            <param name="name">The repository to alias to this assemby's repository.</param>
-            <remarks>
-            <para>
-            Initializes a new instance of the <see cref="T:log4net.Config.AliasRepositoryAttribute"/> class with 
-            the specified repository to alias to this assembly's repository.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Config.AliasRepositoryAttribute.Name">
-            <summary>
-            Gets or sets the repository to alias to this assemby's repository.
-            </summary>
-            <value>
-            The repository to alias to this assemby's repository.
-            </value>
-            <remarks>
-            <para>
-            The name of the repository to alias to this assemby's repository.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Config.AliasDomainAttribute.#ctor(System.String)">
-            <summary>
-            Initializes a new instance of the <see cref="T:log4net.Config.AliasDomainAttribute"/> class with 
-            the specified domain to alias to this assembly's repository.
-            </summary>
-            <param name="name">The domain to alias to this assemby's repository.</param>
-            <remarks>
-            <para>
-            Obsolete. Use <see cref="T:log4net.Config.AliasRepositoryAttribute"/> instead of <see cref="T:log4net.Config.AliasDomainAttribute"/>.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Config.BasicConfigurator">
-            <summary>
-            Use this class to quickly configure a <see cref="T:log4net.Repository.Hierarchy.Hierarchy"/>.
-            </summary>
-            <remarks>
-            <para>
-            Allows very simple programmatic configuration of log4net.
-            </para>
-            <para>
-            Only one appender can be configured using this configurator.
-            The appender is set at the root of the hierarchy and all logging
-            events will be delivered to that appender.
-            </para>
-            <para>
-            Appenders can also implement the <see cref="T:log4net.Core.IOptionHandler"/> interface. Therefore
-            they would require that the <see cref="M:log4net.Core.IOptionHandler.ActivateOptions"/> method
-            be called after the appenders properties have been configured.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-        </member>
-        <member name="M:log4net.Config.BasicConfigurator.#ctor">
-            <summary>
-            Initializes a new instance of the <see cref="T:log4net.Config.BasicConfigurator"/> class. 
-            </summary>
-            <remarks>
-            <para>
-            Uses a private access modifier to prevent instantiation of this class.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Config.BasicConfigurator.Configure">
-            <summary>
-            Initializes the log4net system with a default configuration.
-            </summary>
-            <remarks>
-            <para>
-            Initializes the log4net logging system using a <see cref="T:log4net.Appender.ConsoleAppender"/>
-            that will write to <c>Console.Out</c>. The log messages are
-            formatted using the <see cref="T:log4net.Layout.PatternLayout"/> layout object
-            with the <see cref="F:log4net.Layout.PatternLayout.DetailConversionPattern"/>
-            layout style.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Config.BasicConfigurator.Configure(log4net.Appender.IAppender)">
-            <summary>
-            Initializes the log4net system using the specified appender.
-            </summary>
-            <param name="appender">The appender to use to log all logging events.</param>
-            <remarks>
-            <para>
-            Initializes the log4net system using the specified appender.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Config.BasicConfigurator.Configure(log4net.Repository.ILoggerRepository)">
-            <summary>
-            Initializes the <see cref="T:log4net.Repository.ILoggerRepository"/> with a default configuration.
-            </summary>
-            <param name="repository">The repository to configure.</param>
-            <remarks>
-            <para>
-            Initializes the specified repository using a <see cref="T:log4net.Appender.ConsoleAppender"/>
-            that will write to <c>Console.Out</c>. The log messages are
-            formatted using the <see cref="T:log4net.Layout.PatternLayout"/> layout object
-            with the <see cref="F:log4net.Layout.PatternLayout.DetailConversionPattern"/>
-            layout style.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Config.BasicConfigurator.Configure(log4net.Repository.ILoggerRepository,log4net.Appender.IAppender)">
-            <summary>
-            Initializes the <see cref="T:log4net.Repository.ILoggerRepository"/> using the specified appender.
-            </summary>
-            <param name="repository">The repository to configure.</param>
-            <param name="appender">The appender to use to log all logging events.</param>
-            <remarks>
-            <para>
-            Initializes the <see cref="T:log4net.Repository.ILoggerRepository"/> using the specified appender.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Config.ConfiguratorAttribute">
-            <summary>
-            Base class for all log4net configuration attributes.
-            </summary>
-            <remarks>
-            This is an abstract class that must be extended by 
-            specific configurators. This attribute allows the
-            configurator to be parameterized by an assembly level
-            attribute.
-            </remarks>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-        </member>
-        <member name="M:log4net.Config.ConfiguratorAttribute.#ctor(System.Int32)">
-            <summary>
-            Constructor used by subclasses.
-            </summary>
-            <param name="priority">the ordering priority for this configurator</param>
-            <remarks>
-            <para>
-            The <paramref name="priority"/> is used to order the configurator
-            attributes before they are invoked. Higher priority configurators are executed
-            before lower priority ones.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Config.ConfiguratorAttribute.Configure(System.Reflection.Assembly,log4net.Repository.ILoggerRepository)">
-            <summary>
-            Configures the <see cref="T:log4net.Repository.ILoggerRepository"/> for the specified assembly.
-            </summary>
-            <param name="sourceAssembly">The assembly that this attribute was defined on.</param>
-            <param name="targetRepository">The repository to configure.</param>
-            <remarks>
-            <para>
-            Abstract method implemented by a subclass. When this method is called
-            the subclass should configure the <paramref name="targetRepository"/>.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Config.ConfiguratorAttribute.CompareTo(System.Object)">
-            <summary>
-            Compare this instance to another ConfiguratorAttribute
-            </summary>
-            <param name="obj">the object to compare to</param>
-            <returns>see <see cref="M:System.IComparable.CompareTo(System.Object)"/></returns>
-            <remarks>
-            <para>
-            Compares the priorities of the two <see cref="T:log4net.Config.ConfiguratorAttribute"/> instances.
-            Sorts by priority in descending order. Objects with the same priority are
-            randomly ordered.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Config.DomainAttribute">
-            <summary>
-            Assembly level attribute that specifies the logging domain for the assembly.
-            </summary>
-            <remarks>
-            <para>
-            <b>DomainAttribute is obsolete. Use RepositoryAttribute instead of DomainAttribute.</b>
-            </para>
-            <para>
-            Assemblies are mapped to logging domains. Each domain has its own
-            logging repository. This attribute specified on the assembly controls
-            the configuration of the domain. The <see cref="P:log4net.Config.RepositoryAttribute.Name"/> property specifies the name
-            of the domain that this assembly is a part of. The <see cref="P:log4net.Config.RepositoryAttribute.RepositoryType"/>
-            specifies the type of the repository objects to create for the domain. If 
-            this attribute is not specified and a <see cref="P:log4net.Config.RepositoryAttribute.Name"/> is not specified
-            then the assembly will be part of the default shared logging domain.
-            </para>
-            <para>
-            This attribute can only be specified on the assembly and may only be used
-            once per assembly.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-        </member>
-        <member name="T:log4net.Config.RepositoryAttribute">
-            <summary>
-            Assembly level attribute that specifies the logging repository for the assembly.
-            </summary>
-            <remarks>
-            <para>
-            Assemblies are mapped to logging repository. This attribute specified 
-            on the assembly controls
-            the configuration of the repository. The <see cref="P:log4net.Config.RepositoryAttribute.Name"/> property specifies the name
-            of the repository that this assembly is a part of. The <see cref="P:log4net.Config.RepositoryAttribute.RepositoryType"/>
-            specifies the type of the <see cref="T:log4net.Repository.ILoggerRepository"/> object 
-            to create for the assembly. If this attribute is not specified or a <see cref="P:log4net.Config.RepositoryAttribute.Name"/> 
-            is not specified then the assembly will be part of the default shared logging repository.
-            </para>
-            <para>
-            This attribute can only be specified on the assembly and may only be used
-            once per assembly.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-        </member>
-        <member name="M:log4net.Config.RepositoryAttribute.#ctor">
-            <summary>
-            Initializes a new instance of the <see cref="T:log4net.Config.RepositoryAttribute"/> class.
-            </summary>
-            <remarks>
-            <para>
-            Default constructor.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Config.RepositoryAttribute.#ctor(System.String)">
-            <summary>
-            Initialize a new instance of the <see cref="T:log4net.Config.RepositoryAttribute"/> class 
-            with the name of the repository.
-            </summary>
-            <param name="name">The name of the repository.</param>
-            <remarks>
-            <para>
-            Initialize the attribute with the name for the assembly's repository.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Config.RepositoryAttribute.Name">
-            <summary>
-            Gets or sets the name of the logging repository.
-            </summary>
-            <value>
-            The string name to use as the name of the repository associated with this
-            assembly.
-            </value>
-            <remarks>
-            <para>
-            This value does not have to be unique. Several assemblies can share the
-            same repository. They will share the logging configuration of the repository.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Config.RepositoryAttribute.RepositoryType">
-            <summary>
-            Gets or sets the type of repository to create for this assembly.
-            </summary>
-            <value>
-            The type of repository to create for this assembly.
-            </value>
-            <remarks>
-            <para>
-            The type of the repository to create for the assembly.
-            The type must implement the <see cref="T:log4net.Repository.ILoggerRepository"/>
-            interface.
-            </para>
-            <para>
-            This will be the type of repository created when 
-            the repository is created. If multiple assemblies reference the
-            same repository then the repository is only created once using the
-            <see cref="P:log4net.Config.RepositoryAttribute.RepositoryType"/> of the first assembly to call into the 
-            repository.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Config.DomainAttribute.#ctor">
-            <summary>
-            Initializes a new instance of the <see cref="T:log4net.Config.DomainAttribute"/> class.
-            </summary>
-            <remarks>
-            <para>
-            Obsolete. Use RepositoryAttribute instead of DomainAttribute.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Config.DomainAttribute.#ctor(System.String)">
-            <summary>
-            Initialize a new instance of the <see cref="T:log4net.Config.DomainAttribute"/> class 
-            with the name of the domain.
-            </summary>
-            <param name="name">The name of the domain.</param>
-            <remarks>
-            <para>
-            Obsolete. Use RepositoryAttribute instead of DomainAttribute.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Config.DOMConfigurator">
-            <summary>
-            Use this class to initialize the log4net environment using an Xml tree.
-            </summary>
-            <remarks>
-            <para>
-            <b>DOMConfigurator is obsolete. Use XmlConfigurator instead of DOMConfigurator.</b>
-            </para>
-            <para>
-            Configures a <see cref="T:log4net.Repository.ILoggerRepository"/> using an Xml tree.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-        </member>
-        <member name="M:log4net.Config.DOMConfigurator.#ctor">
-            <summary>
-            Private constructor
-            </summary>
-        </member>
-        <member name="M:log4net.Config.DOMConfigurator.Configure">
-            <summary>
-            Automatically configures the log4net system based on the 
-            application's configuration settings.
-            </summary>
-            <remarks>
-            <para>
-            <b>DOMConfigurator is obsolete. Use XmlConfigurator instead of DOMConfigurator.</b>
-            </para>
-            Each application has a configuration file. This has the
-            same name as the application with '.config' appended.
-            This file is XML and calling this function prompts the
-            configurator to look in that file for a section called
-            <c>log4net</c> that contains the configuration data.
-            </remarks>
-        </member>
-        <member name="M:log4net.Config.DOMConfigurator.Configure(log4net.Repository.ILoggerRepository)">
-            <summary>
-            Automatically configures the <see cref="T:log4net.Repository.ILoggerRepository"/> using settings
-            stored in the application's configuration file.
-            </summary>
-            <remarks>
-            <para>
-            <b>DOMConfigurator is obsolete. Use XmlConfigurator instead of DOMConfigurator.</b>
-            </para>
-            Each application has a configuration file. This has the
-            same name as the application with '.config' appended.
-            This file is XML and calling this function prompts the
-            configurator to look in that file for a section called
-            <c>log4net</c> that contains the configuration data.
-            </remarks>
-            <param name="repository">The repository to configure.</param>
-        </member>
-        <member name="M:log4net.Config.DOMConfigurator.Configure(System.Xml.XmlElement)">
-            <summary>
-            Configures log4net using a <c>log4net</c> element
-            </summary>
-            <remarks>
-            <para>
-            <b>DOMConfigurator is obsolete. Use XmlConfigurator instead of DOMConfigurator.</b>
-            </para>
-            Loads the log4net configuration from the XML element
-            supplied as <paramref name="element"/>.
-            </remarks>
-            <param name="element">The element to parse.</param>
-        </member>
-        <member name="M:log4net.Config.DOMConfigurator.Configure(log4net.Repository.ILoggerRepository,System.Xml.XmlElement)">
-            <summary>
-            Configures the <see cref="T:log4net.Repository.ILoggerRepository"/> using the specified XML 
-            element.
-            </summary>
-            <remarks>
-            <para>
-            <b>DOMConfigurator is obsolete. Use XmlConfigurator instead of DOMConfigurator.</b>
-            </para>
-            Loads the log4net configuration from the XML element
-            supplied as <paramref name="element"/>.
-            </remarks>
-            <param name="repository">The repository to configure.</param>
-            <param name="element">The element to parse.</param>
-        </member>
-        <member name="M:log4net.Config.DOMConfigurator.Configure(System.IO.FileInfo)">
-            <summary>
-            Configures log4net using the specified configuration file.
-            </summary>
-            <param name="configFile">The XML file to load the configuration from.</param>
-            <remarks>
-            <para>
-            <b>DOMConfigurator is obsolete. Use XmlConfigurator instead of DOMConfigurator.</b>
-            </para>
-            <para>
-            The configuration file must be valid XML. It must contain
-            at least one element called <c>log4net</c> that holds
-            the log4net configuration data.
-            </para>
-            <para>
-            The log4net configuration file can possible be specified in the application's
-            configuration file (either <c>MyAppName.exe.config</c> for a
-            normal application on <c>Web.config</c> for an ASP.NET application).
-            </para>
-            <example>
-            The following example configures log4net using a configuration file, of which the 
-            location is stored in the application's configuration file :
-            </example>
-            <code lang="C#">
-            using log4net.Config;
-            using System.IO;
-            using System.Configuration;
-            
-            ...
-            
-            DOMConfigurator.Configure(new FileInfo(ConfigurationSettings.AppSettings["log4net-config-file"]));
-            </code>
-            <para>
-            In the <c>.config</c> file, the path to the log4net can be specified like this :
-            </para>
-            <code lang="XML" escaped="true">
-            <configuration>
-            	<appSettings>
-            		<add key="log4net-config-file" value="log.config"/>
-            	</appSettings>
-            </configuration>
-            </code>
-            </remarks>
-        </member>
-        <member name="M:log4net.Config.DOMConfigurator.Configure(System.IO.Stream)">
-            <summary>
-            Configures log4net using the specified configuration file.
-            </summary>
-            <param name="configStream">A stream to load the XML configuration from.</param>
-            <remarks>
-            <para>
-            <b>DOMConfigurator is obsolete. Use XmlConfigurator instead of DOMConfigurator.</b>
-            </para>
-            <para>
-            The configuration data must be valid XML. It must contain
-            at least one element called <c>log4net</c> that holds
-            the log4net configuration data.
-            </para>
-            <para>
-            Note that this method will NOT close the stream parameter.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Config.DOMConfigurator.Configure(log4net.Repository.ILoggerRepository,System.IO.FileInfo)">
-            <summary>
-            Configures the <see cref="T:log4net.Repository.ILoggerRepository"/> using the specified configuration 
-            file.
-            </summary>
-            <param name="repository">The repository to configure.</param>
-            <param name="configFile">The XML file to load the configuration from.</param>
-            <remarks>
-            <para>
-            <b>DOMConfigurator is obsolete. Use XmlConfigurator instead of DOMConfigurator.</b>
-            </para>
-            <para>
-            The configuration file must be valid XML. It must contain
-            at least one element called <c>log4net</c> that holds
-            the configuration data.
-            </para>
-            <para>
-            The log4net configuration file can possible be specified in the application's
-            configuration file (either <c>MyAppName.exe.config</c> for a
-            normal application on <c>Web.config</c> for an ASP.NET application).
-            </para>
-            <example>
-            The following example configures log4net using a configuration file, of which the 
-            location is stored in the application's configuration file :
-            </example>
-            <code lang="C#">
-            using log4net.Config;
-            using System.IO;
-            using System.Configuration;
-            
-            ...
-            
-            DOMConfigurator.Configure(new FileInfo(ConfigurationSettings.AppSettings["log4net-config-file"]));
-            </code>
-            <para>
-            In the <c>.config</c> file, the path to the log4net can be specified like this :
-            </para>
-            <code lang="XML" escaped="true">
-            <configuration>
-            	<appSettings>
-            		<add key="log4net-config-file" value="log.config"/>
-            	</appSettings>
-            </configuration>
-            </code>
-            </remarks>
-        </member>
-        <member name="M:log4net.Config.DOMConfigurator.Configure(log4net.Repository.ILoggerRepository,System.IO.Stream)">
-            <summary>
-            Configures the <see cref="T:log4net.Repository.ILoggerRepository"/> using the specified configuration 
-            file.
-            </summary>
-            <param name="repository">The repository to configure.</param>
-            <param name="configStream">The stream to load the XML configuration from.</param>
-            <remarks>
-            <para>
-            <b>DOMConfigurator is obsolete. Use XmlConfigurator instead of DOMConfigurator.</b>
-            </para>
-            <para>
-            The configuration data must be valid XML. It must contain
-            at least one element called <c>log4net</c> that holds
-            the configuration data.
-            </para>
-            <para>
-            Note that this method will NOT close the stream parameter.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Config.DOMConfigurator.ConfigureAndWatch(System.IO.FileInfo)">
-            <summary>
-            Configures log4net using the file specified, monitors the file for changes 
-            and reloads the configuration if a change is detected.
-            </summary>
-            <param name="configFile">The XML file to load the configuration from.</param>
-            <remarks>
-            <para>
-            <b>DOMConfigurator is obsolete. Use XmlConfigurator instead of DOMConfigurator.</b>
-            </para>
-            <para>
-            The configuration file must be valid XML. It must contain
-            at least one element called <c>log4net</c> that holds
-            the configuration data.
-            </para>
-            <para>
-            The configuration file will be monitored using a <see cref="T:System.IO.FileSystemWatcher"/>
-            and depends on the behavior of that class.
-            </para>
-            <para>
-            For more information on how to configure log4net using
-            a separate configuration file, see <see cref="M:log4net.Config.DOMConfigurator.Configure(System.IO.FileInfo)"/>.
-            </para>
-            </remarks>
-            <seealso cref="M:log4net.Config.DOMConfigurator.Configure(System.IO.FileInfo)"/>
-        </member>
-        <member name="M:log4net.Config.DOMConfigurator.ConfigureAndWatch(log4net.Repository.ILoggerRepository,System.IO.FileInfo)">
-            <summary>
-            Configures the <see cref="T:log4net.Repository.ILoggerRepository"/> using the file specified, 
-            monitors the file for changes and reloads the configuration if a change 
-            is detected.
-            </summary>
-            <param name="repository">The repository to configure.</param>
-            <param name="configFile">The XML file to load the configuration from.</param>
-            <remarks>
-            <para>
-            <b>DOMConfigurator is obsolete. Use XmlConfigurator instead of DOMConfigurator.</b>
-            </para>
-            <para>
-            The configuration file must be valid XML. It must contain
-            at least one element called <c>log4net</c> that holds
-            the configuration data.
-            </para>
-            <para>
-            The configuration file will be monitored using a <see cref="T:System.IO.FileSystemWatcher"/>
-            and depends on the behavior of that class.
-            </para>
-            <para>
-            For more information on how to configure log4net using
-            a separate configuration file, see <see cref="M:log4net.Config.DOMConfigurator.Configure(System.IO.FileInfo)"/>.
-            </para>
-            </remarks>
-            <seealso cref="M:log4net.Config.DOMConfigurator.Configure(System.IO.FileInfo)"/>
-        </member>
-        <member name="T:log4net.Config.DOMConfiguratorAttribute">
-            <summary>
-            Assembly level attribute to configure the <see cref="T:log4net.Config.XmlConfigurator"/>.
-            </summary>
-            <remarks>
-            <para>
-            <b>AliasDomainAttribute is obsolete. Use AliasRepositoryAttribute instead of AliasDomainAttribute.</b>
-            </para>
-            <para>
-            This attribute may only be used at the assembly scope and can only
-            be used once per assembly.
-            </para>
-            <para>
-            Use this attribute to configure the <see cref="T:log4net.Config.XmlConfigurator"/>
-            without calling one of the <see cref="M:log4net.Config.XmlConfigurator.Configure"/>
-            methods.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-        </member>
-        <member name="T:log4net.Config.XmlConfiguratorAttribute">
-            <summary>
-            Assembly level attribute to configure the <see cref="T:log4net.Config.XmlConfigurator"/>.
-            </summary>
-            <remarks>
-            <para>
-            This attribute may only be used at the assembly scope and can only
-            be used once per assembly.
-            </para>
-            <para>
-            Use this attribute to configure the <see cref="T:log4net.Config.XmlConfigurator"/>
-            without calling one of the <see cref="M:log4net.Config.XmlConfigurator.Configure"/>
-            methods.
-            </para>
-            <para>
-            If neither of the <see cref="P:log4net.Config.XmlConfiguratorAttribute.ConfigFile"/> or <see cref="P:log4net.Config.XmlConfiguratorAttribute.ConfigFileExtension"/>
-            properties are set the configuration is loaded from the application's .config file.
-            If set the <see cref="P:log4net.Config.XmlConfiguratorAttribute.ConfigFile"/> property takes priority over the
-            <see cref="P:log4net.Config.XmlConfiguratorAttribute.ConfigFileExtension"/> property. The <see cref="P:log4net.Config.XmlConfiguratorAttribute.ConfigFile"/> property
-            specifies a path to a file to load the config from. The path is relative to the
-            application's base directory; <see cref="P:System.AppDomain.BaseDirectory"/>.
-            The <see cref="P:log4net.Config.XmlConfiguratorAttribute.ConfigFileExtension"/> property is used as a postfix to the assembly file name.
-            The config file must be located in the  application's base directory; <see cref="P:System.AppDomain.BaseDirectory"/>.
-            For example in a console application setting the <see cref="P:log4net.Config.XmlConfiguratorAttribute.ConfigFileExtension"/> to
-            <c>config</c> has the same effect as not specifying the <see cref="P:log4net.Config.XmlConfiguratorAttribute.ConfigFile"/> or 
-            <see cref="P:log4net.Config.XmlConfiguratorAttribute.ConfigFileExtension"/> properties.
-            </para>
-            <para>
-            The <see cref="P:log4net.Config.XmlConfiguratorAttribute.Watch"/> property can be set to cause the <see cref="T:log4net.Config.XmlConfigurator"/>
-            to watch the configuration file for changes.
-            </para>
-            <note>
-            <para>
-            Log4net will only look for assembly level configuration attributes once.
-            When using the log4net assembly level attributes to control the configuration 
-            of log4net you must ensure that the first call to any of the 
-            <see cref="T:log4net.Core.LoggerManager"/> methods is made from the assembly with the configuration
-            attributes. 
-            </para>
-            <para>
-            If you cannot guarantee the order in which log4net calls will be made from 
-            different assemblies you must use programmatic configuration instead, i.e.
-            call the <see cref="M:log4net.Config.XmlConfigurator.Configure"/> method directly.
-            </para>
-            </note>
-            </remarks>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-        </member>
-        <member name="M:log4net.Config.XmlConfiguratorAttribute.#ctor">
-            <summary>
-            Default constructor
-            </summary>
-            <remarks>
-            <para>
-            Default constructor
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Config.XmlConfiguratorAttribute.Configure(System.Reflection.Assembly,log4net.Repository.ILoggerRepository)">
-            <summary>
-            Configures the <see cref="T:log4net.Repository.ILoggerRepository"/> for the specified assembly.
-            </summary>
-            <param name="sourceAssembly">The assembly that this attribute was defined on.</param>
-            <param name="targetRepository">The repository to configure.</param>
-            <remarks>
-            <para>
-            Configure the repository using the <see cref="T:log4net.Config.XmlConfigurator"/>.
-            The <paramref name="targetRepository"/> specified must extend the <see cref="T:log4net.Repository.Hierarchy.Hierarchy"/>
-            class otherwise the <see cref="T:log4net.Config.XmlConfigurator"/> will not be able to
-            configure it.
-            </para>
-            </remarks>
-            <exception cref="T:System.ArgumentOutOfRangeException">The <paramref name="repository"/> does not extend <see cref="T:log4net.Repository.Hierarchy.Hierarchy"/>.</exception>
-        </member>
-        <member name="M:log4net.Config.XmlConfiguratorAttribute.ConfigureFromFile(System.Reflection.Assembly,log4net.Repository.ILoggerRepository)">
-            <summary>
-            Attempt to load configuration from the local file system
-            </summary>
-            <param name="sourceAssembly">The assembly that this attribute was defined on.</param>
-            <param name="targetRepository">The repository to configure.</param>
-        </member>
-        <member name="M:log4net.Config.XmlConfiguratorAttribute.ConfigureFromFile(log4net.Repository.ILoggerRepository,System.IO.FileInfo)">
-            <summary>
-            Configure the specified repository using a <see cref="T:System.IO.FileInfo"/>
-            </summary>
-            <param name="targetRepository">The repository to configure.</param>
-            <param name="configFile">the FileInfo pointing to the config file</param>
-        </member>
-        <member name="M:log4net.Config.XmlConfiguratorAttribute.ConfigureFromUri(System.Reflection.Assembly,log4net.Repository.ILoggerRepository)">
-            <summary>
-            Attempt to load configuration from a URI
-            </summary>
-            <param name="sourceAssembly">The assembly that this attribute was defined on.</param>
-            <param name="targetRepository">The repository to configure.</param>
-        </member>
-        <member name="P:log4net.Config.XmlConfiguratorAttribute.ConfigFile">
-            <summary>
-            Gets or sets the filename of the configuration file.
-            </summary>
-            <value>
-            The filename of the configuration file.
-            </value>
-            <remarks>
-            <para>
-            If specified, this is the name of the configuration file to use with
-            the <see cref="T:log4net.Config.XmlConfigurator"/>. This file path is relative to the
-            <b>application base</b> directory (<see cref="P:System.AppDomain.BaseDirectory"/>).
-            </para>
-            <para>
-            The <see cref="P:log4net.Config.XmlConfiguratorAttribute.ConfigFile"/> takes priority over the <see cref="P:log4net.Config.XmlConfiguratorAttribute.ConfigFileExtension"/>.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Config.XmlConfiguratorAttribute.ConfigFileExtension">
-            <summary>
-            Gets or sets the extension of the configuration file.
-            </summary>
-            <value>
-            The extension of the configuration file.
-            </value>
-            <remarks>
-            <para>
-            If specified this is the extension for the configuration file.
-            The path to the config file is built by using the <b>application 
-            base</b> directory (<see cref="P:System.AppDomain.BaseDirectory"/>),
-            the <b>assembly file name</b> and the config file extension.
-            </para>
-            <para>
-            If the <see cref="P:log4net.Config.XmlConfiguratorAttribute.ConfigFileExtension"/> is set to <c>MyExt</c> then
-            possible config file names would be: <c>MyConsoleApp.exe.MyExt</c> or
-            <c>MyClassLibrary.dll.MyExt</c>.
-            </para>
-            <para>
-            The <see cref="P:log4net.Config.XmlConfiguratorAttribute.ConfigFile"/> takes priority over the <see cref="P:log4net.Config.XmlConfiguratorAttribute.ConfigFileExtension"/>.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Config.XmlConfiguratorAttribute.Watch">
-            <summary>
-            Gets or sets a value indicating whether to watch the configuration file.
-            </summary>
-            <value>
-            <c>true</c> if the configuration should be watched, <c>false</c> otherwise.
-            </value>
-            <remarks>
-            <para>
-            If this flag is specified and set to <c>true</c> then the framework
-            will watch the configuration file and will reload the config each time 
-            the file is modified.
-            </para>
-            <para>
-            The config file can only be watched if it is loaded from local disk.
-            In a No-Touch (Smart Client) deployment where the application is downloaded
-            from a web server the config file may not reside on the local disk
-            and therefore it may not be able to watch it.
-            </para>
-            <note>
-            Watching configuration is not supported on the SSCLI.
-            </note>
-            </remarks>
-        </member>
-        <member name="T:log4net.Config.Log4NetConfigurationSectionHandler">
-            <summary>
-            Class to register for the log4net section of the configuration file
-            </summary>
-            <remarks>
-            The log4net section of the configuration file needs to have a section
-            handler registered. This is the section handler used. It simply returns
-            the XML element that is the root of the section.
-            </remarks>
-            <example>
-            Example of registering the log4net section handler :
-            <code lang="XML" escaped="true">
-            <configuration>
-            	<configSections>
-            		<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net" />
-            	</configSections>
-            	<log4net>
-            		log4net configuration XML goes here
-            	</log4net>
-            </configuration>
-            </code>
-            </example>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-        </member>
-        <member name="M:log4net.Config.Log4NetConfigurationSectionHandler.#ctor">
-            <summary>
-            Initializes a new instance of the <see cref="T:log4net.Config.Log4NetConfigurationSectionHandler"/> class.
-            </summary>
-            <remarks>
-            <para>
-            Default constructor.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Config.Log4NetConfigurationSectionHandler.Create(System.Object,System.Object,System.Xml.XmlNode)">
-            <summary>
-            Parses the configuration section.
-            </summary>
-            <param name="parent">The configuration settings in a corresponding parent configuration section.</param>
-            <param name="configContext">The configuration context when called from the ASP.NET configuration system. Otherwise, this parameter is reserved and is a null reference.</param>
-            <param name="section">The <see cref="T:System.Xml.XmlNode"/> for the log4net section.</param>
-            <returns>The <see cref="T:System.Xml.XmlNode"/> for the log4net section.</returns>
-            <remarks>
-            <para>
-            Returns the <see cref="T:System.Xml.XmlNode"/> containing the configuration data,
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Config.PluginAttribute">
-            <summary>
-            Assembly level attribute that specifies a plugin to attach to 
-            the repository.
-            </summary>
-            <remarks>
-            <para>
-            Specifies the type of a plugin to create and attach to the
-            assembly's repository. The plugin type must implement the
-            <see cref="T:log4net.Plugin.IPlugin"/> interface.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-        </member>
-        <member name="T:log4net.Plugin.IPluginFactory">
-            <summary>
-            Interface used to create plugins.
-            </summary>
-            <remarks>
-            <para>
-            Interface used to create  a plugin.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-        </member>
-        <member name="M:log4net.Plugin.IPluginFactory.CreatePlugin">
-            <summary>
-            Creates the plugin object.
-            </summary>
-            <returns>the new plugin instance</returns>
-            <remarks>
-            <para>
-            Create and return a new plugin instance.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Config.PluginAttribute.#ctor(System.String)">
-            <summary>
-            Initializes a new instance of the <see cref="T:log4net.Config.PluginAttribute"/> class
-            with the specified type.
-            </summary>
-            <param name="typeName">The type name of plugin to create.</param>
-            <remarks>
-            <para>
-            Create the attribute with the plugin type specified.
-            </para>
-            <para>
-            Where possible use the constructor that takes a <see cref="T:System.Type"/>.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Config.PluginAttribute.#ctor(System.Type)">
-            <summary>
-            Initializes a new instance of the <see cref="T:log4net.Config.PluginAttribute"/> class
-            with the specified type.
-            </summary>
-            <param name="type">The type of plugin to create.</param>
-            <remarks>
-            <para>
-            Create the attribute with the plugin type specified.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Config.PluginAttribute.CreatePlugin">
-            <summary>
-            Creates the plugin object defined by this attribute.
-            </summary>
-            <remarks>
-            <para>
-            Creates the instance of the <see cref="T:log4net.Plugin.IPlugin"/> object as 
-            specified by this attribute.
-            </para>
-            </remarks>
-            <returns>The plugin object.</returns>
-        </member>
-        <member name="M:log4net.Config.PluginAttribute.ToString">
-            <summary>
-            Returns a representation of the properties of this object.
-            </summary>
-            <remarks>
-            <para>
-            Overrides base class <see cref="M:System.Object.ToString"/> method to 
-            return a representation of the properties of this object.
-            </para>
-            </remarks>
-            <returns>A representation of the properties of this object</returns>
-        </member>
-        <member name="P:log4net.Config.PluginAttribute.Type">
-            <summary>
-            Gets or sets the type for the plugin.
-            </summary>
-            <value>
-            The type for the plugin.
-            </value>
-            <remarks>
-            <para>
-            The type for the plugin.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Config.PluginAttribute.TypeName">
-            <summary>
-            Gets or sets the type name for the plugin.
-            </summary>
-            <value>
-            The type name for the plugin.
-            </value>
-            <remarks>
-            <para>
-            The type name for the plugin.
-            </para>
-            <para>
-            Where possible use the <see cref="P:log4net.Config.PluginAttribute.Type"/> property instead.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Config.SecurityContextProviderAttribute">
-            <summary>
-            Assembly level attribute to configure the <see cref="T:log4net.Core.SecurityContextProvider"/>.
-            </summary>
-            <remarks>
-            <para>
-            This attribute may only be used at the assembly scope and can only
-            be used once per assembly.
-            </para>
-            <para>
-            Use this attribute to configure the <see cref="T:log4net.Config.XmlConfigurator"/>
-            without calling one of the <see cref="M:log4net.Config.XmlConfigurator.Configure"/>
-            methods.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-        </member>
-        <member name="M:log4net.Config.SecurityContextProviderAttribute.#ctor(System.Type)">
-            <summary>
-            Construct provider attribute with type specified
-            </summary>
-            <param name="providerType">the type of the provider to use</param>
-            <remarks>
-            <para>
-            The provider specified must subclass the <see cref="T:log4net.Core.SecurityContextProvider"/>
-            class.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Config.SecurityContextProviderAttribute.Configure(System.Reflection.Assembly,log4net.Repository.ILoggerRepository)">
-            <summary>
-            Configures the SecurityContextProvider
-            </summary>
-            <param name="sourceAssembly">The assembly that this attribute was defined on.</param>
-            <param name="targetRepository">The repository to configure.</param>
-            <remarks>
-            <para>
-            Creates a provider instance from the <see cref="P:log4net.Config.SecurityContextProviderAttribute.ProviderType"/> specified.
-            Sets this as the default security context provider <see cref="P:log4net.Core.SecurityContextProvider.DefaultProvider"/>.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Config.SecurityContextProviderAttribute.ProviderType">
-            <summary>
-            Gets or sets the type of the provider to use.
-            </summary>
-            <value>
-            the type of the provider to use.
-            </value>
-            <remarks>
-            <para>
-            The provider specified must subclass the <see cref="T:log4net.Core.SecurityContextProvider"/>
-            class.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Config.XmlConfigurator">
-            <summary>
-            Use this class to initialize the log4net environment using an Xml tree.
-            </summary>
-            <remarks>
-            <para>
-            Configures a <see cref="T:log4net.Repository.ILoggerRepository"/> using an Xml tree.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-        </member>
-        <member name="M:log4net.Config.XmlConfigurator.#ctor">
-            <summary>
-            Private constructor
-            </summary>
-        </member>
-        <member name="M:log4net.Config.XmlConfigurator.Configure">
-            <summary>
-            Automatically configures the log4net system based on the 
-            application's configuration settings.
-            </summary>
-            <remarks>
-            <para>
-            Each application has a configuration file. This has the
-            same name as the application with '.config' appended.
-            This file is XML and calling this function prompts the
-            configurator to look in that file for a section called
-            <c>log4net</c> that contains the configuration data.
-            </para>
-            <para>
-            To use this method to configure log4net you must specify 
-            the <see cref="T:log4net.Config.Log4NetConfigurationSectionHandler"/> section
-            handler for the <c>log4net</c> configuration section. See the
-            <see cref="T:log4net.Config.Log4NetConfigurationSectionHandler"/> for an example.
-            </para>
-            </remarks>
-            <seealso cref="T:log4net.Config.Log4NetConfigurationSectionHandler"/>
-        </member>
-        <member name="M:log4net.Config.XmlConfigurator.Configure(log4net.Repository.ILoggerRepository)">
-            <summary>
-            Automatically configures the <see cref="T:log4net.Repository.ILoggerRepository"/> using settings
-            stored in the application's configuration file.
-            </summary>
-            <remarks>
-            <para>
-            Each application has a configuration file. This has the
-            same name as the application with '.config' appended.
-            This file is XML and calling this function prompts the
-            configurator to look in that file for a section called
-            <c>log4net</c> that contains the configuration data.
-            </para>
-            <para>
-            To use this method to configure log4net you must specify 
-            the <see cref="T:log4net.Config.Log4NetConfigurationSectionHandler"/> section
-            handler for the <c>log4net</c> configuration section. See the
-            <see cref="T:log4net.Config.Log4NetConfigurationSectionHandler"/> for an example.
-            </para>
-            </remarks>
-            <param name="repository">The repository to configure.</param>
-        </member>
-        <member name="M:log4net.Config.XmlConfigurator.Configure(System.Xml.XmlElement)">
-            <summary>
-            Configures log4net using a <c>log4net</c> element
-            </summary>
-            <remarks>
-            <para>
-            Loads the log4net configuration from the XML element
-            supplied as <paramref name="element"/>.
-            </para>
-            </remarks>
-            <param name="element">The element to parse.</param>
-        </member>
-        <member name="M:log4net.Config.XmlConfigurator.Configure(log4net.Repository.ILoggerRepository,System.Xml.XmlElement)">
-            <summary>
-            Configures the <see cref="T:log4net.Repository.ILoggerRepository"/> using the specified XML 
-            element.
-            </summary>
-            <remarks>
-            Loads the log4net configuration from the XML element
-            supplied as <paramref name="element"/>.
-            </remarks>
-            <param name="repository">The repository to configure.</param>
-            <param name="element">The element to parse.</param>
-        </member>
-        <member name="M:log4net.Config.XmlConfigurator.Configure(System.IO.FileInfo)">
-            <summary>
-            Configures log4net using the specified configuration file.
-            </summary>
-            <param name="configFile">The XML file to load the configuration from.</param>
-            <remarks>
-            <para>
-            The configuration file must be valid XML. It must contain
-            at least one element called <c>log4net</c> that holds
-            the log4net configuration data.
-            </para>
-            <para>
-            The log4net configuration file can possible be specified in the application's
-            configuration file (either <c>MyAppName.exe.config</c> for a
-            normal application on <c>Web.config</c> for an ASP.NET application).
-            </para>
-            <para>
-            The first element matching <c>&lt;configuration&gt;</c> will be read as the 
-            configuration. If this file is also a .NET .config file then you must specify 
-            a configuration section for the <c>log4net</c> element otherwise .NET will 
-            complain. Set the type for the section handler to <see cref="T:System.Configuration.IgnoreSectionHandler"/>, for example:
-            <code lang="XML" escaped="true">
-            <configSections>
-            	<section name="log4net" type="System.Configuration.IgnoreSectionHandler"/>
-            </configSections>
-            </code>
-            </para>
-            <example>
-            The following example configures log4net using a configuration file, of which the 
-            location is stored in the application's configuration file :
-            </example>
-            <code lang="C#">
-            using log4net.Config;
-            using System.IO;
-            using System.Configuration;
-            
-            ...
-            
-            XmlConfigurator.Configure(new FileInfo(ConfigurationSettings.AppSettings["log4net-config-file"]));
-            </code>
-            <para>
-            In the <c>.config</c> file, the path to the log4net can be specified like this :
-            </para>
-            <code lang="XML" escaped="true">
-            <configuration>
-            	<appSettings>
-            		<add key="log4net-config-file" value="log.config"/>
-            	</appSettings>
-            </configuration>
-            </code>
-            </remarks>
-        </member>
-        <member name="M:log4net.Config.XmlConfigurator.Configure(System.Uri)">
-            <summary>
-            Configures log4net using the specified configuration URI.
-            </summary>
-            <param name="configUri">A URI to load the XML configuration from.</param>
-            <remarks>
-            <para>
-            The configuration data must be valid XML. It must contain
-            at least one element called <c>log4net</c> that holds
-            the log4net configuration data.
-            </para>
-            <para>
-            The <see cref="T:System.Net.WebRequest"/> must support the URI scheme specified.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Config.XmlConfigurator.Configure(System.IO.Stream)">
-            <summary>
-            Configures log4net using the specified configuration data stream.
-            </summary>
-            <param name="configStream">A stream to load the XML configuration from.</param>
-            <remarks>
-            <para>
-            The configuration data must be valid XML. It must contain
-            at least one element called <c>log4net</c> that holds
-            the log4net configuration data.
-            </para>
-            <para>
-            Note that this method will NOT close the stream parameter.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Config.XmlConfigurator.Configure(log4net.Repository.ILoggerRepository,System.IO.FileInfo)">
-            <summary>
-            Configures the <see cref="T:log4net.Repository.ILoggerRepository"/> using the specified configuration 
-            file.
-            </summary>
-            <param name="repository">The repository to configure.</param>
-            <param name="configFile">The XML file to load the configuration from.</param>
-            <remarks>
-            <para>
-            The configuration file must be valid XML. It must contain
-            at least one element called <c>log4net</c> that holds
-            the configuration data.
-            </para>
-            <para>
-            The log4net configuration file can possible be specified in the application's
-            configuration file (either <c>MyAppName.exe.config</c> for a
-            normal application on <c>Web.config</c> for an ASP.NET application).
-            </para>
-            <para>
-            The first element matching <c>&lt;configuration&gt;</c> will be read as the 
-            configuration. If this file is also a .NET .config file then you must specify 
-            a configuration section for the <c>log4net</c> element otherwise .NET will 
-            complain. Set the type for the section handler to <see cref="T:System.Configuration.IgnoreSectionHandler"/>, for example:
-            <code lang="XML" escaped="true">
-            <configSections>
-            	<section name="log4net" type="System.Configuration.IgnoreSectionHandler"/>
-            </configSections>
-            </code>
-            </para>
-            <example>
-            The following example configures log4net using a configuration file, of which the 
-            location is stored in the application's configuration file :
-            </example>
-            <code lang="C#">
-            using log4net.Config;
-            using System.IO;
-            using System.Configuration;
-            
-            ...
-            
-            XmlConfigurator.Configure(new FileInfo(ConfigurationSettings.AppSettings["log4net-config-file"]));
-            </code>
-            <para>
-            In the <c>.config</c> file, the path to the log4net can be specified like this :
-            </para>
-            <code lang="XML" escaped="true">
-            <configuration>
-            	<appSettings>
-            		<add key="log4net-config-file" value="log.config"/>
-            	</appSettings>
-            </configuration>
-            </code>
-            </remarks>
-        </member>
-        <member name="M:log4net.Config.XmlConfigurator.Configure(log4net.Repository.ILoggerRepository,System.Uri)">
-            <summary>
-            Configures the <see cref="T:log4net.Repository.ILoggerRepository"/> using the specified configuration 
-            URI.
-            </summary>
-            <param name="repository">The repository to configure.</param>
-            <param name="configUri">A URI to load the XML configuration from.</param>
-            <remarks>
-            <para>
-            The configuration data must be valid XML. It must contain
-            at least one element called <c>log4net</c> that holds
-            the configuration data.
-            </para>
-            <para>
-            The <see cref="T:System.Net.WebRequest"/> must support the URI scheme specified.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Config.XmlConfigurator.Configure(log4net.Repository.ILoggerRepository,System.IO.Stream)">
-            <summary>
-            Configures the <see cref="T:log4net.Repository.ILoggerRepository"/> using the specified configuration 
-            file.
-            </summary>
-            <param name="repository">The repository to configure.</param>
-            <param name="configStream">The stream to load the XML configuration from.</param>
-            <remarks>
-            <para>
-            The configuration data must be valid XML. It must contain
-            at least one element called <c>log4net</c> that holds
-            the configuration data.
-            </para>
-            <para>
-            Note that this method will NOT close the stream parameter.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Config.XmlConfigurator.ConfigureAndWatch(System.IO.FileInfo)">
-            <summary>
-            Configures log4net using the file specified, monitors the file for changes 
-            and reloads the configuration if a change is detected.
-            </summary>
-            <param name="configFile">The XML file to load the configuration from.</param>
-            <remarks>
-            <para>
-            The configuration file must be valid XML. It must contain
-            at least one element called <c>log4net</c> that holds
-            the configuration data.
-            </para>
-            <para>
-            The configuration file will be monitored using a <see cref="T:System.IO.FileSystemWatcher"/>
-            and depends on the behavior of that class.
-            </para>
-            <para>
-            For more information on how to configure log4net using
-            a separate configuration file, see <see cref="M:log4net.Config.XmlConfigurator.Configure(System.IO.FileInfo)"/>.
-            </para>
-            </remarks>
-            <seealso cref="M:log4net.Config.XmlConfigurator.Configure(System.IO.FileInfo)"/>
-        </member>
-        <member name="M:log4net.Config.XmlConfigurator.ConfigureAndWatch(log4net.Repository.ILoggerRepository,System.IO.FileInfo)">
-            <summary>
-            Configures the <see cref="T:log4net.Repository.ILoggerRepository"/> using the file specified, 
-            monitors the file for changes and reloads the configuration if a change 
-            is detected.
-            </summary>
-            <param name="repository">The repository to configure.</param>
-            <param name="configFile">The XML file to load the configuration from.</param>
-            <remarks>
-            <para>
-            The configuration file must be valid XML. It must contain
-            at least one element called <c>log4net</c> that holds
-            the configuration data.
-            </para>
-            <para>
-            The configuration file will be monitored using a <see cref="T:System.IO.FileSystemWatcher"/>
-            and depends on the behavior of that class.
-            </para>
-            <para>
-            For more information on how to configure log4net using
-            a separate configuration file, see <see cref="M:log4net.Config.XmlConfigurator.Configure(System.IO.FileInfo)"/>.
-            </para>
-            </remarks>
-            <seealso cref="M:log4net.Config.XmlConfigurator.Configure(System.IO.FileInfo)"/>
-        </member>
-        <member name="M:log4net.Config.XmlConfigurator.ConfigureFromXml(log4net.Repository.ILoggerRepository,System.Xml.XmlElement)">
-            <summary>
-            Configures the specified repository using a <c>log4net</c> element.
-            </summary>
-            <param name="repository">The hierarchy to configure.</param>
-            <param name="element">The element to parse.</param>
-            <remarks>
-            <para>
-            Loads the log4net configuration from the XML element
-            supplied as <paramref name="element"/>.
-            </para>
-            <para>
-            This method is ultimately called by one of the Configure methods 
-            to load the configuration from an <see cref="T:System.Xml.XmlElement"/>.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Config.XmlConfigurator.ConfigureAndWatchHandler">
-            <summary>
-            Class used to watch config files.
-            </summary>
-            <remarks>
-            <para>
-            Uses the <see cref="T:System.IO.FileSystemWatcher"/> to monitor
-            changes to a specified file. Because multiple change notifications
-            may be raised when the file is modified, a timer is used to
-            compress the notifications into a single event. The timer
-            waits for <see cref="F:log4net.Config.XmlConfigurator.ConfigureAndWatchHandler.TimeoutMillis"/> time before delivering
-            the event notification. If any further <see cref="T:System.IO.FileSystemWatcher"/>
-            change notifications arrive while the timer is waiting it
-            is reset and waits again for <see cref="F:log4net.Config.XmlConfigurator.ConfigureAndWatchHandler.TimeoutMillis"/> to
-            elapse.
-            </para>
-            </remarks>
-        </member>
-        <member name="F:log4net.Config.XmlConfigurator.ConfigureAndWatchHandler.TimeoutMillis">
-            <summary>
-            The default amount of time to wait after receiving notification
-            before reloading the config file.
-            </summary>
-        </member>
-        <member name="M:log4net.Config.XmlConfigurator.ConfigureAndWatchHandler.StartWatching(log4net.Repository.ILoggerRepository,System.IO.FileInfo)">
-            <summary>
-            Watch a specified config file used to configure a repository
-            </summary>
-            <param name="repository">The repository to configure.</param>
-            <param name="configFile">The configuration file to watch.</param>
-            <remarks>
-            <para>
-            Watch a specified config file used to configure a repository
-            </para>
-            </remarks>
-        </member>
-        <member name="F:log4net.Config.XmlConfigurator.ConfigureAndWatchHandler.m_configFile">
-            <summary>
-            Holds the FileInfo used to configure the XmlConfigurator
-            </summary>
-        </member>
-        <member name="F:log4net.Config.XmlConfigurator.ConfigureAndWatchHandler.m_repository">
-            <summary>
-            Holds the repository being configured.
-            </summary>
-        </member>
-        <member name="F:log4net.Config.XmlConfigurator.ConfigureAndWatchHandler.m_timer">
-            <summary>
-            The timer used to compress the notification events.
-            </summary>
-        </member>
-        <member name="M:log4net.Config.XmlConfigurator.ConfigureAndWatchHandler.#ctor(log4net.Repository.ILoggerRepository,System.IO.FileInfo)">
-            <summary>
-            Initializes a new instance of the <see cref="T:log4net.Config.XmlConfigurator.ConfigureAndWatchHandler"/> class.
-            </summary>
-            <param name="repository">The repository to configure.</param>
-            <param name="configFile">The configuration file to watch.</param>
-            <remarks>
-            <para>
-            Initializes a new instance of the <see cref="T:log4net.Config.XmlConfigurator.ConfigureAndWatchHandler"/> class.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Config.XmlConfigurator.ConfigureAndWatchHandler.ConfigureAndWatchHandler_OnChanged(System.Object,System.IO.FileSystemEventArgs)">
-            <summary>
-            Event handler used by <see cref="T:log4net.Config.XmlConfigurator.ConfigureAndWatchHandler"/>.
-            </summary>
-            <param name="source">The <see cref="T:System.IO.FileSystemWatcher"/> firing the event.</param>
-            <param name="e">The argument indicates the file that caused the event to be fired.</param>
-            <remarks>
-            <para>
-            This handler reloads the configuration from the file when the event is fired.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Config.XmlConfigurator.ConfigureAndWatchHandler.ConfigureAndWatchHandler_OnRenamed(System.Object,System.IO.RenamedEventArgs)">
-            <summary>
-            Event handler used by <see cref="T:log4net.Config.XmlConfigurator.ConfigureAndWatchHandler"/>.
-            </summary>
-            <param name="source">The <see cref="T:System.IO.FileSystemWatcher"/> firing the event.</param>
-            <param name="e">The argument indicates the file that caused the event to be fired.</param>
-            <remarks>
-            <para>
-            This handler reloads the configuration from the file when the event is fired.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Config.XmlConfigurator.ConfigureAndWatchHandler.OnWatchedFileChange(System.Object)">
-            <summary>
-            Called by the timer when the configuration has been updated.
-            </summary>
-            <param name="state">null</param>
-        </member>
-        <member name="T:log4net.Core.CompactRepositorySelector">
-            <summary>
-            The implementation of the <see cref="T:log4net.Core.IRepositorySelector"/> interface suitable
-            for use with the compact framework
-            </summary>
-            <remarks>
-            <para>
-            This <see cref="T:log4net.Core.IRepositorySelector"/> implementation is a simple
-            mapping between repository name and <see cref="T:log4net.Repository.ILoggerRepository"/>
-            object.
-            </para>
-            <para>
-            The .NET Compact Framework 1.0 does not support retrieving assembly
-            level attributes therefore unlike the <c>DefaultRepositorySelector</c>
-            this selector does not examine the calling assembly for attributes.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-        </member>
-        <member name="T:log4net.Core.IRepositorySelector">
-            <summary>
-            Interface used by the <see cref="T:log4net.LogManager"/> to select the <see cref="T:log4net.Repository.ILoggerRepository"/>.
-            </summary>
-            <remarks>
-            <para>
-            The <see cref="T:log4net.LogManager"/> uses a <see cref="T:log4net.Core.IRepositorySelector"/> 
-            to specify the policy for selecting the correct <see cref="T:log4net.Repository.ILoggerRepository"/> 
-            to return to the caller.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-        </member>
-        <member name="M:log4net.Core.IRepositorySelector.GetRepository(System.Reflection.Assembly)">
-            <summary>
-            Gets the <see cref="T:log4net.Repository.ILoggerRepository"/> for the specified assembly.
-            </summary>
-            <param name="assembly">The assembly to use to lookup to the <see cref="T:log4net.Repository.ILoggerRepository"/></param>
-            <returns>The <see cref="T:log4net.Repository.ILoggerRepository"/> for the assembly.</returns>
-            <remarks>
-            <para>
-            Gets the <see cref="T:log4net.Repository.ILoggerRepository"/> for the specified assembly.
-            </para>
-            <para>
-            How the association between <see cref="T:System.Reflection.Assembly"/> and <see cref="T:log4net.Repository.ILoggerRepository"/>
-            is made is not defined. The implementation may choose any method for
-            this association. The results of this method must be repeatable, i.e.
-            when called again with the same arguments the result must be the
-            save value.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.IRepositorySelector.GetRepository(System.String)">
-            <summary>
-            Gets the named <see cref="T:log4net.Repository.ILoggerRepository"/>.
-            </summary>
-            <param name="repositoryName">The name to use to lookup to the <see cref="T:log4net.Repository.ILoggerRepository"/>.</param>
-            <returns>The named <see cref="T:log4net.Repository.ILoggerRepository"/></returns>
-            <remarks>
-            Lookup a named <see cref="T:log4net.Repository.ILoggerRepository"/>. This is the repository created by
-            calling <see cref="M:log4net.Core.IRepositorySelector.CreateRepository(System.String,System.Type)"/>.
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.IRepositorySelector.CreateRepository(System.Reflection.Assembly,System.Type)">
-            <summary>
-            Creates a new repository for the assembly specified.
-            </summary>
-            <param name="assembly">The assembly to use to create the domain to associate with the <see cref="T:log4net.Repository.ILoggerRepository"/>.</param>
-            <param name="repositoryType">The type of repository to create, must implement <see cref="T:log4net.Repository.ILoggerRepository"/>.</param>
-            <returns>The repository created.</returns>
-            <remarks>
-            <para>
-            The <see cref="T:log4net.Repository.ILoggerRepository"/> created will be associated with the domain
-            specified such that a call to <see cref="M:log4net.Core.IRepositorySelector.GetRepository(System.Reflection.Assembly)"/> with the
-            same assembly specified will return the same repository instance.
-            </para>
-            <para>
-            How the association between <see cref="T:System.Reflection.Assembly"/> and <see cref="T:log4net.Repository.ILoggerRepository"/>
-            is made is not defined. The implementation may choose any method for
-            this association.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.IRepositorySelector.CreateRepository(System.String,System.Type)">
-            <summary>
-            Creates a new repository with the name specified.
-            </summary>
-            <param name="repositoryName">The name to associate with the <see cref="T:log4net.Repository.ILoggerRepository"/>.</param>
-            <param name="repositoryType">The type of repository to create, must implement <see cref="T:log4net.Repository.ILoggerRepository"/>.</param>
-            <returns>The repository created.</returns>
-            <remarks>
-            <para>
-            The <see cref="T:log4net.Repository.ILoggerRepository"/> created will be associated with the name
-            specified such that a call to <see cref="M:log4net.Core.IRepositorySelector.GetRepository(System.String)"/> with the
-            same name will return the same repository instance.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.IRepositorySelector.ExistsRepository(System.String)">
-            <summary>
-            Test if a named repository exists
-            </summary>
-            <param name="repositoryName">the named repository to check</param>
-            <returns><c>true</c> if the repository exists</returns>
-            <remarks>
-            <para>
-            Test if a named repository exists. Use <see cref="M:log4net.Core.IRepositorySelector.CreateRepository(System.Reflection.Assembly,System.Type)"/>
-            to create a new repository and <see cref="M:log4net.Core.IRepositorySelector.GetRepository(System.Reflection.Assembly)"/> to retrieve 
-            a repository.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.IRepositorySelector.GetAllRepositories">
-            <summary>
-            Gets an array of all currently defined repositories.
-            </summary>
-            <returns>
-            An array of the <see cref="T:log4net.Repository.ILoggerRepository"/> instances created by 
-            this <see cref="T:log4net.Core.IRepositorySelector"/>.</returns>
-            <remarks>
-            <para>
-            Gets an array of all of the repositories created by this selector.
-            </para>
-            </remarks>
-        </member>
-        <member name="E:log4net.Core.IRepositorySelector.LoggerRepositoryCreatedEvent">
-            <summary>
-            Event to notify that a logger repository has been created.
-            </summary>
-            <value>
-            Event to notify that a logger repository has been created.
-            </value>
-            <remarks>
-            <para>
-            Event raised when a new repository is created.
-            The event source will be this selector. The event args will
-            be a <see cref="T:log4net.Core.LoggerRepositoryCreationEventArgs"/> which
-            holds the newly created <see cref="T:log4net.Repository.ILoggerRepository"/>.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.CompactRepositorySelector.#ctor(System.Type)">
-            <summary>
-            Create a new repository selector
-            </summary>
-            <param name="defaultRepositoryType">the type of the repositories to create, must implement <see cref="T:log4net.Repository.ILoggerRepository"/></param>
-            <remarks>
-            <para>
-            Create an new compact repository selector.
-            The default type for repositories must be specified,
-            an appropriate value would be <see cref="T:log4net.Repository.Hierarchy.Hierarchy"/>.
-            </para>
-            </remarks>
-            <exception cref="T:System.ArgumentNullException">throw if <paramref name="defaultRepositoryType"/> is null</exception>
-            <exception cref="T:System.ArgumentOutOfRangeException">throw if <paramref name="defaultRepositoryType"/> does not implement <see cref="T:log4net.Repository.ILoggerRepository"/></exception>
-        </member>
-        <member name="M:log4net.Core.CompactRepositorySelector.GetRepository(System.Reflection.Assembly)">
-            <summary>
-            Get the <see cref="T:log4net.Repository.ILoggerRepository"/> for the specified assembly
-            </summary>
-            <param name="assembly">not used</param>
-            <returns>The default <see cref="T:log4net.Repository.ILoggerRepository"/></returns>
-            <remarks>
-            <para>
-            The <paramref name="assembly"/> argument is not used. This selector does not create a
-            separate repository for each assembly. 
-            </para>
-            <para>
-            As a named repository is not specified the default repository is 
-            returned. The default repository is named <c>log4net-default-repository</c>.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.CompactRepositorySelector.GetRepository(System.String)">
-            <summary>
-            Get the named <see cref="T:log4net.Repository.ILoggerRepository"/>
-            </summary>
-            <param name="repositoryName">the name of the repository to lookup</param>
-            <returns>The named <see cref="T:log4net.Repository.ILoggerRepository"/></returns>
-            <remarks>
-            <para>
-            Get the named <see cref="T:log4net.Repository.ILoggerRepository"/>. The default 
-            repository is <c>log4net-default-repository</c>. Other repositories 
-            must be created using the <see cref="M:log4net.Core.CompactRepositorySelector.CreateRepository(System.String,System.Type)"/>.
-            If the named repository does not exist an exception is thrown.
-            </para>
-            </remarks>
-            <exception cref="T:System.ArgumentNullException">throw if <paramref name="repositoryName"/> is null</exception>
-            <exception cref="T:log4net.Core.LogException">throw if the <paramref name="repositoryName"/> does not exist</exception>
-        </member>
-        <member name="M:log4net.Core.CompactRepositorySelector.CreateRepository(System.Reflection.Assembly,System.Type)">
-            <summary>
-            Create a new repository for the assembly specified 
-            </summary>
-            <param name="assembly">not used</param>
-            <param name="repositoryType">the type of repository to create, must implement <see cref="T:log4net.Repository.ILoggerRepository"/></param>
-            <returns>the repository created</returns>
-            <remarks>
-            <para>
-            The <paramref name="assembly"/> argument is not used. This selector does not create a
-            separate repository for each assembly. 
-            </para>
-            <para>
-            If the <paramref name="repositoryType"/> is <c>null</c> then the
-            default repository type specified to the constructor is used.
-            </para>
-            <para>
-            As a named repository is not specified the default repository is 
-            returned. The default repository is named <c>log4net-default-repository</c>.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.CompactRepositorySelector.CreateRepository(System.String,System.Type)">
-            <summary>
-            Create a new repository for the repository specified
-            </summary>
-            <param name="repositoryName">the repository to associate with the <see cref="T:log4net.Repository.ILoggerRepository"/></param>
-            <param name="repositoryType">the type of repository to create, must implement <see cref="T:log4net.Repository.ILoggerRepository"/>.
-            If this param is null then the default repository type is used.</param>
-            <returns>the repository created</returns>
-            <remarks>
-            <para>
-            The <see cref="T:log4net.Repository.ILoggerRepository"/> created will be associated with the repository
-            specified such that a call to <see cref="M:log4net.Core.CompactRepositorySelector.GetRepository(System.String)"/> with the
-            same repository specified will return the same repository instance.
-            </para>
-            <para>
-            If the named repository already exists an exception will be thrown.
-            </para>
-            <para>
-            If <paramref name="repositoryType"/> is <c>null</c> then the default 
-            repository type specified to the constructor is used.
-            </para>
-            </remarks>
-            <exception cref="T:System.ArgumentNullException">throw if <paramref name="repositoryName"/> is null</exception>
-            <exception cref="T:log4net.Core.LogException">throw if the <paramref name="repositoryName"/> already exists</exception>
-        </member>
-        <member name="M:log4net.Core.CompactRepositorySelector.ExistsRepository(System.String)">
-            <summary>
-            Test if a named repository exists
-            </summary>
-            <param name="repositoryName">the named repository to check</param>
-            <returns><c>true</c> if the repository exists</returns>
-            <remarks>
-            <para>
-            Test if a named repository exists. Use <see cref="M:log4net.Core.CompactRepositorySelector.CreateRepository(System.String,System.Type)"/>
-            to create a new repository and <see cref="M:log4net.Core.CompactRepositorySelector.GetRepository(System.String)"/> to retrieve 
-            a repository.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.CompactRepositorySelector.GetAllRepositories">
-            <summary>
-            Gets a list of <see cref="T:log4net.Repository.ILoggerRepository"/> objects
-            </summary>
-            <returns>an array of all known <see cref="T:log4net.Repository.ILoggerRepository"/> objects</returns>
-            <remarks>
-            <para>
-            Gets an array of all of the repositories created by this selector.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.CompactRepositorySelector.OnLoggerRepositoryCreatedEvent(log4net.Repository.ILoggerRepository)">
-            <summary>
-            Notify the registered listeners that the repository has been created
-            </summary>
-            <param name="repository">The repository that has been created</param>
-            <remarks>
-            <para>
-            Raises the <event cref="E:log4net.Core.CompactRepositorySelector.LoggerRepositoryCreatedEvent">LoggerRepositoryCreatedEvent</event>
-            event.
-            </para>
-            </remarks>
-        </member>
-        <member name="E:log4net.Core.CompactRepositorySelector.LoggerRepositoryCreatedEvent">
-            <summary>
-            Event to notify that a logger repository has been created.
-            </summary>
-            <value>
-            Event to notify that a logger repository has been created.
-            </value>
-            <remarks>
-            <para>
-            Event raised when a new repository is created.
-            The event source will be this selector. The event args will
-            be a <see cref="T:log4net.Core.LoggerRepositoryCreationEventArgs"/> which
-            holds the newly created <see cref="T:log4net.Repository.ILoggerRepository"/>.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Core.DefaultRepositorySelector">
-            <summary>
-            The default implementation of the <see cref="T:log4net.Core.IRepositorySelector"/> interface.
-            </summary>
-            <remarks>
-            <para>
-            Uses attributes defined on the calling assembly to determine how to
-            configure the hierarchy for the repository.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-        </member>
-        <member name="M:log4net.Core.DefaultRepositorySelector.#ctor(System.Type)">
-            <summary>
-            Creates a new repository selector.
-            </summary>
-            <param name="defaultRepositoryType">The type of the repositories to create, must implement <see cref="T:log4net.Repository.ILoggerRepository"/></param>
-            <remarks>
-            <para>
-            Create an new repository selector.
-            The default type for repositories must be specified,
-            an appropriate value would be <see cref="T:log4net.Repository.Hierarchy.Hierarchy"/>.
-            </para>
-            </remarks>
-            <exception cref="T:System.ArgumentNullException"><paramref name="defaultRepositoryType"/> is <see langword="null"/>.</exception>
-            <exception cref="T:System.ArgumentOutOfRangeException"><paramref name="defaultRepositoryType"/> does not implement <see cref="T:log4net.Repository.ILoggerRepository"/>.</exception>
-        </member>
-        <member name="M:log4net.Core.DefaultRepositorySelector.GetRepository(System.Reflection.Assembly)">
-            <summary>
-            Gets the <see cref="T:log4net.Repository.ILoggerRepository"/> for the specified assembly.
-            </summary>
-            <param name="repositoryAssembly">The assembly use to lookup the <see cref="T:log4net.Repository.ILoggerRepository"/>.</param>
-            <remarks>
-            <para>
-            The type of the <see cref="T:log4net.Repository.ILoggerRepository"/> created and the repository 
-            to create can be overridden by specifying the <see cref="T:log4net.Config.RepositoryAttribute"/> 
-            attribute on the <paramref name="repositoryAssembly"/>.
-            </para>
-            <para>
-            The default values are to use the <see cref="T:log4net.Repository.Hierarchy.Hierarchy"/> 
-            implementation of the <see cref="T:log4net.Repository.ILoggerRepository"/> interface and to use the
-            <see cref="P:System.Reflection.AssemblyName.Name"/> as the name of the repository.
-            </para>
-            <para>
-            The <see cref="T:log4net.Repository.ILoggerRepository"/> created will be automatically configured using 
-            any <see cref="T:log4net.Config.ConfiguratorAttribute"/> attributes defined on
-            the <paramref name="repositoryAssembly"/>.
-            </para>
-            </remarks>
-            <returns>The <see cref="T:log4net.Repository.ILoggerRepository"/> for the assembly</returns>
-            <exception cref="T:System.ArgumentNullException"><paramref name="repositoryAssembly"/> is <see langword="null"/>.</exception>
-        </member>
-        <member name="M:log4net.Core.DefaultRepositorySelector.GetRepository(System.String)">
-            <summary>
-            Gets the <see cref="T:log4net.Repository.ILoggerRepository"/> for the specified repository.
-            </summary>
-            <param name="repositoryName">The repository to use to lookup the <see cref="T:log4net.Repository.ILoggerRepository"/>.</param>
-            <returns>The <see cref="T:log4net.Repository.ILoggerRepository"/> for the specified repository.</returns>
-            <remarks>
-            <para>
-            Returns the named repository. If <paramref name="repositoryName"/> is <c>null</c>
-            a <see cref="T:System.ArgumentNullException"/> is thrown. If the repository 
-            does not exist a <see cref="T:log4net.Core.LogException"/> is thrown.
-            </para>
-            <para>
-            Use <see cref="M:log4net.Core.DefaultRepositorySelector.CreateRepository(System.String,System.Type)"/> to create a repository.
-            </para>
-            </remarks>
-            <exception cref="T:System.ArgumentNullException"><paramref name="repositoryName"/> is <see langword="null"/>.</exception>
-            <exception cref="T:log4net.Core.LogException"><paramref name="repositoryName"/> does not exist.</exception>
-        </member>
-        <member name="M:log4net.Core.DefaultRepositorySelector.CreateRepository(System.Reflection.Assembly,System.Type)">
-            <summary>
-            Create a new repository for the assembly specified 
-            </summary>
-            <param name="repositoryAssembly">the assembly to use to create the repository to associate with the <see cref="T:log4net.Repository.ILoggerRepository"/>.</param>
-            <param name="repositoryType">The type of repository to create, must implement <see cref="T:log4net.Repository.ILoggerRepository"/>.</param>
-            <returns>The repository created.</returns>
-            <remarks>
-            <para>
-            The <see cref="T:log4net.Repository.ILoggerRepository"/> created will be associated with the repository
-            specified such that a call to <see cref="M:log4net.Core.DefaultRepositorySelector.GetRepository(System.Reflection.Assembly)"/> with the
-            same assembly specified will return the same repository instance.
-            </para>
-            <para>
-            The type of the <see cref="T:log4net.Repository.ILoggerRepository"/> created and
-            the repository to create can be overridden by specifying the
-            <see cref="T:log4net.Config.RepositoryAttribute"/> attribute on the 
-            <paramref name="repositoryAssembly"/>.  The default values are to use the 
-            <paramref name="repositoryType"/> implementation of the 
-            <see cref="T:log4net.Repository.ILoggerRepository"/> interface and to use the
-            <see cref="P:System.Reflection.AssemblyName.Name"/> as the name of the repository.
-            </para>
-            <para>
-            The <see cref="T:log4net.Repository.ILoggerRepository"/> created will be automatically
-            configured using any <see cref="T:log4net.Config.ConfiguratorAttribute"/> 
-            attributes defined on the <paramref name="repositoryAssembly"/>.
-            </para>
-            <para>
-            If a repository for the <paramref name="repositoryAssembly"/> already exists
-            that repository will be returned. An error will not be raised and that 
-            repository may be of a different type to that specified in <paramref name="repositoryType"/>.
-            Also the <see cref="T:log4net.Config.RepositoryAttribute"/> attribute on the
-            assembly may be used to override the repository type specified in 
-            <paramref name="repositoryType"/>.
-            </para>
-            </remarks>
-            <exception cref="T:System.ArgumentNullException"><paramref name="repositoryAssembly"/> is <see langword="null"/>.</exception>
-        </member>
-        <member name="M:log4net.Core.DefaultRepositorySelector.CreateRepository(System.Reflection.Assembly,System.Type,System.String,System.Boolean)">
-            <summary>
-            Creates a new repository for the assembly specified.
-            </summary>
-            <param name="repositoryAssembly">the assembly to use to create the repository to associate with the <see cref="T:log4net.Repository.ILoggerRepository"/>.</param>
-            <param name="repositoryType">The type of repository to create, must implement <see cref="T:log4net.Repository.ILoggerRepository"/>.</param>
-            <param name="repositoryName">The name to assign to the created repository</param>
-            <param name="readAssemblyAttributes">Set to <c>true</c> to read and apply the assembly attributes</param>
-            <returns>The repository created.</returns>
-            <remarks>
-            <para>
-            The <see cref="T:log4net.Repository.ILoggerRepository"/> created will be associated with the repository
-            specified such that a call to <see cref="M:log4net.Core.DefaultRepositorySelector.GetRepository(System.Reflection.Assembly)"/> with the
-            same assembly specified will return the same repository instance.
-            </para>
-            <para>
-            The type of the <see cref="T:log4net.Repository.ILoggerRepository"/> created and
-            the repository to create can be overridden by specifying the
-            <see cref="T:log4net.Config.RepositoryAttribute"/> attribute on the 
-            <paramref name="repositoryAssembly"/>.  The default values are to use the 
-            <paramref name="repositoryType"/> implementation of the 
-            <see cref="T:log4net.Repository.ILoggerRepository"/> interface and to use the
-            <see cref="P:System.Reflection.AssemblyName.Name"/> as the name of the repository.
-            </para>
-            <para>
-            The <see cref="T:log4net.Repository.ILoggerRepository"/> created will be automatically
-            configured using any <see cref="T:log4net.Config.ConfiguratorAttribute"/> 
-            attributes defined on the <paramref name="repositoryAssembly"/>.
-            </para>
-            <para>
-            If a repository for the <paramref name="repositoryAssembly"/> already exists
-            that repository will be returned. An error will not be raised and that 
-            repository may be of a different type to that specified in <paramref name="repositoryType"/>.
-            Also the <see cref="T:log4net.Config.RepositoryAttribute"/> attribute on the
-            assembly may be used to override the repository type specified in 
-            <paramref name="repositoryType"/>.
-            </para>
-            </remarks>
-            <exception cref="T:System.ArgumentNullException"><paramref name="repositoryAssembly"/> is <see langword="null"/>.</exception>
-        </member>
-        <member name="M:log4net.Core.DefaultRepositorySelector.CreateRepository(System.String,System.Type)">
-            <summary>
-            Creates a new repository for the specified repository.
-            </summary>
-            <param name="repositoryName">The repository to associate with the <see cref="T:log4net.Repository.ILoggerRepository"/>.</param>
-            <param name="repositoryType">The type of repository to create, must implement <see cref="T:log4net.Repository.ILoggerRepository"/>.
-            If this param is <see langword="null"/> then the default repository type is used.</param>
-            <returns>The new repository.</returns>
-            <remarks>
-            <para>
-            The <see cref="T:log4net.Repository.ILoggerRepository"/> created will be associated with the repository
-            specified such that a call to <see cref="M:log4net.Core.DefaultRepositorySelector.GetRepository(System.String)"/> with the
-            same repository specified will return the same repository instance.
-            </para>
-            </remarks>
-            <exception cref="T:System.ArgumentNullException"><paramref name="repositoryName"/> is <see langword="null"/>.</exception>
-            <exception cref="T:log4net.Core.LogException"><paramref name="repositoryName"/> already exists.</exception>
-        </member>
-        <member name="M:log4net.Core.DefaultRepositorySelector.ExistsRepository(System.String)">
-            <summary>
-            Test if a named repository exists
-            </summary>
-            <param name="repositoryName">the named repository to check</param>
-            <returns><c>true</c> if the repository exists</returns>
-            <remarks>
-            <para>
-            Test if a named repository exists. Use <see cref="M:log4net.Core.DefaultRepositorySelector.CreateRepository(System.String,System.Type)"/>
-            to create a new repository and <see cref="M:log4net.Core.DefaultRepositorySelector.GetRepository(System.String)"/> to retrieve 
-            a repository.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.DefaultRepositorySelector.GetAllRepositories">
-            <summary>
-            Gets a list of <see cref="T:log4net.Repository.ILoggerRepository"/> objects
-            </summary>
-            <returns>an array of all known <see cref="T:log4net.Repository.ILoggerRepository"/> objects</returns>
-            <remarks>
-            <para>
-            Gets an array of all of the repositories created by this selector.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.DefaultRepositorySelector.AliasRepository(System.String,log4net.Repository.ILoggerRepository)">
-            <summary>
-            Aliases a repository to an existing repository.
-            </summary>
-            <param name="repositoryAlias">The repository to alias.</param>
-            <param name="repositoryTarget">The repository that the repository is aliased to.</param>
-            <remarks>
-            <para>
-            The repository specified will be aliased to the repository when created. 
-            The repository must not already exist.
-            </para>
-            <para>
-            When the repository is created it must utilize the same repository type as 
-            the repository it is aliased to, otherwise the aliasing will fail.
-            </para>
-            </remarks>
-            <exception cref="T:System.ArgumentNullException">
-            <para><paramref name="repositoryAlias"/> is <see langword="null"/>.</para>
-            <para>-or-</para>
-            <para><paramref name="repositoryTarget"/> is <see langword="null"/>.</para>
-            </exception>
-        </member>
-        <member name="M:log4net.Core.DefaultRepositorySelector.OnLoggerRepositoryCreatedEvent(log4net.Repository.ILoggerRepository)">
-            <summary>
-            Notifies the registered listeners that the repository has been created.
-            </summary>
-            <param name="repository">The repository that has been created.</param>
-            <remarks>
-            <para>
-            Raises the <see cref="E:log4net.Core.DefaultRepositorySelector.LoggerRepositoryCreatedEvent"/> event.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.DefaultRepositorySelector.GetInfoForAssembly(System.Reflection.Assembly,System.String@,System.Type@)">
-            <summary>
-            Gets the repository name and repository type for the specified assembly.
-            </summary>
-            <param name="assembly">The assembly that has a <see cref="T:log4net.Config.RepositoryAttribute"/>.</param>
-            <param name="repositoryName">in/out param to hold the repository name to use for the assembly, caller should set this to the default value before calling.</param>
-            <param name="repositoryType">in/out param to hold the type of the repository to create for the assembly, caller should set this to the default value before calling.</param>
-            <exception cref="T:System.ArgumentNullException"><paramref name="assembly"/> is <see langword="null"/>.</exception>
-        </member>
-        <member name="M:log4net.Core.DefaultRepositorySelector.ConfigureRepository(System.Reflection.Assembly,log4net.Repository.ILoggerRepository)">
-            <summary>
-            Configures the repository using information from the assembly.
-            </summary>
-            <param name="assembly">The assembly containing <see cref="T:log4net.Config.ConfiguratorAttribute"/>
-            attributes which define the configuration for the repository.</param>
-            <param name="repository">The repository to configure.</param>
-            <exception cref="T:System.ArgumentNullException">
-            <para><paramref name="assembly"/> is <see langword="null"/>.</para>
-            <para>-or-</para>
-            <para><paramref name="repository"/> is <see langword="null"/>.</para>
-            </exception>
-        </member>
-        <member name="M:log4net.Core.DefaultRepositorySelector.LoadPlugins(System.Reflection.Assembly,log4net.Repository.ILoggerRepository)">
-            <summary>
-            Loads the attribute defined plugins on the assembly.
-            </summary>
-            <param name="assembly">The assembly that contains the attributes.</param>
-            <param name="repository">The repository to add the plugins to.</param>
-            <exception cref="T:System.ArgumentNullException">
-            <para><paramref name="assembly"/> is <see langword="null"/>.</para>
-            <para>-or-</para>
-            <para><paramref name="repository"/> is <see langword="null"/>.</para>
-            </exception>
-        </member>
-        <member name="M:log4net.Core.DefaultRepositorySelector.LoadAliases(System.Reflection.Assembly,log4net.Repository.ILoggerRepository)">
-            <summary>
-            Loads the attribute defined aliases on the assembly.
-            </summary>
-            <param name="assembly">The assembly that contains the attributes.</param>
-            <param name="repository">The repository to alias to.</param>
-            <exception cref="T:System.ArgumentNullException">
-            <para><paramref name="assembly"/> is <see langword="null"/>.</para>
-            <para>-or-</para>
-            <para><paramref name="repository"/> is <see langword="null"/>.</para>
-            </exception>
-        </member>
-        <member name="E:log4net.Core.DefaultRepositorySelector.LoggerRepositoryCreatedEvent">
-            <summary>
-            Event to notify that a logger repository has been created.
-            </summary>
-            <value>
-            Event to notify that a logger repository has been created.
-            </value>
-            <remarks>
-            <para>
-            Event raised when a new repository is created.
-            The event source will be this selector. The event args will
-            be a <see cref="T:log4net.Core.LoggerRepositoryCreationEventArgs"/> which
-            holds the newly created <see cref="T:log4net.Repository.ILoggerRepository"/>.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Core.ErrorCode">
-            <summary>
-            Defined error codes that can be passed to the <see cref="M:log4net.Core.IErrorHandler.Error(System.String,System.Exception,log4net.Core.ErrorCode)"/> method.
-            </summary>
-            <remarks>
-            <para>
-            Values passed to the <see cref="M:log4net.Core.IErrorHandler.Error(System.String,System.Exception,log4net.Core.ErrorCode)"/> method.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-        </member>
-        <member name="F:log4net.Core.ErrorCode.GenericFailure">
-            <summary>
-            A general error
-            </summary>
-        </member>
-        <member name="F:log4net.Core.ErrorCode.WriteFailure">
-            <summary>
-            Error while writing output
-            </summary>
-        </member>
-        <member name="F:log4net.Core.ErrorCode.FlushFailure">
-            <summary>
-            Failed to flush file
-            </summary>
-        </member>
-        <member name="F:log4net.Core.ErrorCode.CloseFailure">
-            <summary>
-            Failed to close file
-            </summary>
-        </member>
-        <member name="F:log4net.Core.ErrorCode.FileOpenFailure">
-            <summary>
-            Unable to open output file
-            </summary>
-        </member>
-        <member name="F:log4net.Core.ErrorCode.MissingLayout">
-            <summary>
-            No layout specified
-            </summary>
-        </member>
-        <member name="F:log4net.Core.ErrorCode.AddressParseFailure">
-            <summary>
-            Failed to parse address
-            </summary>
-        </member>
-        <member name="T:log4net.Core.IErrorHandler">
-            <summary>
-            Appenders may delegate their error handling to an <see cref="T:log4net.Core.IErrorHandler"/>.
-            </summary>
-            <remarks>
-            <para>
-            Error handling is a particularly tedious to get right because by
-            definition errors are hard to predict and to reproduce. 
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-        </member>
-        <member name="M:log4net.Core.IErrorHandler.Error(System.String,System.Exception,log4net.Core.ErrorCode)">
-            <summary>
-            Handles the error and information about the error condition is passed as 
-            a parameter.
-            </summary>
-            <param name="message">The message associated with the error.</param>
-            <param name="e">The <see cref="T:System.Exception"/> that was thrown when the error occurred.</param>
-            <param name="errorCode">The error code associated with the error.</param>
-            <remarks>
-            <para>
-            Handles the error and information about the error condition is passed as 
-            a parameter.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.IErrorHandler.Error(System.String,System.Exception)">
-            <summary>
-            Prints the error message passed as a parameter.
-            </summary>
-            <param name="message">The message associated with the error.</param>
-            <param name="e">The <see cref="T:System.Exception"/> that was thrown when the error occurred.</param>
-            <remarks>
-            <para>
-            See <see cref="M:log4net.Core.IErrorHandler.Error(System.String,System.Exception,log4net.Core.ErrorCode)"/>.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.IErrorHandler.Error(System.String)">
-            <summary>
-            Prints the error message passed as a parameter.
-            </summary>
-            <param name="message">The message associated with the error.</param>
-            <remarks>
-            <para>
-            See <see cref="M:log4net.Core.IErrorHandler.Error(System.String,System.Exception,log4net.Core.ErrorCode)"/>.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Core.IFixingRequired">
-            <summary>
-            Interface for objects that require fixing.
-            </summary>
-            <remarks>
-            <para>
-            Interface that indicates that the object requires fixing before it
-            can be taken outside the context of the appender's 
-            <see cref="M:log4net.Appender.IAppender.DoAppend(log4net.Core.LoggingEvent)"/> method.
-            </para>
-            <para>
-            When objects that implement this interface are stored 
-            in the context properties maps <see cref="T:log4net.GlobalContext"/>
-            <see cref="P:log4net.GlobalContext.Properties"/> and <see cref="T:log4net.ThreadContext"/>
-            <see cref="P:log4net.ThreadContext.Properties"/> are fixed 
-            (see <see cref="P:log4net.Core.LoggingEvent.Fix"/>) the <see cref="M:log4net.Core.IFixingRequired.GetFixedObject"/>
-            method will be called.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-        </member>
-        <member name="M:log4net.Core.IFixingRequired.GetFixedObject">
-            <summary>
-            Get a portable version of this object
-            </summary>
-            <returns>the portable instance of this object</returns>
-            <remarks>
-            <para>
-            Get a portable instance object that represents the current
-            state of this object. The portable object can be stored
-            and logged from any thread with identical results.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Core.ILogger">
-            <summary>
-            Interface that all loggers implement
-            </summary>
-            <remarks>
-            <para>
-            This interface supports logging events and testing if a level
-            is enabled for logging.
-            </para>
-            <para>
-            These methods will not throw exceptions. Note to implementor, ensure
-            that the implementation of these methods cannot allow an exception
-            to be thrown to the caller.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-        </member>
-        <member name="M:log4net.Core.ILogger.Log(System.Type,log4net.Core.Level,System.Object,System.Exception)">
-            <summary>
-            This generic form is intended to be used by wrappers.
-            </summary>
-            <param name="callerStackBoundaryDeclaringType">The declaring type of the method that is
-            the stack boundary into the logging system for this call.</param>
-            <param name="level">The level of the message to be logged.</param>
-            <param name="message">The message object to log.</param>
-            <param name="exception">the exception to log, including its stack trace. Pass <c>null</c> to not log an exception.</param>
-            <remarks>
-            <para>
-            Generates a logging event for the specified <paramref name="level"/> using
-            the <paramref name="message"/> and <paramref name="exception"/>.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.ILogger.Log(log4net.Core.LoggingEvent)">
-            <summary>
-            This is the most generic printing method that is intended to be used 
-            by wrappers.
-            </summary>
-            <param name="logEvent">The event being logged.</param>
-            <remarks>
-            <para>
-            Logs the specified logging event through this logger.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.ILogger.IsEnabledFor(log4net.Core.Level)">
-            <summary>
-            Checks if this logger is enabled for a given <see cref="T:log4net.Core.Level"/> passed as parameter.
-            </summary>
-            <param name="level">The level to check.</param>
-            <returns>
-            <c>true</c> if this logger is enabled for <c>level</c>, otherwise <c>false</c>.
-            </returns>
-            <remarks>
-            <para>
-            Test if this logger is going to log events of the specified <paramref name="level"/>.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Core.ILogger.Name">
-            <summary>
-            Gets the name of the logger.
-            </summary>
-            <value>
-            The name of the logger.
-            </value>
-            <remarks>
-            <para>
-            The name of this logger
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Core.ILogger.Repository">
-            <summary>
-            Gets the <see cref="T:log4net.Repository.ILoggerRepository"/> where this 
-            <c>Logger</c> instance is attached to.
-            </summary>
-            <value>
-            The <see cref="T:log4net.Repository.ILoggerRepository"/> that this logger belongs to.
-            </value>
-            <remarks>
-            <para>
-            Gets the <see cref="T:log4net.Repository.ILoggerRepository"/> where this 
-            <c>Logger</c> instance is attached to.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Core.ILoggerWrapper">
-            <summary>
-            Base interface for all wrappers
-            </summary>
-            <remarks>
-            <para>
-            Base interface for all wrappers.
-            </para>
-            <para>
-            All wrappers must implement this interface.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-        </member>
-        <member name="P:log4net.Core.ILoggerWrapper.Logger">
-            <summary>
-            Get the implementation behind this wrapper object.
-            </summary>
-            <value>
-            The <see cref="T:log4net.Core.ILogger"/> object that in implementing this object.
-            </value>
-            <remarks>
-            <para>
-            The <see cref="T:log4net.Core.ILogger"/> object that in implementing this
-            object. The <c>Logger</c> object may not 
-            be the same object as this object because of logger decorators.
-            This gets the actual underlying objects that is used to process
-            the log events.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Core.LoggerRepositoryCreationEventHandler">
-            <summary>
-            Delegate used to handle logger repository creation event notifications
-            </summary>
-            <param name="sender">The <see cref="T:log4net.Core.IRepositorySelector"/> which created the repository.</param>
-            <param name="e">The <see cref="T:log4net.Core.LoggerRepositoryCreationEventArgs"/> event args
-            that holds the <see cref="T:log4net.Repository.ILoggerRepository"/> instance that has been created.</param>
-            <remarks>
-            <para>
-            Delegate used to handle logger repository creation event notifications.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Core.LoggerRepositoryCreationEventArgs">
-            <summary>
-            Provides data for the <see cref="E:log4net.Core.IRepositorySelector.LoggerRepositoryCreatedEvent"/> event.
-            </summary>
-            <remarks>
-            <para>
-            A <see cref="E:log4net.Core.IRepositorySelector.LoggerRepositoryCreatedEvent"/> 
-            event is raised every time a <see cref="T:log4net.Repository.ILoggerRepository"/> is created.
-            </para>
-            </remarks>
-        </member>
-        <member name="F:log4net.Core.LoggerRepositoryCreationEventArgs.m_repository">
-            <summary>
-            The <see cref="T:log4net.Repository.ILoggerRepository"/> created
-            </summary>
-        </member>
-        <member name="M:log4net.Core.LoggerRepositoryCreationEventArgs.#ctor(log4net.Repository.ILoggerRepository)">
-            <summary>
-            Construct instance using <see cref="T:log4net.Repository.ILoggerRepository"/> specified
-            </summary>
-            <param name="repository">the <see cref="T:log4net.Repository.ILoggerRepository"/> that has been created</param>
-            <remarks>
-            <para>
-            Construct instance using <see cref="T:log4net.Repository.ILoggerRepository"/> specified
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Core.LoggerRepositoryCreationEventArgs.LoggerRepository">
-            <summary>
-            The <see cref="T:log4net.Repository.ILoggerRepository"/> that has been created
-            </summary>
-            <value>
-            The <see cref="T:log4net.Repository.ILoggerRepository"/> that has been created
-            </value>
-            <remarks>
-            <para>
-            The <see cref="T:log4net.Repository.ILoggerRepository"/> that has been created
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Core.ITriggeringEventEvaluator">
-            <summary>
-            Test if an <see cref="T:log4net.Core.LoggingEvent"/> triggers an action
-            </summary>
-            <remarks>
-            <para>
-            Implementations of this interface allow certain appenders to decide
-            when to perform an appender specific action.
-            </para>
-            <para>
-            The action or behavior triggered is defined by the implementation.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-        </member>
-        <member name="M:log4net.Core.ITriggeringEventEvaluator.IsTriggeringEvent(log4net.Core.LoggingEvent)">
-            <summary>
-            Test if this event triggers the action
-            </summary>
-            <param name="loggingEvent">The event to check</param>
-            <returns><c>true</c> if this event triggers the action, otherwise <c>false</c></returns>
-            <remarks>
-            <para>
-            Return <c>true</c> if this event triggers the action
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Core.Level">
-            <summary>
-            Defines the default set of levels recognized by the system.
-            </summary>
-            <remarks>
-            <para>
-            Each <see cref="T:log4net.Core.LoggingEvent"/> has an associated <see cref="T:log4net.Core.Level"/>.
-            </para>
-            <para>
-            Levels have a numeric <see cref="P:log4net.Core.Level.Value"/> that defines the relative 
-            ordering between levels. Two Levels with the same <see cref="P:log4net.Core.Level.Value"/> 
-            are deemed to be equivalent.
-            </para>
-            <para>
-            The levels that are recognized by log4net are set for each <see cref="T:log4net.Repository.ILoggerRepository"/>
-            and each repository can have different levels defined. The levels are stored
-            in the <see cref="P:log4net.Repository.ILoggerRepository.LevelMap"/> on the repository. Levels are
-            looked up by name from the <see cref="P:log4net.Repository.ILoggerRepository.LevelMap"/>.
-            </para>
-            <para>
-            When logging at level INFO the actual level used is not <see cref="F:log4net.Core.Level.Info"/> but
-            the value of <c>LoggerRepository.LevelMap["INFO"]</c>. The default value for this is
-            <see cref="F:log4net.Core.Level.Info"/>, but this can be changed by reconfiguring the level map.
-            </para>
-            <para>
-            Each level has a <see cref="P:log4net.Core.Level.DisplayName"/> in addition to its <see cref="P:log4net.Core.Level.Name"/>. The 
-            <see cref="P:log4net.Core.Level.DisplayName"/> is the string that is written into the output log. By default
-            the display name is the same as the level name, but this can be used to alias levels
-            or to localize the log output.
-            </para>
-            <para>
-            Some of the predefined levels recognized by the system are:
-            </para>
-            <list type="bullet">
-            	<item>
-            		<description><see cref="F:log4net.Core.Level.Off"/>.</description>
-            	</item>
-            	<item>
-            		<description><see cref="F:log4net.Core.Level.Fatal"/>.</description>
-            	</item>
-            	<item>
-            		<description><see cref="F:log4net.Core.Level.Error"/>.</description>
-            	</item>
-            	<item>
-            		<description><see cref="F:log4net.Core.Level.Warn"/>.</description>
-            	</item>
-            	<item>
-            		<description><see cref="F:log4net.Core.Level.Info"/>.</description>
-            	</item>
-            	<item>
-            		<description><see cref="F:log4net.Core.Level.Debug"/>.</description>
-            	</item>
-            	<item>
-            		<description><see cref="F:log4net.Core.Level.All"/>.</description>
-            	</item>
-            </list>
-            </remarks>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-        </member>
-        <member name="M:log4net.Core.Level.#ctor(System.Int32,System.String,System.String)">
-            <summary>
-            Constructor
-            </summary>
-            <param name="level">Integer value for this level, higher values represent more severe levels.</param>
-            <param name="levelName">The string name of this level.</param>
-            <param name="displayName">The display name for this level. This may be localized or otherwise different from the name</param>
-            <remarks>
-            <para>
-            Initializes a new instance of the <see cref="T:log4net.Core.Level"/> class with
-            the specified level name and value.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.Level.#ctor(System.Int32,System.String)">
-            <summary>
-            Constructor
-            </summary>
-            <param name="level">Integer value for this level, higher values represent more severe levels.</param>
-            <param name="levelName">The string name of this level.</param>
-            <remarks>
-            <para>
-            Initializes a new instance of the <see cref="T:log4net.Core.Level"/> class with
-            the specified level name and value.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.Level.ToString">
-            <summary>
-            Returns the <see cref="T:System.String"/> representation of the current 
-            <see cref="T:log4net.Core.Level"/>.
-            </summary>
-            <returns>
-            A <see cref="T:System.String"/> representation of the current <see cref="T:log4net.Core.Level"/>.
-            </returns>
-            <remarks>
-            <para>
-            Returns the level <see cref="P:log4net.Core.Level.Name"/>.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.Level.Equals(System.Object)">
-            <summary>
-            Compares levels.
-            </summary>
-            <param name="o">The object to compare against.</param>
-            <returns><c>true</c> if the objects are equal.</returns>
-            <remarks>
-            <para>
-            Compares the levels of <see cref="T:log4net.Core.Level"/> instances, and 
-            defers to base class if the target object is not a <see cref="T:log4net.Core.Level"/>
-            instance.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.Level.GetHashCode">
-            <summary>
-            Returns a hash code
-            </summary>
-            <returns>A hash code for the current <see cref="T:log4net.Core.Level"/>.</returns>
-            <remarks>
-            <para>
-            Returns a hash code suitable for use in hashing algorithms and data 
-            structures like a hash table.
-            </para>
-            <para>
-            Returns the hash code of the level <see cref="P:log4net.Core.Level.Value"/>.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.Level.CompareTo(System.Object)">
-            <summary>
-            Compares this instance to a specified object and returns an 
-            indication of their relative values.
-            </summary>
-            <param name="r">A <see cref="T:log4net.Core.Level"/> instance or <see langword="null"/> to compare with this instance.</param>
-            <returns>
-            A 32-bit signed integer that indicates the relative order of the 
-            values compared. The return value has these meanings:
-            <list type="table">
-            	<listheader>
-            		<term>Value</term>
-            		<description>Meaning</description>
-            	</listheader>
-            	<item>
-            		<term>Less than zero</term>
-            		<description>This instance is less than <paramref name="r"/>.</description>
-            	</item>
-            	<item>
-            		<term>Zero</term>
-            		<description>This instance is equal to <paramref name="r"/>.</description>
-            	</item>
-            	<item>
-            		<term>Greater than zero</term>
-            		<description>
-            			<para>This instance is greater than <paramref name="r"/>.</para>
-            			<para>-or-</para>
-            			<para><paramref name="r"/> is <see langword="null"/>.</para>
-            			</description>
-            	</item>
-            </list>
-            </returns>
-            <remarks>
-            <para>
-            <paramref name="r"/> must be an instance of <see cref="T:log4net.Core.Level"/> 
-            or <see langword="null"/>; otherwise, an exception is thrown.
-            </para>
-            </remarks>
-            <exception cref="T:System.ArgumentException"><paramref name="r"/> is not a <see cref="T:log4net.Core.Level"/>.</exception>
-        </member>
-        <member name="M:log4net.Core.Level.op_GreaterThan(log4net.Core.Level,log4net.Core.Level)">
-            <summary>
-            Returns a value indicating whether a specified <see cref="T:log4net.Core.Level"/> 
-            is greater than another specified <see cref="T:log4net.Core.Level"/>.
-            </summary>
-            <param name="l">A <see cref="T:log4net.Core.Level"/></param>
-            <param name="r">A <see cref="T:log4net.Core.Level"/></param>
-            <returns>
-            <c>true</c> if <paramref name="l"/> is greater than 
-            <paramref name="r"/>; otherwise, <c>false</c>.
-            </returns>
-            <remarks>
-            <para>
-            Compares two levels.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.Level.op_LessThan(log4net.Core.Level,log4net.Core.Level)">
-            <summary>
-            Returns a value indicating whether a specified <see cref="T:log4net.Core.Level"/> 
-            is less than another specified <see cref="T:log4net.Core.Level"/>.
-            </summary>
-            <param name="l">A <see cref="T:log4net.Core.Level"/></param>
-            <param name="r">A <see cref="T:log4net.Core.Level"/></param>
-            <returns>
-            <c>true</c> if <paramref name="l"/> is less than 
-            <paramref name="r"/>; otherwise, <c>false</c>.
-            </returns>
-            <remarks>
-            <para>
-            Compares two levels.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.Level.op_GreaterThanOrEqual(log4net.Core.Level,log4net.Core.Level)">
-            <summary>
-            Returns a value indicating whether a specified <see cref="T:log4net.Core.Level"/> 
-            is greater than or equal to another specified <see cref="T:log4net.Core.Level"/>.
-            </summary>
-            <param name="l">A <see cref="T:log4net.Core.Level"/></param>
-            <param name="r">A <see cref="T:log4net.Core.Level"/></param>
-            <returns>
-            <c>true</c> if <paramref name="l"/> is greater than or equal to 
-            <paramref name="r"/>; otherwise, <c>false</c>.
-            </returns>
-            <remarks>
-            <para>
-            Compares two levels.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.Level.op_LessThanOrEqual(log4net.Core.Level,log4net.Core.Level)">
-            <summary>
-            Returns a value indicating whether a specified <see cref="T:log4net.Core.Level"/> 
-            is less than or equal to another specified <see cref="T:log4net.Core.Level"/>.
-            </summary>
-            <param name="l">A <see cref="T:log4net.Core.Level"/></param>
-            <param name="r">A <see cref="T:log4net.Core.Level"/></param>
-            <returns>
-            <c>true</c> if <paramref name="l"/> is less than or equal to 
-            <paramref name="r"/>; otherwise, <c>false</c>.
-            </returns>
-            <remarks>
-            <para>
-            Compares two levels.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.Level.op_Equality(log4net.Core.Level,log4net.Core.Level)">
-            <summary>
-            Returns a value indicating whether two specified <see cref="T:log4net.Core.Level"/> 
-            objects have the same value.
-            </summary>
-            <param name="l">A <see cref="T:log4net.Core.Level"/> or <see langword="null"/>.</param>
-            <param name="r">A <see cref="T:log4net.Core.Level"/> or <see langword="null"/>.</param>
-            <returns>
-            <c>true</c> if the value of <paramref name="l"/> is the same as the 
-            value of <paramref name="r"/>; otherwise, <c>false</c>.
-            </returns>
-            <remarks>
-            <para>
-            Compares two levels.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.Level.op_Inequality(log4net.Core.Level,log4net.Core.Level)">
-            <summary>
-            Returns a value indicating whether two specified <see cref="T:log4net.Core.Level"/> 
-            objects have different values.
-            </summary>
-            <param name="l">A <see cref="T:log4net.Core.Level"/> or <see langword="null"/>.</param>
-            <param name="r">A <see cref="T:log4net.Core.Level"/> or <see langword="null"/>.</param>
-            <returns>
-            <c>true</c> if the value of <paramref name="l"/> is different from
-            the value of <paramref name="r"/>; otherwise, <c>false</c>.
-            </returns>
-            <remarks>
-            <para>
-            Compares two levels.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.Level.Compare(log4net.Core.Level,log4net.Core.Level)">
-            <summary>
-            Compares two specified <see cref="T:log4net.Core.Level"/> instances.
-            </summary>
-            <param name="l">The first <see cref="T:log4net.Core.Level"/> to compare.</param>
-            <param name="r">The second <see cref="T:log4net.Core.Level"/> to compare.</param>
-            <returns>
-            A 32-bit signed integer that indicates the relative order of the 
-            two values compared. The return value has these meanings:
-            <list type="table">
-            	<listheader>
-            		<term>Value</term>
-            		<description>Meaning</description>
-            	</listheader>
-            	<item>
-            		<term>Less than zero</term>
-            		<description><paramref name="l"/> is less than <paramref name="r"/>.</description>
-            	</item>
-            	<item>
-            		<term>Zero</term>
-            		<description><paramref name="l"/> is equal to <paramref name="r"/>.</description>
-            	</item>
-            	<item>
-            		<term>Greater than zero</term>
-            		<description><paramref name="l"/> is greater than <paramref name="r"/>.</description>
-            	</item>
-            </list>
-            </returns>
-            <remarks>
-            <para>
-            Compares two levels.
-            </para>
-            </remarks>
-        </member>
-        <member name="F:log4net.Core.Level.Off">
-            <summary>
-            The <see cref="F:log4net.Core.Level.Off"/> level designates a higher level than all the rest.
-            </summary>
-        </member>
-        <member name="F:log4net.Core.Level.Emergency">
-            <summary>
-            The <see cref="F:log4net.Core.Level.Emergency"/> level designates very severe error events. 
-            System unusable, emergencies.
-            </summary>
-        </member>
-        <member name="F:log4net.Core.Level.Fatal">
-            <summary>
-            The <see cref="F:log4net.Core.Level.Fatal"/> level designates very severe error events 
-            that will presumably lead the application to abort.
-            </summary>
-        </member>
-        <member name="F:log4net.Core.Level.Alert">
-            <summary>
-            The <see cref="F:log4net.Core.Level.Alert"/> level designates very severe error events. 
-            Take immediate action, alerts.
-            </summary>
-        </member>
-        <member name="F:log4net.Core.Level.Critical">
-            <summary>
-            The <see cref="F:log4net.Core.Level.Critical"/> level designates very severe error events. 
-            Critical condition, critical.
-            </summary>
-        </member>
-        <member name="F:log4net.Core.Level.Severe">
-            <summary>
-            The <see cref="F:log4net.Core.Level.Severe"/> level designates very severe error events.
-            </summary>
-        </member>
-        <member name="F:log4net.Core.Level.Error">
-            <summary>
-            The <see cref="F:log4net.Core.Level.Error"/> level designates error events that might 
-            still allow the application to continue running.
-            </summary>
-        </member>
-        <member name="F:log4net.Core.Level.Warn">
-            <summary>
-            The <see cref="F:log4net.Core.Level.Warn"/> level designates potentially harmful 
-            situations.
-            </summary>
-        </member>
-        <member name="F:log4net.Core.Level.Notice">
-            <summary>
-            The <see cref="F:log4net.Core.Level.Notice"/> level designates informational messages 
-            that highlight the progress of the application at the highest level.
-            </summary>
-        </member>
-        <member name="F:log4net.Core.Level.Info">
-            <summary>
-            The <see cref="F:log4net.Core.Level.Info"/> level designates informational messages that 
-            highlight the progress of the application at coarse-grained level.
-            </summary>
-        </member>
-        <member name="F:log4net.Core.Level.Debug">
-            <summary>
-            The <see cref="F:log4net.Core.Level.Debug"/> level designates fine-grained informational 
-            events that are most useful to debug an application.
-            </summary>
-        </member>
-        <member name="F:log4net.Core.Level.Fine">
-            <summary>
-            The <see cref="F:log4net.Core.Level.Fine"/> level designates fine-grained informational 
-            events that are most useful to debug an application.
-            </summary>
-        </member>
-        <member name="F:log4net.Core.Level.Trace">
-            <summary>
-            The <see cref="F:log4net.Core.Level.Trace"/> level designates fine-grained informational 
-            events that are most useful to debug an application.
-            </summary>
-        </member>
-        <member name="F:log4net.Core.Level.Finer">
-            <summary>
-            The <see cref="F:log4net.Core.Level.Finer"/> level designates fine-grained informational 
-            events that are most useful to debug an application.
-            </summary>
-        </member>
-        <member name="F:log4net.Core.Level.Verbose">
-            <summary>
-            The <see cref="F:log4net.Core.Level.Verbose"/> level designates fine-grained informational 
-            events that are most useful to debug an application.
-            </summary>
-        </member>
-        <member name="F:log4net.Core.Level.Finest">
-            <summary>
-            The <see cref="F:log4net.Core.Level.Finest"/> level designates fine-grained informational 
-            events that are most useful to debug an application.
-            </summary>
-        </member>
-        <member name="F:log4net.Core.Level.All">
-            <summary>
-            The <see cref="F:log4net.Core.Level.All"/> level designates the lowest level possible.
-            </summary>
-        </member>
-        <member name="P:log4net.Core.Level.Name">
-            <summary>
-            Gets the name of this level.
-            </summary>
-            <value>
-            The name of this level.
-            </value>
-            <remarks>
-            <para>
-            Gets the name of this level.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Core.Level.Value">
-            <summary>
-            Gets the value of this level.
-            </summary>
-            <value>
-            The value of this level.
-            </value>
-            <remarks>
-            <para>
-            Gets the value of this level.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Core.Level.DisplayName">
-            <summary>
-            Gets the display name of this level.
-            </summary>
-            <value>
-            The display name of this level.
-            </value>
-            <remarks>
-            <para>
-            Gets the display name of this level.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Core.LevelCollection">
-            <summary>
-            A strongly-typed collection of <see cref="T:log4net.Core.Level"/> objects.
-            </summary>
-            <author>Nicko Cadell</author>
-        </member>
-        <member name="M:log4net.Core.LevelCollection.ReadOnly(log4net.Core.LevelCollection)">
-            <summary>
-            Creates a read-only wrapper for a <c>LevelCollection</c> instance.
-            </summary>
-            <param name="list">list to create a readonly wrapper arround</param>
-            <returns>
-            A <c>LevelCollection</c> wrapper that is read-only.
-            </returns>
-        </member>
-        <member name="M:log4net.Core.LevelCollection.#ctor">
-            <summary>
-            Initializes a new instance of the <c>LevelCollection</c> class
-            that is empty and has the default initial capacity.
-            </summary>
-        </member>
-        <member name="M:log4net.Core.LevelCollection.#ctor(System.Int32)">
-            <summary>
-            Initializes a new instance of the <c>LevelCollection</c> class
-            that has the specified initial capacity.
-            </summary>
-            <param name="capacity">
-            The number of elements that the new <c>LevelCollection</c> is initially capable of storing.
-            </param>
-        </member>
-        <member name="M:log4net.Core.LevelCollection.#ctor(log4net.Core.LevelCollection)">
-            <summary>
-            Initializes a new instance of the <c>LevelCollection</c> class
-            that contains elements copied from the specified <c>LevelCollection</c>.
-            </summary>
-            <param name="c">The <c>LevelCollection</c> whose elements are copied to the new collection.</param>
-        </member>
-        <member name="M:log4net.Core.LevelCollection.#ctor(log4net.Core.Level[])">
-            <summary>
-            Initializes a new instance of the <c>LevelCollection</c> class
-            that contains elements copied from the specified <see cref="T:log4net.Core.Level"/> array.
-            </summary>
-            <param name="a">The <see cref="T:log4net.Core.Level"/> array whose elements are copied to the new list.</param>
-        </member>
-        <member name="M:log4net.Core.LevelCollection.#ctor(System.Collections.ICollection)">
-            <summary>
-            Initializes a new instance of the <c>LevelCollection</c> class
-            that contains elements copied from the specified <see cref="T:log4net.Core.Level"/> collection.
-            </summary>
-            <param name="col">The <see cref="T:log4net.Core.Level"/> collection whose elements are copied to the new list.</param>
-        </member>
-        <member name="M:log4net.Core.LevelCollection.#ctor(log4net.Core.LevelCollection.Tag)">
-            <summary>
-            Allow subclasses to avoid our default constructors
-            </summary>
-            <param name="tag"></param>
-        </member>
-        <member name="M:log4net.Core.LevelCollection.CopyTo(log4net.Core.Level[])">
-            <summary>
-            Copies the entire <c>LevelCollection</c> to a one-dimensional
-            <see cref="T:log4net.Core.Level"/> array.
-            </summary>
-            <param name="array">The one-dimensional <see cref="T:log4net.Core.Level"/> array to copy to.</param>
-        </member>
-        <member name="M:log4net.Core.LevelCollection.CopyTo(log4net.Core.Level[],System.Int32)">
-            <summary>
-            Copies the entire <c>LevelCollection</c> to a one-dimensional
-            <see cref="T:log4net.Core.Level"/> array, starting at the specified index of the target array.
-            </summary>
-            <param name="array">The one-dimensional <see cref="T:log4net.Core.Level"/> array to copy to.</param>
-            <param name="start">The zero-based index in <paramref name="array"/> at which copying begins.</param>
-        </member>
-        <member name="M:log4net.Core.LevelCollection.Add(log4net.Core.Level)">
-            <summary>
-            Adds a <see cref="T:log4net.Core.Level"/> to the end of the <c>LevelCollection</c>.
-            </summary>
-            <param name="item">The <see cref="T:log4net.Core.Level"/> to be added to the end of the <c>LevelCollection</c>.</param>
-            <returns>The index at which the value has been added.</returns>
-        </member>
-        <member name="M:log4net.Core.LevelCollection.Clear">
-            <summary>
-            Removes all elements from the <c>LevelCollection</c>.
-            </summary>
-        </member>
-        <member name="M:log4net.Core.LevelCollection.Clone">
-            <summary>
-            Creates a shallow copy of the <see cref="T:log4net.Core.LevelCollection"/>.
-            </summary>
-            <returns>A new <see cref="T:log4net.Core.LevelCollection"/> with a shallow copy of the collection data.</returns>
-        </member>
-        <member name="M:log4net.Core.LevelCollection.Contains(log4net.Core.Level)">
-            <summary>
-            Determines whether a given <see cref="T:log4net.Core.Level"/> is in the <c>LevelCollection</c>.
-            </summary>
-            <param name="item">The <see cref="T:log4net.Core.Level"/> to check for.</param>
-            <returns><c>true</c> if <paramref name="item"/> is found in the <c>LevelCollection</c>; otherwise, <c>false</c>.</returns>
-        </member>
-        <member name="M:log4net.Core.LevelCollection.IndexOf(log4net.Core.Level)">
-            <summary>
-            Returns the zero-based index of the first occurrence of a <see cref="T:log4net.Core.Level"/>
-            in the <c>LevelCollection</c>.
-            </summary>
-            <param name="item">The <see cref="T:log4net.Core.Level"/> to locate in the <c>LevelCollection</c>.</param>
-            <returns>
-            The zero-based index of the first occurrence of <paramref name="item"/> 
-            in the entire <c>LevelCollection</c>, if found; otherwise, -1.
-            </returns>
-        </member>
-        <member name="M:log4net.Core.LevelCollection.Insert(System.Int32,log4net.Core.Level)">
-            <summary>
-            Inserts an element into the <c>LevelCollection</c> at the specified index.
-            </summary>
-            <param name="index">The zero-based index at which <paramref name="item"/> should be inserted.</param>
-            <param name="item">The <see cref="T:log4net.Core.Level"/> to insert.</param>
-            <exception cref="T:System.ArgumentOutOfRangeException">
-            <para><paramref name="index"/> is less than zero</para>
-            <para>-or-</para>
-            <para><paramref name="index"/> is equal to or greater than <see cref="P:log4net.Core.LevelCollection.Count"/>.</para>
-            </exception>
-        </member>
-        <member name="M:log4net.Core.LevelCollection.Remove(log4net.Core.Level)">
-            <summary>
-            Removes the first occurrence of a specific <see cref="T:log4net.Core.Level"/> from the <c>LevelCollection</c>.
-            </summary>
-            <param name="item">The <see cref="T:log4net.Core.Level"/> to remove from the <c>LevelCollection</c>.</param>
-            <exception cref="T:System.ArgumentException">
-            The specified <see cref="T:log4net.Core.Level"/> was not found in the <c>LevelCollection</c>.
-            </exception>
-        </member>
-        <member name="M:log4net.Core.LevelCollection.RemoveAt(System.Int32)">
-            <summary>
-            Removes the element at the specified index of the <c>LevelCollection</c>.
-            </summary>
-            <param name="index">The zero-based index of the element to remove.</param>
-            <exception cref="T:System.ArgumentOutOfRangeException">
-            <para><paramref name="index"/> is less than zero</para>
-            <para>-or-</para>
-            <para><paramref name="index"/> is equal to or greater than <see cref="P:log4net.Core.LevelCollection.Count"/>.</para>
-            </exception>
-        </member>
-        <member name="M:log4net.Core.LevelCollection.GetEnumerator">
-            <summary>
-            Returns an enumerator that can iterate through the <c>LevelCollection</c>.
-            </summary>
-            <returns>An <see cref="T:log4net.Core.LevelCollection.Enumerator"/> for the entire <c>LevelCollection</c>.</returns>
-        </member>
-        <member name="M:log4net.Core.LevelCollection.AddRange(log4net.Core.LevelCollection)">
-            <summary>
-            Adds the elements of another <c>LevelCollection</c> to the current <c>LevelCollection</c>.
-            </summary>
-            <param name="x">The <c>LevelCollection</c> whose elements should be added to the end of the current <c>LevelCollection</c>.</param>
-            <returns>The new <see cref="P:log4net.Core.LevelCollection.Count"/> of the <c>LevelCollection</c>.</returns>
-        </member>
-        <member name="M:log4net.Core.LevelCollection.AddRange(log4net.Core.Level[])">
-            <summary>
-            Adds the elements of a <see cref="T:log4net.Core.Level"/> array to the current <c>LevelCollection</c>.
-            </summary>
-            <param name="x">The <see cref="T:log4net.Core.Level"/> array whose elements should be added to the end of the <c>LevelCollection</c>.</param>
-            <returns>The new <see cref="P:log4net.Core.LevelCollection.Count"/> of the <c>LevelCollection</c>.</returns>
-        </member>
-        <member name="M:log4net.Core.LevelCollection.AddRange(System.Collections.ICollection)">
-            <summary>
-            Adds the elements of a <see cref="T:log4net.Core.Level"/> collection to the current <c>LevelCollection</c>.
-            </summary>
-            <param name="col">The <see cref="T:log4net.Core.Level"/> collection whose elements should be added to the end of the <c>LevelCollection</c>.</param>
-            <returns>The new <see cref="P:log4net.Core.LevelCollection.Count"/> of the <c>LevelCollection</c>.</returns>
-        </member>
-        <member name="M:log4net.Core.LevelCollection.TrimToSize">
-            <summary>
-            Sets the capacity to the actual number of elements.
-            </summary>
-        </member>
-        <member name="M:log4net.Core.LevelCollection.ValidateIndex(System.Int32)">
-            <exception cref="T:System.ArgumentOutOfRangeException">
-            <para><paramref name="index"/> is less than zero</para>
-            <para>-or-</para>
-            <para><paramref name="index"/> is equal to or greater than <see cref="P:log4net.Core.LevelCollection.Count"/>.</para>
-            </exception>
-        </member>
-        <member name="M:log4net.Core.LevelCollection.ValidateIndex(System.Int32,System.Boolean)">
-            <exception cref="T:System.ArgumentOutOfRangeException">
-            <para><paramref name="index"/> is less than zero</para>
-            <para>-or-</para>
-            <para><paramref name="index"/> is equal to or greater than <see cref="P:log4net.Core.LevelCollection.Count"/>.</para>
-            </exception>
-        </member>
-        <member name="P:log4net.Core.LevelCollection.Count">
-            <summary>
-            Gets the number of elements actually contained in the <c>LevelCollection</c>.
-            </summary>
-        </member>
-        <member name="P:log4net.Core.LevelCollection.IsSynchronized">
-            <summary>
-            Gets a value indicating whether access to the collection is synchronized (thread-safe).
-            </summary>
-            <value>true if access to the ICollection is synchronized (thread-safe); otherwise, false.</value>
-        </member>
-        <member name="P:log4net.Core.LevelCollection.SyncRoot">
-            <summary>
-            Gets an object that can be used to synchronize access to the collection.
-            </summary>
-        </member>
-        <member name="P:log4net.Core.LevelCollection.Item(System.Int32)">
-            <summary>
-            Gets or sets the <see cref="T:log4net.Core.Level"/> at the specified index.
-            </summary>
-            <param name="index">The zero-based index of the element to get or set.</param>
-            <exception cref="T:System.ArgumentOutOfRangeException">
-            <para><paramref name="index"/> is less than zero</para>
-            <para>-or-</para>
-            <para><paramref name="index"/> is equal to or greater than <see cref="P:log4net.Core.LevelCollection.Count"/>.</para>
-            </exception>
-        </member>
-        <member name="P:log4net.Core.LevelCollection.IsFixedSize">
-            <summary>
-            Gets a value indicating whether the collection has a fixed size.
-            </summary>
-            <value>true if the collection has a fixed size; otherwise, false. The default is false</value>
-        </member>
-        <member name="P:log4net.Core.LevelCollection.IsReadOnly">
-            <summary>
-            Gets a value indicating whether the IList is read-only.
-            </summary>
-            <value>true if the collection is read-only; otherwise, false. The default is false</value>
-        </member>
-        <member name="P:log4net.Core.LevelCollection.Capacity">
-            <summary>
-            Gets or sets the number of elements the <c>LevelCollection</c> can contain.
-            </summary>
-        </member>
-        <member name="T:log4net.Core.LevelCollection.ILevelCollectionEnumerator">
-            <summary>
-            Supports type-safe iteration over a <see cref="T:log4net.Core.LevelCollection"/>.
-            </summary>
-        </member>
-        <member name="M:log4net.Core.LevelCollection.ILevelCollectionEnumerator.MoveNext">
-            <summary>
-            Advances the enumerator to the next element in the collection.
-            </summary>
-            <returns>
-            <c>true</c> if the enumerator was successfully advanced to the next element; 
-            <c>false</c> if the enumerator has passed the end of the collection.
-            </returns>
-            <exception cref="T:System.InvalidOperationException">
-            The collection was modified after the enumerator was created.
-            </exception>
-        </member>
-        <member name="M:log4net.Core.LevelCollection.ILevelCollectionEnumerator.Reset">
-            <summary>
-            Sets the enumerator to its initial position, before the first element in the collection.
-            </summary>
-        </member>
-        <member name="P:log4net.Core.LevelCollection.ILevelCollectionEnumerator.Current">
-            <summary>
-            Gets the current element in the collection.
-            </summary>
-        </member>
-        <member name="T:log4net.Core.LevelCollection.Tag">
-            <summary>
-            Type visible only to our subclasses
-            Used to access protected constructor
-            </summary>
-        </member>
-        <member name="F:log4net.Core.LevelCollection.Tag.Default">
-            <summary>
-            A value
-            </summary>
-        </member>
-        <member name="T:log4net.Core.LevelCollection.Enumerator">
-            <summary>
-            Supports simple iteration over a <see cref="T:log4net.Core.LevelCollection"/>.
-            </summary>
-        </member>
-        <member name="M:log4net.Core.LevelCollection.Enumerator.#ctor(log4net.Core.LevelCollection)">
-            <summary>
-            Initializes a new instance of the <c>Enumerator</c> class.
-            </summary>
-            <param name="tc"></param>
-        </member>
-        <member name="M:log4net.Core.LevelCollection.Enumerator.MoveNext">
-            <summary>
-            Advances the enumerator to the next element in the collection.
-            </summary>
-            <returns>
-            <c>true</c> if the enumerator was successfully advanced to the next element; 
-            <c>false</c> if the enumerator has passed the end of the collection.
-            </returns>
-            <exception cref="T:System.InvalidOperationException">
-            The collection was modified after the enumerator was created.
-            </exception>
-        </member>
-        <member name="M:log4net.Core.LevelCollection.Enumerator.Reset">
-            <summary>
-            Sets the enumerator to its initial position, before the first element in the collection.
-            </summary>
-        </member>
-        <member name="P:log4net.Core.LevelCollection.Enumerator.Current">
-            <summary>
-            Gets the current element in the collection.
-            </summary>
-        </member>
-        <member name="T:log4net.Core.LevelEvaluator">
-            <summary>
-            An evaluator that triggers at a threshold level
-            </summary>
-            <remarks>
-            <para>
-            This evaluator will trigger if the level of the event
-            passed to <see cref="M:log4net.Core.LevelEvaluator.IsTriggeringEvent(log4net.Core.LoggingEvent)"/>
-            is equal to or greater than the <see cref="P:log4net.Core.LevelEvaluator.Threshold"/>
-            level.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-        </member>
-        <member name="F:log4net.Core.LevelEvaluator.m_threshold">
-            <summary>
-            The threshold for triggering
-            </summary>
-        </member>
-        <member name="M:log4net.Core.LevelEvaluator.#ctor">
-            <summary>
-            Create a new evaluator using the <see cref="F:log4net.Core.Level.Off"/> threshold.
-            </summary>
-            <remarks>
-            <para>
-            Create a new evaluator using the <see cref="F:log4net.Core.Level.Off"/> threshold.
-            </para>
-            <para>
-            This evaluator will trigger if the level of the event
-            passed to <see cref="M:log4net.Core.LevelEvaluator.IsTriggeringEvent(log4net.Core.LoggingEvent)"/>
-            is equal to or greater than the <see cref="P:log4net.Core.LevelEvaluator.Threshold"/>
-            level.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.LevelEvaluator.#ctor(log4net.Core.Level)">
-            <summary>
-            Create a new evaluator using the specified <see cref="T:log4net.Core.Level"/> threshold.
-            </summary>
-            <param name="threshold">the threshold to trigger at</param>
-            <remarks>
-            <para>
-            Create a new evaluator using the specified <see cref="T:log4net.Core.Level"/> threshold.
-            </para>
-            <para>
-            This evaluator will trigger if the level of the event
-            passed to <see cref="M:log4net.Core.LevelEvaluator.IsTriggeringEvent(log4net.Core.LoggingEvent)"/>
-            is equal to or greater than the <see cref="P:log4net.Core.LevelEvaluator.Threshold"/>
-            level.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.LevelEvaluator.IsTriggeringEvent(log4net.Core.LoggingEvent)">
-            <summary>
-            Is this <paramref name="loggingEvent"/> the triggering event?
-            </summary>
-            <param name="loggingEvent">The event to check</param>
-            <returns>This method returns <c>true</c>, if the event level
-            is equal or higher than the <see cref="P:log4net.Core.LevelEvaluator.Threshold"/>. 
-            Otherwise it returns <c>false</c></returns>
-            <remarks>
-            <para>
-            This evaluator will trigger if the level of the event
-            passed to <see cref="M:log4net.Core.LevelEvaluator.IsTriggeringEvent(log4net.Core.LoggingEvent)"/>
-            is equal to or greater than the <see cref="P:log4net.Core.LevelEvaluator.Threshold"/>
-            level.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Core.LevelEvaluator.Threshold">
-            <summary>
-            the threshold to trigger at
-            </summary>
-            <value>
-            The <see cref="T:log4net.Core.Level"/> that will cause this evaluator to trigger
-            </value>
-            <remarks>
-            <para>
-            This evaluator will trigger if the level of the event
-            passed to <see cref="M:log4net.Core.LevelEvaluator.IsTriggeringEvent(log4net.Core.LoggingEvent)"/>
-            is equal to or greater than the <see cref="P:log4net.Core.LevelEvaluator.Threshold"/>
-            level.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Core.LevelMap">
-            <summary>
-            Mapping between string name and Level object
-            </summary>
-            <remarks>
-            <para>
-            Mapping between string name and <see cref="T:log4net.Core.Level"/> object.
-            This mapping is held separately for each <see cref="T:log4net.Repository.ILoggerRepository"/>.
-            The level name is case insensitive.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-        </member>
-        <member name="F:log4net.Core.LevelMap.m_mapName2Level">
-            <summary>
-            Mapping from level name to Level object. The
-            level name is case insensitive
-            </summary>
-        </member>
-        <member name="M:log4net.Core.LevelMap.#ctor">
-            <summary>
-            Construct the level map
-            </summary>
-            <remarks>
-            <para>
-            Construct the level map.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.LevelMap.Clear">
-            <summary>
-            Clear the internal maps of all levels
-            </summary>
-            <remarks>
-            <para>
-            Clear the internal maps of all levels
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.LevelMap.Add(System.String,System.Int32)">
-            <summary>
-            Create a new Level and add it to the map
-            </summary>
-            <param name="name">the string to display for the Level</param>
-            <param name="value">the level value to give to the Level</param>
-            <remarks>
-            <para>
-            Create a new Level and add it to the map
-            </para>
-            </remarks>
-            <seealso cref="M:log4net.Core.LevelMap.Add(System.String,System.Int32,System.String)"/>
-        </member>
-        <member name="M:log4net.Core.LevelMap.Add(System.String,System.Int32,System.String)">
-            <summary>
-            Create a new Level and add it to the map
-            </summary>
-            <param name="name">the string to display for the Level</param>
-            <param name="value">the level value to give to the Level</param>
-            <param name="displayName">the display name to give to the Level</param>
-            <remarks>
-            <para>
-            Create a new Level and add it to the map
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.LevelMap.Add(log4net.Core.Level)">
-            <summary>
-            Add a Level to the map
-            </summary>
-            <param name="level">the Level to add</param>
-            <remarks>
-            <para>
-            Add a Level to the map
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.LevelMap.LookupWithDefault(log4net.Core.Level)">
-            <summary>
-            Lookup a named level from the map
-            </summary>
-            <param name="defaultLevel">the name of the level to lookup is taken from this level. 
-            If the level is not set on the map then this level is added</param>
-            <returns>the level in the map with the name specified</returns>
-            <remarks>
-            <para>
-            Lookup a named level from the map. The name of the level to lookup is taken
-            from the <see cref="P:log4net.Core.Level.Name"/> property of the <paramref name="defaultLevel"/>
-            argument.
-            </para>
-            <para>
-            If no level with the specified name is found then the 
-            <paramref name="defaultLevel"/> argument is added to the level map
-            and returned.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Core.LevelMap.Item(System.String)">
-            <summary>
-            Lookup a <see cref="T:log4net.Core.Level"/> by name
-            </summary>
-            <param name="name">The name of the Level to lookup</param>
-            <returns>a Level from the map with the name specified</returns>
-            <remarks>
-            <para>
-            Returns the <see cref="T:log4net.Core.Level"/> from the
-            map with the name specified. If the no level is
-            found then <c>null</c> is returned.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Core.LevelMap.AllLevels">
-            <summary>
-            Return all possible levels as a list of Level objects.
-            </summary>
-            <returns>all possible levels as a list of Level objects</returns>
-            <remarks>
-            <para>
-            Return all possible levels as a list of Level objects.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Core.LocationInfo">
-            <summary>
-            The internal representation of caller location information.
-            </summary>
-            <remarks>
-            <para>
-            This class uses the <c>System.Diagnostics.StackTrace</c> class to generate
-            a call stack. The caller's information is then extracted from this stack.
-            </para>
-            <para>
-            The <c>System.Diagnostics.StackTrace</c> class is not supported on the 
-            .NET Compact Framework 1.0 therefore caller location information is not
-            available on that framework.
-            </para>
-            <para>
-            The <c>System.Diagnostics.StackTrace</c> class has this to say about Release builds:
-            </para>
-            <para>
-            "StackTrace information will be most informative with Debug build configurations. 
-            By default, Debug builds include debug symbols, while Release builds do not. The 
-            debug symbols contain most of the file, method name, line number, and column 
-            information used in constructing StackFrame and StackTrace objects. StackTrace 
-            might not report as many method calls as expected, due to code transformations 
-            that occur during optimization."
-            </para>
-            <para>
-            This means that in a Release build the caller information may be incomplete or may 
-            not exist at all! Therefore caller location information cannot be relied upon in a Release build.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-        </member>
-        <member name="F:log4net.Core.LocationInfo.NA">
-            <summary>
-            When location information is not available the constant
-            <c>NA</c> is returned. Current value of this string
-            constant is <b>?</b>.
-            </summary>
-        </member>
-        <member name="M:log4net.Core.LocationInfo.#ctor(System.Type)">
-            <summary>
-            Constructor
-            </summary>
-            <param name="callerStackBoundaryDeclaringType">The declaring type of the method that is
-            the stack boundary into the logging system for this call.</param>
-            <remarks>
-            <para>
-            Initializes a new instance of the <see cref="T:log4net.Core.LocationInfo"/>
-            class based on the current thread.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.LocationInfo.#ctor(System.String,System.String,System.String,System.String)">
-            <summary>
-            Constructor
-            </summary>
-            <param name="className">The fully qualified class name.</param>
-            <param name="methodName">The method name.</param>
-            <param name="fileName">The file name.</param>
-            <param name="lineNumber">The line number of the method within the file.</param>
-            <remarks>
-            <para>
-            Initializes a new instance of the <see cref="T:log4net.Core.LocationInfo"/>
-            class with the specified data.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Core.LocationInfo.ClassName">
-            <summary>
-            Gets the fully qualified class name of the caller making the logging 
-            request.
-            </summary>
-            <value>
-            The fully qualified class name of the caller making the logging 
-            request.
-            </value>
-            <remarks>
-            <para>
-            Gets the fully qualified class name of the caller making the logging 
-            request.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Core.LocationInfo.FileName">
-            <summary>
-            Gets the file name of the caller.
-            </summary>
-            <value>
-            The file name of the caller.
-            </value>
-            <remarks>
-            <para>
-            Gets the file name of the caller.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Core.LocationInfo.LineNumber">
-            <summary>
-            Gets the line number of the caller.
-            </summary>
-            <value>
-            The line number of the caller.
-            </value>
-            <remarks>
-            <para>
-            Gets the line number of the caller.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Core.LocationInfo.MethodName">
-            <summary>
-            Gets the method name of the caller.
-            </summary>
-            <value>
-            The method name of the caller.
-            </value>
-            <remarks>
-            <para>
-            Gets the method name of the caller.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Core.LocationInfo.FullInfo">
-            <summary>
-            Gets all available caller information
-            </summary>
-            <value>
-            All available caller information, in the format
-            <c>fully.qualified.classname.of.caller.methodName(Filename:line)</c>
-            </value>
-            <remarks>
-            <para>
-            Gets all available caller information, in the format
-            <c>fully.qualified.classname.of.caller.methodName(Filename:line)</c>
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Core.LoggerManager">
-            <summary>
-            Static manager that controls the creation of repositories
-            </summary>
-            <remarks>
-            <para>
-            Static manager that controls the creation of repositories
-            </para>
-            <para>
-            This class is used by the wrapper managers (e.g. <see cref="T:log4net.LogManager"/>)
-            to provide access to the <see cref="T:log4net.Core.ILogger"/> objects.
-            </para>
-            <para>
-            This manager also holds the <see cref="T:log4net.Core.IRepositorySelector"/> that is used to
-            lookup and create repositories. The selector can be set either programmatically using
-            the <see cref="P:log4net.Core.LoggerManager.RepositorySelector"/> property, or by setting the <c>log4net.RepositorySelector</c>
-            AppSetting in the applications config file to the fully qualified type name of the
-            selector to use. 
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-        </member>
-        <member name="M:log4net.Core.LoggerManager.#ctor">
-            <summary>
-            Private constructor to prevent instances. Only static methods should be used.
-            </summary>
-            <remarks>
-            <para>
-            Private constructor to prevent instances. Only static methods should be used.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.LoggerManager.#cctor">
-            <summary>
-            Hook the shutdown event
-            </summary>
-            <remarks>
-            <para>
-            On the full .NET runtime, the static constructor hooks up the 
-            <c>AppDomain.ProcessExit</c> and <c>AppDomain.DomainUnload</c>> events. 
-            These are used to shutdown the log4net system as the application exits.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.LoggerManager.RegisterAppDomainEvents">
-            <summary>
-            Register for ProcessExit and DomainUnload events on the AppDomain
-            </summary>
-            <remarks>
-            <para>
-            This needs to be in a separate method because the events make
-            a LinkDemand for the ControlAppDomain SecurityPermission. Because
-            this is a LinkDemand it is demanded at JIT time. Therefore we cannot
-            catch the exception in the method itself, we have to catch it in the
-            caller.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.LoggerManager.GetLoggerRepository(System.String)">
-            <summary>
-            Return the default <see cref="T:log4net.Repository.ILoggerRepository"/> instance.
-            </summary>
-            <param name="repository">the repository to lookup in</param>
-            <returns>Return the default <see cref="T:log4net.Repository.ILoggerRepository"/> instance</returns>
-            <remarks>
-            <para>
-            Gets the <see cref="T:log4net.Repository.ILoggerRepository"/> for the repository specified
-            by the <paramref name="repository"/> argument.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.LoggerManager.GetLoggerRepository(System.Reflection.Assembly)">
-            <summary>
-            Returns the default <see cref="T:log4net.Repository.ILoggerRepository"/> instance.
-            </summary>
-            <param name="repositoryAssembly">The assembly to use to lookup the repository.</param>
-            <returns>The default <see cref="T:log4net.Repository.ILoggerRepository"/> instance.</returns>
-        </member>
-        <member name="M:log4net.Core.LoggerManager.GetRepository(System.String)">
-            <summary>
-            Return the default <see cref="T:log4net.Repository.ILoggerRepository"/> instance.
-            </summary>
-            <param name="repository">the repository to lookup in</param>
-            <returns>Return the default <see cref="T:log4net.Repository.ILoggerRepository"/> instance</returns>
-            <remarks>
-            <para>
-            Gets the <see cref="T:log4net.Repository.ILoggerRepository"/> for the repository specified
-            by the <paramref name="repository"/> argument.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.LoggerManager.GetRepository(System.Reflection.Assembly)">
-            <summary>
-            Returns the default <see cref="T:log4net.Repository.ILoggerRepository"/> instance.
-            </summary>
-            <param name="repositoryAssembly">The assembly to use to lookup the repository.</param>
-            <returns>The default <see cref="T:log4net.Repository.ILoggerRepository"/> instance.</returns>
-            <remarks>
-            <para>
-            Returns the default <see cref="T:log4net.Repository.ILoggerRepository"/> instance.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.LoggerManager.Exists(System.String,System.String)">
-            <summary>
-            Returns the named logger if it exists.
-            </summary>
-            <param name="repository">The repository to lookup in.</param>
-            <param name="name">The fully qualified logger name to look for.</param>
-            <returns>
-            The logger found, or <c>null</c> if the named logger does not exist in the
-            specified repository.
-            </returns>
-            <remarks>
-            <para>
-            If the named logger exists (in the specified repository) then it
-            returns a reference to the logger, otherwise it returns
-            <c>null</c>.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.LoggerManager.Exists(System.Reflection.Assembly,System.String)">
-            <summary>
-            Returns the named logger if it exists.
-            </summary>
-            <param name="repositoryAssembly">The assembly to use to lookup the repository.</param>
-            <param name="name">The fully qualified logger name to look for.</param>
-            <returns>
-            The logger found, or <c>null</c> if the named logger does not exist in the
-            specified assembly's repository.
-            </returns>
-            <remarks>
-            <para>
-            If the named logger exists (in the specified assembly's repository) then it
-            returns a reference to the logger, otherwise it returns
-            <c>null</c>.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.LoggerManager.GetCurrentLoggers(System.String)">
-            <summary>
-            Returns all the currently defined loggers in the specified repository.
-            </summary>
-            <param name="repository">The repository to lookup in.</param>
-            <returns>All the defined loggers.</returns>
-            <remarks>
-            <para>
-            The root logger is <b>not</b> included in the returned array.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.LoggerManager.GetCurrentLoggers(System.Reflection.Assembly)">
-            <summary>
-            Returns all the currently defined loggers in the specified assembly's repository.
-            </summary>
-            <param name="repositoryAssembly">The assembly to use to lookup the repository.</param>
-            <returns>All the defined loggers.</returns>
-            <remarks>
-            <para>
-            The root logger is <b>not</b> included in the returned array.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.LoggerManager.GetLogger(System.String,System.String)">
-            <summary>
-            Retrieves or creates a named logger.
-            </summary>
-            <param name="repository">The repository to lookup in.</param>
-            <param name="name">The name of the logger to retrieve.</param>
-            <returns>The logger with the name specified.</returns>
-            <remarks>
-            <para>
-            Retrieves a logger named as the <paramref name="name"/>
-            parameter. If the named logger already exists, then the
-            existing instance will be returned. Otherwise, a new instance is
-            created.
-            </para>
-            <para>
-            By default, loggers do not have a set level but inherit
-            it from the hierarchy. This is one of the central features of
-            log4net.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.LoggerManager.GetLogger(System.Reflection.Assembly,System.String)">
-            <summary>
-            Retrieves or creates a named logger.
-            </summary>
-            <param name="repositoryAssembly">The assembly to use to lookup the repository.</param>
-            <param name="name">The name of the logger to retrieve.</param>
-            <returns>The logger with the name specified.</returns>
-            <remarks>
-            <para>
-            Retrieves a logger named as the <paramref name="name"/>
-            parameter. If the named logger already exists, then the
-            existing instance will be returned. Otherwise, a new instance is
-            created.
-            </para>
-            <para>
-            By default, loggers do not have a set level but inherit
-            it from the hierarchy. This is one of the central features of
-            log4net.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.LoggerManager.GetLogger(System.String,System.Type)">
-            <summary>
-            Shorthand for <see cref="M:log4net.LogManager.GetLogger(System.String)"/>.
-            </summary>
-            <param name="repository">The repository to lookup in.</param>
-            <param name="type">The <paramref name="type"/> of which the fullname will be used as the name of the logger to retrieve.</param>
-            <returns>The logger with the name specified.</returns>
-            <remarks>
-            <para>
-            Gets the logger for the fully qualified name of the type specified.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.LoggerManager.GetLogger(System.Reflection.Assembly,System.Type)">
-            <summary>
-            Shorthand for <see cref="M:log4net.LogManager.GetLogger(System.String)"/>.
-            </summary>
-            <param name="repositoryAssembly">the assembly to use to lookup the repository</param>
-            <param name="type">The <paramref name="type"/> of which the fullname will be used as the name of the logger to retrieve.</param>
-            <returns>The logger with the name specified.</returns>
-            <remarks>
-            <para>
-            Gets the logger for the fully qualified name of the type specified.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.LoggerManager.Shutdown">
-            <summary>
-            Shuts down the log4net system.
-            </summary>
-            <remarks>
-            <para>
-            Calling this method will <b>safely</b> close and remove all
-            appenders in all the loggers including root contained in all the
-            default repositories.
-            </para>
-            <para>
-            Some appenders need to be closed before the application exists. 
-            Otherwise, pending logging events might be lost.
-            </para>
-            <para>
-            The <c>shutdown</c> method is careful to close nested
-            appenders before closing regular appenders. This is allows
-            configurations where a regular appender is attached to a logger
-            and again to a nested appender.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.LoggerManager.ShutdownRepository(System.String)">
-            <summary>
-            Shuts down the repository for the repository specified.
-            </summary>
-            <param name="repository">The repository to shutdown.</param>
-            <remarks>
-            <para>
-            Calling this method will <b>safely</b> close and remove all
-            appenders in all the loggers including root contained in the
-            repository for the <paramref name="repository"/> specified.
-            </para>
-            <para>
-            Some appenders need to be closed before the application exists. 
-            Otherwise, pending logging events might be lost.
-            </para>
-            <para>
-            The <c>shutdown</c> method is careful to close nested
-            appenders before closing regular appenders. This is allows
-            configurations where a regular appender is attached to a logger
-            and again to a nested appender.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.LoggerManager.ShutdownRepository(System.Reflection.Assembly)">
-            <summary>
-            Shuts down the repository for the repository specified.
-            </summary>
-            <param name="repositoryAssembly">The assembly to use to lookup the repository.</param>
-            <remarks>
-            <para>
-            Calling this method will <b>safely</b> close and remove all
-            appenders in all the loggers including root contained in the
-            repository for the repository. The repository is looked up using
-            the <paramref name="repositoryAssembly"/> specified.
-            </para>
-            <para>
-            Some appenders need to be closed before the application exists. 
-            Otherwise, pending logging events might be lost.
-            </para>
-            <para>
-            The <c>shutdown</c> method is careful to close nested
-            appenders before closing regular appenders. This is allows
-            configurations where a regular appender is attached to a logger
-            and again to a nested appender.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.LoggerManager.ResetConfiguration(System.String)">
-            <summary>
-            Resets all values contained in this repository instance to their defaults.
-            </summary>
-            <param name="repository">The repository to reset.</param>
-            <remarks>
-            <para>
-            Resets all values contained in the repository instance to their
-            defaults.  This removes all appenders from all loggers, sets
-            the level of all non-root loggers to <c>null</c>,
-            sets their additivity flag to <c>true</c> and sets the level
-            of the root logger to <see cref="F:log4net.Core.Level.Debug"/>. Moreover,
-            message disabling is set its default "off" value.
-            </para>		
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.LoggerManager.ResetConfiguration(System.Reflection.Assembly)">
-            <summary>
-            Resets all values contained in this repository instance to their defaults.
-            </summary>
-            <param name="repositoryAssembly">The assembly to use to lookup the repository to reset.</param>
-            <remarks>
-            <para>
-            Resets all values contained in the repository instance to their
-            defaults.  This removes all appenders from all loggers, sets
-            the level of all non-root loggers to <c>null</c>,
-            sets their additivity flag to <c>true</c> and sets the level
-            of the root logger to <see cref="F:log4net.Core.Level.Debug"/>. Moreover,
-            message disabling is set its default "off" value.
-            </para>		
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.LoggerManager.CreateDomain(System.String)">
-            <summary>
-            Creates a repository with the specified name.
-            </summary>
-            <param name="repository">The name of the repository, this must be unique amongst repositories.</param>
-            <returns>The <see cref="T:log4net.Repository.ILoggerRepository"/> created for the repository.</returns>
-            <remarks>
-            <para>
-            <b>CreateDomain is obsolete. Use CreateRepository instead of CreateDomain.</b>
-            </para>
-            <para>
-            Creates the default type of <see cref="T:log4net.Repository.ILoggerRepository"/> which is a
-            <see cref="T:log4net.Repository.Hierarchy.Hierarchy"/> object.
-            </para>
-            <para>
-            The <paramref name="repository"/> name must be unique. Repositories cannot be redefined.
-            An <see cref="T:System.Exception"/> will be thrown if the repository already exists.
-            </para>
-            </remarks>
-            <exception cref="T:log4net.Core.LogException">The specified repository already exists.</exception>
-        </member>
-        <member name="M:log4net.Core.LoggerManager.CreateRepository(System.String)">
-            <summary>
-            Creates a repository with the specified name.
-            </summary>
-            <param name="repository">The name of the repository, this must be unique amongst repositories.</param>
-            <returns>The <see cref="T:log4net.Repository.ILoggerRepository"/> created for the repository.</returns>
-            <remarks>
-            <para>
-            Creates the default type of <see cref="T:log4net.Repository.ILoggerRepository"/> which is a
-            <see cref="T:log4net.Repository.Hierarchy.Hierarchy"/> object.
-            </para>
-            <para>
-            The <paramref name="repository"/> name must be unique. Repositories cannot be redefined.
-            An <see cref="T:System.Exception"/> will be thrown if the repository already exists.
-            </para>
-            </remarks>
-            <exception cref="T:log4net.Core.LogException">The specified repository already exists.</exception>
-        </member>
-        <member name="M:log4net.Core.LoggerManager.CreateDomain(System.String,System.Type)">
-            <summary>
-            Creates a repository with the specified name and repository type.
-            </summary>
-            <param name="repository">The name of the repository, this must be unique to the repository.</param>
-            <param name="repositoryType">A <see cref="T:System.Type"/> that implements <see cref="T:log4net.Repository.ILoggerRepository"/>
-            and has a no arg constructor. An instance of this type will be created to act
-            as the <see cref="T:log4net.Repository.ILoggerRepository"/> for the repository specified.</param>
-            <returns>The <see cref="T:log4net.Repository.ILoggerRepository"/> created for the repository.</returns>
-            <remarks>
-            <para>
-            <b>CreateDomain is obsolete. Use CreateRepository instead of CreateDomain.</b>
-            </para>
-            <para>
-            The <paramref name="repository"/> name must be unique. Repositories cannot be redefined.
-            An Exception will be thrown if the repository already exists.
-            </para>
-            </remarks>
-            <exception cref="T:log4net.Core.LogException">The specified repository already exists.</exception>
-        </member>
-        <member name="M:log4net.Core.LoggerManager.CreateRepository(System.String,System.Type)">
-            <summary>
-            Creates a repository with the specified name and repository type.
-            </summary>
-            <param name="repository">The name of the repository, this must be unique to the repository.</param>
-            <param name="repositoryType">A <see cref="T:System.Type"/> that implements <see cref="T:log4net.Repository.ILoggerRepository"/>
-            and has a no arg constructor. An instance of this type will be created to act
-            as the <see cref="T:log4net.Repository.ILoggerRepository"/> for the repository specified.</param>
-            <returns>The <see cref="T:log4net.Repository.ILoggerRepository"/> created for the repository.</returns>
-            <remarks>
-            <para>
-            The <paramref name="repository"/> name must be unique. Repositories cannot be redefined.
-            An Exception will be thrown if the repository already exists.
-            </para>
-            </remarks>
-            <exception cref="T:log4net.Core.LogException">The specified repository already exists.</exception>
-        </member>
-        <member name="M:log4net.Core.LoggerManager.CreateDomain(System.Reflection.Assembly,System.Type)">
-            <summary>
-            Creates a repository for the specified assembly and repository type.
-            </summary>
-            <param name="repositoryAssembly">The assembly to use to get the name of the repository.</param>
-            <param name="repositoryType">A <see cref="T:System.Type"/> that implements <see cref="T:log4net.Repository.ILoggerRepository"/>
-            and has a no arg constructor. An instance of this type will be created to act
-            as the <see cref="T:log4net.Repository.ILoggerRepository"/> for the repository specified.</param>
-            <returns>The <see cref="T:log4net.Repository.ILoggerRepository"/> created for the repository.</returns>
-            <remarks>
-            <para>
-            <b>CreateDomain is obsolete. Use CreateRepository instead of CreateDomain.</b>
-            </para>
-            <para>
-            The <see cref="T:log4net.Repository.ILoggerRepository"/> created will be associated with the repository
-            specified such that a call to <see cref="M:log4net.Core.LoggerManager.GetRepository(System.Reflection.Assembly)"/> with the
-            same assembly specified will return the same repository instance.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.LoggerManager.CreateRepository(System.Reflection.Assembly,System.Type)">
-            <summary>
-            Creates a repository for the specified assembly and repository type.
-            </summary>
-            <param name="repositoryAssembly">The assembly to use to get the name of the repository.</param>
-            <param name="repositoryType">A <see cref="T:System.Type"/> that implements <see cref="T:log4net.Repository.ILoggerRepository"/>
-            and has a no arg constructor. An instance of this type will be created to act
-            as the <see cref="T:log4net.Repository.ILoggerRepository"/> for the repository specified.</param>
-            <returns>The <see cref="T:log4net.Repository.ILoggerRepository"/> created for the repository.</returns>
-            <remarks>
-            <para>
-            The <see cref="T:log4net.Repository.ILoggerRepository"/> created will be associated with the repository
-            specified such that a call to <see cref="M:log4net.Core.LoggerManager.GetRepository(System.Reflection.Assembly)"/> with the
-            same assembly specified will return the same repository instance.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.LoggerManager.GetAllRepositories">
-            <summary>
-            Gets an array of all currently defined repositories.
-            </summary>
-            <returns>An array of all the known <see cref="T:log4net.Repository.ILoggerRepository"/> objects.</returns>
-            <remarks>
-            <para>
-            Gets an array of all currently defined repositories.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.LoggerManager.GetVersionInfo">
-            <summary>
-            Internal method to get pertinent version info.
-            </summary>
-            <returns>A string of version info.</returns>
-        </member>
-        <member name="M:log4net.Core.LoggerManager.OnDomainUnload(System.Object,System.EventArgs)">
-            <summary>
-            Called when the <see cref="E:System.AppDomain.DomainUnload"/> event fires
-            </summary>
-            <param name="sender">the <see cref="T:System.AppDomain"/> that is exiting</param>
-            <param name="e">null</param>
-            <remarks>
-            <para>
-            Called when the <see cref="E:System.AppDomain.DomainUnload"/> event fires.
-            </para>
-            <para>
-            When the event is triggered the log4net system is <see cref="M:log4net.Core.LoggerManager.Shutdown"/>.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.LoggerManager.OnProcessExit(System.Object,System.EventArgs)">
-            <summary>
-            Called when the <see cref="E:System.AppDomain.ProcessExit"/> event fires
-            </summary>
-            <param name="sender">the <see cref="T:System.AppDomain"/> that is exiting</param>
-            <param name="e">null</param>
-            <remarks>
-            <para>
-            Called when the <see cref="E:System.AppDomain.ProcessExit"/> event fires.
-            </para>
-            <para>
-            When the event is triggered the log4net system is <see cref="M:log4net.Core.LoggerManager.Shutdown"/>.
-            </para>
-            </remarks>
-        </member>
-        <member name="F:log4net.Core.LoggerManager.s_repositorySelector">
-            <summary>
-            Initialize the default repository selector
-            </summary>
-        </member>
-        <member name="P:log4net.Core.LoggerManager.RepositorySelector">
-            <summary>
-            Gets or sets the repository selector used by the <see cref="T:log4net.LogManager"/>.
-            </summary>
-            <value>
-            The repository selector used by the <see cref="T:log4net.LogManager"/>.
-            </value>
-            <remarks>
-            <para>
-            The repository selector (<see cref="T:log4net.Core.IRepositorySelector"/>) is used by 
-            the <see cref="T:log4net.LogManager"/> to create and select repositories 
-            (<see cref="T:log4net.Repository.ILoggerRepository"/>).
-            </para>
-            <para>
-            The caller to <see cref="T:log4net.LogManager"/> supplies either a string name 
-            or an assembly (if not supplied the assembly is inferred using 
-            <see cref="M:System.Reflection.Assembly.GetCallingAssembly"/>).
-            </para>
-            <para>
-            This context is used by the selector to lookup a specific repository.
-            </para>
-            <para>
-            For the full .NET Framework, the default repository is <c>DefaultRepositorySelector</c>;
-            for the .NET Compact Framework <c>CompactRepositorySelector</c> is the default
-            repository.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Core.LoggerWrapperImpl">
-            <summary>
-            Implementation of the <see cref="T:log4net.Core.ILoggerWrapper"/> interface.
-            </summary>
-            <remarks>
-            <para>
-            This class should be used as the base for all wrapper implementations.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-        </member>
-        <member name="M:log4net.Core.LoggerWrapperImpl.#ctor(log4net.Core.ILogger)">
-            <summary>
-            Constructs a new wrapper for the specified logger.
-            </summary>
-            <param name="logger">The logger to wrap.</param>
-            <remarks>
-            <para>
-            Constructs a new wrapper for the specified logger.
-            </para>
-            </remarks>
-        </member>
-        <member name="F:log4net.Core.LoggerWrapperImpl.m_logger">
-            <summary>
-            The logger that this object is wrapping
-            </summary>
-        </member>
-        <member name="P:log4net.Core.LoggerWrapperImpl.Logger">
-            <summary>
-            Gets the implementation behind this wrapper object.
-            </summary>
-            <value>
-            The <see cref="T:log4net.Core.ILogger"/> object that this object is implementing.
-            </value>
-            <remarks>
-            <para>
-            The <c>Logger</c> object may not be the same object as this object 
-            because of logger decorators.
-            </para>
-            <para>
-            This gets the actual underlying objects that is used to process
-            the log events.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Core.LoggingEventData">
-            <summary>
-            Portable data structure used by <see cref="T:log4net.Core.LoggingEvent"/>
-            </summary>
-            <remarks>
-            <para>
-            Portable data structure used by <see cref="T:log4net.Core.LoggingEvent"/>
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-        </member>
-        <member name="F:log4net.Core.LoggingEventData.LoggerName">
-            <summary>
-            The logger name.
-            </summary>
-            <remarks>
-            <para>
-            The logger name.
-            </para>
-            </remarks>
-        </member>
-        <member name="F:log4net.Core.LoggingEventData.Level">
-            <summary>
-            Level of logging event.
-            </summary>
-            <remarks>
-            <para>
-            Level of logging event. Level cannot be Serializable
-            because it is a flyweight.  Due to its special serialization it
-            cannot be declared final either.
-            </para>
-            </remarks>
-        </member>
-        <member name="F:log4net.Core.LoggingEventData.Message">
-            <summary>
-            The application supplied message.
-            </summary>
-            <remarks>
-            <para>
-            The application supplied message of logging event.
-            </para>
-            </remarks>
-        </member>
-        <member name="F:log4net.Core.LoggingEventData.ThreadName">
-            <summary>
-            The name of thread
-            </summary>
-            <remarks>
-            <para>
-            The name of thread in which this logging event was generated
-            </para>
-            </remarks>
-        </member>
-        <member name="F:log4net.Core.LoggingEventData.TimeStamp">
-            <summary>
-            The time the event was logged
-            </summary>
-            <remarks>
-            <para>
-            The TimeStamp is stored in the local time zone for this computer.
-            </para>
-            </remarks>
-        </member>
-        <member name="F:log4net.Core.LoggingEventData.LocationInfo">
-            <summary>
-            Location information for the caller.
-            </summary>
-            <remarks>
-            <para>
-            Location information for the caller.
-            </para>
-            </remarks>
-        </member>
-        <member name="F:log4net.Core.LoggingEventData.UserName">
-            <summary>
-            String representation of the user
-            </summary>
-            <remarks>
-            <para>
-            String representation of the user's windows name,
-            like DOMAIN\username
-            </para>
-            </remarks>
-        </member>
-        <member name="F:log4net.Core.LoggingEventData.Identity">
-            <summary>
-            String representation of the identity.
-            </summary>
-            <remarks>
-            <para>
-            String representation of the current thread's principal identity.
-            </para>
-            </remarks>
-        </member>
-        <member name="F:log4net.Core.LoggingEventData.ExceptionString">
-            <summary>
-            The string representation of the exception
-            </summary>
-            <remarks>
-            <para>
-            The string representation of the exception
-            </para>
-            </remarks>
-        </member>
-        <member name="F:log4net.Core.LoggingEventData.Domain">
-            <summary>
-            String representation of the AppDomain.
-            </summary>
-            <remarks>
-            <para>
-            String representation of the AppDomain.
-            </para>
-            </remarks>
-        </member>
-        <member name="F:log4net.Core.LoggingEventData.Properties">
-            <summary>
-            Additional event specific properties
-            </summary>
-            <remarks>
-            <para>
-            A logger or an appender may attach additional
-            properties to specific events. These properties
-            have a string key and an object value.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Core.FixFlags">
-            <summary>
-            Flags passed to the <see cref="P:log4net.Core.LoggingEvent.Fix"/> property
-            </summary>
-            <remarks>
-            <para>
-            Flags passed to the <see cref="P:log4net.Core.LoggingEvent.Fix"/> property
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-        </member>
-        <member name="F:log4net.Core.FixFlags.Mdc">
-            <summary>
-            Fix the MDC
-            </summary>
-        </member>
-        <member name="F:log4net.Core.FixFlags.Ndc">
-            <summary>
-            Fix the NDC
-            </summary>
-        </member>
-        <member name="F:log4net.Core.FixFlags.Message">
-            <summary>
-            Fix the rendered message
-            </summary>
-        </member>
-        <member name="F:log4net.Core.FixFlags.ThreadName">
-            <summary>
-            Fix the thread name
-            </summary>
-        </member>
-        <member name="F:log4net.Core.FixFlags.LocationInfo">
-            <summary>
-            Fix the callers location information
-            </summary>
-            <remarks>
-            CAUTION: Very slow to generate
-            </remarks>
-        </member>
-        <member name="F:log4net.Core.FixFlags.UserName">
-            <summary>
-            Fix the callers windows user name
-            </summary>
-            <remarks>
-            CAUTION: Slow to generate
-            </remarks>
-        </member>
-        <member name="F:log4net.Core.FixFlags.Domain">
-            <summary>
-            Fix the domain friendly name
-            </summary>
-        </member>
-        <member name="F:log4net.Core.FixFlags.Identity">
-            <summary>
-            Fix the callers principal name
-            </summary>
-            <remarks>
-            CAUTION: May be slow to generate
-            </remarks>
-        </member>
-        <member name="F:log4net.Core.FixFlags.Exception">
-            <summary>
-            Fix the exception text
-            </summary>
-        </member>
-        <member name="F:log4net.Core.FixFlags.Properties">
-            <summary>
-            Fix the event properties
-            </summary>
-        </member>
-        <member name="F:log4net.Core.FixFlags.None">
-            <summary>
-            No fields fixed
-            </summary>
-        </member>
-        <member name="F:log4net.Core.FixFlags.All">
-            <summary>
-            All fields fixed
-            </summary>
-        </member>
-        <member name="F:log4net.Core.FixFlags.Partial">
-            <summary>
-            Partial fields fixed
-            </summary>
-            <remarks>
-            <para>
-            This set of partial fields gives good performance. The following fields are fixed:
-            </para>
-            <list type="bullet">
-            <item><description><see cref="F:log4net.Core.FixFlags.Message"/></description></item>
-            <item><description><see cref="F:log4net.Core.FixFlags.ThreadName"/></description></item>
-            <item><description><see cref="F:log4net.Core.FixFlags.Exception"/></description></item>
-            <item><description><see cref="F:log4net.Core.FixFlags.Domain"/></description></item>
-            <item><description><see cref="F:log4net.Core.FixFlags.Properties"/></description></item>
-            </list>
-            </remarks>
-        </member>
-        <member name="T:log4net.Core.LoggingEvent">
-            <summary>
-            The internal representation of logging events. 
-            </summary>
-            <remarks>
-            <para>
-            When an affirmative decision is made to log then a 
-            <see cref="T:log4net.Core.LoggingEvent"/> instance is created. This instance 
-            is passed around to the different log4net components.
-            </para>
-            <para>
-            This class is of concern to those wishing to extend log4net.
-            </para>
-            <para>
-            Some of the values in instances of <see cref="T:log4net.Core.LoggingEvent"/>
-            are considered volatile, that is the values are correct at the
-            time the event is delivered to appenders, but will not be consistent
-            at any time afterwards. If an event is to be stored and then processed
-            at a later time these volatile values must be fixed by calling
-            <see cref="M:log4net.Core.LoggingEvent.FixVolatileData"/>. There is a performance penalty
-            for incurred by calling <see cref="M:log4net.Core.LoggingEvent.FixVolatileData"/> but it
-            is essential to maintaining data consistency.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-            <author>Douglas de la Torre</author>
-            <author>Daniel Cazzulino</author>
-        </member>
-        <member name="F:log4net.Core.LoggingEvent.HostNameProperty">
-            <summary>
-            The key into the Properties map for the host name value.
-            </summary>
-        </member>
-        <member name="F:log4net.Core.LoggingEvent.IdentityProperty">
-            <summary>
-            The key into the Properties map for the thread identity value.
-            </summary>
-        </member>
-        <member name="F:log4net.Core.LoggingEvent.UserNameProperty">
-            <summary>
-            The key into the Properties map for the user name value.
-            </summary>
-        </member>
-        <member name="M:log4net.Core.LoggingEvent.#ctor(System.Type,log4net.Repository.ILoggerRepository,System.String,log4net.Core.Level,System.Object,System.Exception)">
-            <summary>
-            Initializes a new instance of the <see cref="T:log4net.Core.LoggingEvent"/> class
-            from the supplied parameters.
-            </summary>
-            <param name="callerStackBoundaryDeclaringType">The declaring type of the method that is
-            the stack boundary into the logging system for this call.</param>
-            <param name="repository">The repository this event is logged in.</param>
-            <param name="loggerName">The name of the logger of this event.</param>
-            <param name="level">The level of this event.</param>
-            <param name="message">The message of this event.</param>
-            <param name="exception">The exception for this event.</param>
-            <remarks>
-            <para>
-            Except <see cref="P:log4net.Core.LoggingEvent.TimeStamp"/>, <see cref="P:log4net.Core.LoggingEvent.Level"/> and <see cref="P:log4net.Core.LoggingEvent.LoggerName"/>, 
-            all fields of <c>LoggingEvent</c> are filled when actually needed. Call
-            <see cref="M:log4net.Core.LoggingEvent.FixVolatileData"/> to cache all data locally
-            to prevent inconsistencies.
-            </para>
-            <para>This method is called by the log4net framework
-            to create a logging event.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.LoggingEvent.#ctor(System.Type,log4net.Repository.ILoggerRepository,log4net.Core.LoggingEventData,log4net.Core.FixFlags)">
-            <summary>
-            Initializes a new instance of the <see cref="T:log4net.Core.LoggingEvent"/> class 
-            using specific data.
-            </summary>
-            <param name="callerStackBoundaryDeclaringType">The declaring type of the method that is
-            the stack boundary into the logging system for this call.</param>
-            <param name="repository">The repository this event is logged in.</param>
-            <param name="data">Data used to initialize the logging event.</param>
-            <param name="fixedData">The fields in the <paranref name="data"/> struct that have already been fixed.</param>
-            <remarks>
-            <para>
-            This constructor is provided to allow a <see cref="T:log4net.Core.LoggingEvent"/>
-            to be created independently of the log4net framework. This can
-            be useful if you require a custom serialization scheme.
-            </para>
-            <para>
-            Use the <see cref="M:log4net.Core.LoggingEvent.GetLoggingEventData(log4net.Core.FixFlags)"/> method to obtain an 
-            instance of the <see cref="T:log4net.Core.LoggingEventData"/> class.
-            </para>
-            <para>
-            The <paramref name="fixedData"/> parameter should be used to specify which fields in the
-            <paramref name="data"/> struct have been preset. Fields not specified in the <paramref name="fixedData"/>
-            will be captured from the environment if requested or fixed.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.LoggingEvent.#ctor(System.Type,log4net.Repository.ILoggerRepository,log4net.Core.LoggingEventData)">
-            <summary>
-            Initializes a new instance of the <see cref="T:log4net.Core.LoggingEvent"/> class 
-            using specific data.
-            </summary>
-            <param name="callerStackBoundaryDeclaringType">The declaring type of the method that is
-            the stack boundary into the logging system for this call.</param>
-            <param name="repository">The repository this event is logged in.</param>
-            <param name="data">Data used to initialize the logging event.</param>
-            <remarks>
-            <para>
-            This constructor is provided to allow a <see cref="T:log4net.Core.LoggingEvent"/>
-            to be created independently of the log4net framework. This can
-            be useful if you require a custom serialization scheme.
-            </para>
-            <para>
-            Use the <see cref="M:log4net.Core.LoggingEvent.GetLoggingEventData(log4net.Core.FixFlags)"/> method to obtain an 
-            instance of the <see cref="T:log4net.Core.LoggingEventData"/> class.
-            </para>
-            <para>
-            This constructor sets this objects <see cref="P:log4net.Core.LoggingEvent.Fix"/> flags to <see cref="F:log4net.Core.FixFlags.All"/>,
-            this assumes that all the data relating to this event is passed in via the <paramref name="data"/>
-            parameter and no other data should be captured from the environment.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.LoggingEvent.#ctor(log4net.Core.LoggingEventData)">
-            <summary>
-            Initializes a new instance of the <see cref="T:log4net.Core.LoggingEvent"/> class 
-            using specific data.
-            </summary>
-            <param name="data">Data used to initialize the logging event.</param>
-            <remarks>
-            <para>
-            This constructor is provided to allow a <see cref="T:log4net.Core.LoggingEvent"/>
-            to be created independently of the log4net framework. This can
-            be useful if you require a custom serialization scheme.
-            </para>
-            <para>
-            Use the <see cref="M:log4net.Core.LoggingEvent.GetLoggingEventData(log4net.Core.FixFlags)"/> method to obtain an 
-            instance of the <see cref="T:log4net.Core.LoggingEventData"/> class.
-            </para>
-            <para>
-            This constructor sets this objects <see cref="P:log4net.Core.LoggingEvent.Fix"/> flags to <see cref="F:log4net.Core.FixFlags.All"/>,
-            this assumes that all the data relating to this event is passed in via the <paramref name="data"/>
-            parameter and no other data should be captured from the environment.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.LoggingEvent.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
-            <summary>
-            Serialization constructor
-            </summary>
-            <param name="info">The <see cref="T:System.Runtime.Serialization.SerializationInfo"/> that holds the serialized object data.</param>
-            <param name="context">The <see cref="T:System.Runtime.Serialization.StreamingContext"/> that contains contextual information about the source or destination.</param>
-            <remarks>
-            <para>
-            Initializes a new instance of the <see cref="T:log4net.Core.LoggingEvent"/> class 
-            with serialized data.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.LoggingEvent.EnsureRepository(log4net.Repository.ILoggerRepository)">
-            <summary>
-            Ensure that the repository is set.
-            </summary>
-            <param name="repository">the value for the repository</param>
-        </member>
-        <member name="M:log4net.Core.LoggingEvent.WriteRenderedMessage(System.IO.TextWriter)">
-            <summary>
-            Write the rendered message to a TextWriter
-            </summary>
-            <param name="writer">the writer to write the message to</param>
-            <remarks>
-            <para>
-            Unlike the <see cref="P:log4net.Core.LoggingEvent.RenderedMessage"/> property this method
-            does store the message data in the internal cache. Therefore 
-            if called only once this method should be faster than the
-            <see cref="P:log4net.Core.LoggingEvent.RenderedMessage"/> property, however if the message is
-            to be accessed multiple times then the property will be more efficient.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.LoggingEvent.GetObjectData(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
-            <summary>
-            Serializes this object into the <see cref="T:System.Runtime.Serialization.SerializationInfo"/> provided.
-            </summary>
-            <param name="info">The <see cref="T:System.Runtime.Serialization.SerializationInfo"/> to populate with data.</param>
-            <param name="context">The destination for this serialization.</param>
-            <remarks>
-            <para>
-            The data in this event must be fixed before it can be serialized.
-            </para>
-            <para>
-            The <see cref="M:log4net.Core.LoggingEvent.FixVolatileData"/> method must be called during the
-            <see cref="M:log4net.Appender.IAppender.DoAppend(log4net.Core.LoggingEvent)"/> method call if this event 
-            is to be used outside that method.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.LoggingEvent.GetLoggingEventData">
-            <summary>
-            Gets the portable data for this <see cref="T:log4net.Core.LoggingEvent"/>.
-            </summary>
-            <returns>The <see cref="T:log4net.Core.LoggingEventData"/> for this event.</returns>
-            <remarks>
-            <para>
-            A new <see cref="T:log4net.Core.LoggingEvent"/> can be constructed using a
-            <see cref="T:log4net.Core.LoggingEventData"/> instance.
-            </para>
-            <para>
-            Does a <see cref="F:log4net.Core.FixFlags.Partial"/> fix of the data
-            in the logging event before returning the event data.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.LoggingEvent.GetLoggingEventData(log4net.Core.FixFlags)">
-            <summary>
-            Gets the portable data for this <see cref="T:log4net.Core.LoggingEvent"/>.
-            </summary>
-            <param name="fixFlags">The set of data to ensure is fixed in the LoggingEventData</param>
-            <returns>The <see cref="T:log4net.Core.LoggingEventData"/> for this event.</returns>
-            <remarks>
-            <para>
-            A new <see cref="T:log4net.Core.LoggingEvent"/> can be constructed using a
-            <see cref="T:log4net.Core.LoggingEventData"/> instance.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.LoggingEvent.GetExceptionStrRep">
-            <summary>
-            Returns this event's exception's rendered using the 
-            <see cref="P:log4net.Repository.ILoggerRepository.RendererMap"/>.
-            </summary>
-            <returns>
-            This event's exception's rendered using the <see cref="P:log4net.Repository.ILoggerRepository.RendererMap"/>.
-            </returns>
-            <remarks>
-            <para>
-            <b>Obsolete. Use <see cref="M:log4net.Core.LoggingEvent.GetExceptionString"/> instead.</b>
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.LoggingEvent.GetExceptionString">
-            <summary>
-            Returns this event's exception's rendered using the 
-            <see cref="P:log4net.Repository.ILoggerRepository.RendererMap"/>.
-            </summary>
-            <returns>
-            This event's exception's rendered using the <see cref="P:log4net.Repository.ILoggerRepository.RendererMap"/>.
-            </returns>
-            <remarks>
-            <para>
-            Returns this event's exception's rendered using the 
-            <see cref="P:log4net.Repository.ILoggerRepository.RendererMap"/>.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.LoggingEvent.FixVolatileData">
-            <summary>
-            Fix instance fields that hold volatile data.
-            </summary>
-            <remarks>
-            <para>
-            Some of the values in instances of <see cref="T:log4net.Core.LoggingEvent"/>
-            are considered volatile, that is the values are correct at the
-            time the event is delivered to appenders, but will not be consistent
-            at any time afterwards. If an event is to be stored and then processed
-            at a later time these volatile values must be fixed by calling
-            <see cref="M:log4net.Core.LoggingEvent.FixVolatileData"/>. There is a performance penalty
-            incurred by calling <see cref="M:log4net.Core.LoggingEvent.FixVolatileData"/> but it
-            is essential to maintaining data consistency.
-            </para>
-            <para>
-            Calling <see cref="M:log4net.Core.LoggingEvent.FixVolatileData"/> is equivalent to
-            calling <see cref="M:log4net.Core.LoggingEvent.FixVolatileData(System.Boolean)"/> passing the parameter
-            <c>false</c>.
-            </para>
-            <para>
-            See <see cref="M:log4net.Core.LoggingEvent.FixVolatileData(System.Boolean)"/> for more
-            information.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.LoggingEvent.FixVolatileData(System.Boolean)">
-            <summary>
-            Fixes instance fields that hold volatile data.
-            </summary>
-            <param name="fastButLoose">Set to <c>true</c> to not fix data that takes a long time to fix.</param>
-            <remarks>
-            <para>
-            Some of the values in instances of <see cref="T:log4net.Core.LoggingEvent"/>
-            are considered volatile, that is the values are correct at the
-            time the event is delivered to appenders, but will not be consistent
-            at any time afterwards. If an event is to be stored and then processed
-            at a later time these volatile values must be fixed by calling
-            <see cref="M:log4net.Core.LoggingEvent.FixVolatileData"/>. There is a performance penalty
-            for incurred by calling <see cref="M:log4net.Core.LoggingEvent.FixVolatileData"/> but it
-            is essential to maintaining data consistency.
-            </para>
-            <para>
-            The <paramref name="fastButLoose"/> param controls the data that
-            is fixed. Some of the data that can be fixed takes a long time to 
-            generate, therefore if you do not require those settings to be fixed
-            they can be ignored by setting the <paramref name="fastButLoose"/> param
-            to <c>true</c>. This setting will ignore the <see cref="P:log4net.Core.LoggingEvent.LocationInformation"/>
-            and <see cref="P:log4net.Core.LoggingEvent.UserName"/> settings.
-            </para>
-            <para>
-            Set <paramref name="fastButLoose"/> to <c>false</c> to ensure that all 
-            settings are fixed.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.LoggingEvent.FixVolatileData(log4net.Core.FixFlags)">
-            <summary>
-            Fix the fields specified by the <see cref="T:log4net.Core.FixFlags"/> parameter
-            </summary>
-            <param name="flags">the fields to fix</param>
-            <remarks>
-            <para>
-            Only fields specified in the <paramref name="flags"/> will be fixed.
-            Fields will not be fixed if they have previously been fixed.
-            It is not possible to 'unfix' a field.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.LoggingEvent.LookupProperty(System.String)">
-            <summary>
-            Lookup a composite property in this event
-            </summary>
-            <param name="key">the key for the property to lookup</param>
-            <returns>the value for the property</returns>
-            <remarks>
-            <para>
-            This event has composite properties that combine together properties from
-            several different contexts in the following order:
-            <list type="definition">
-            	<item>
-            		<term>this events properties</term>
-            		<description>
-            		This event has <see cref="P:log4net.Core.LoggingEvent.Properties"/> that can be set. These 
-            		properties are specific to this event only.
-            		</description>
-            	</item>
-            	<item>
-            		<term>the thread properties</term>
-            		<description>
-            		The <see cref="P:log4net.ThreadContext.Properties"/> that are set on the current
-            		thread. These properties are shared by all events logged on this thread.
-            		</description>
-            	</item>
-            	<item>
-            		<term>the global properties</term>
-            		<description>
-            		The <see cref="P:log4net.GlobalContext.Properties"/> that are set globally. These 
-            		properties are shared by all the threads in the AppDomain.
-            		</description>
-            	</item>
-            </list>
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.LoggingEvent.GetProperties">
-            <summary>
-            Get all the composite properties in this event
-            </summary>
-            <returns>the <see cref="T:log4net.Util.PropertiesDictionary"/> containing all the properties</returns>
-            <remarks>
-            <para>
-            See <see cref="M:log4net.Core.LoggingEvent.LookupProperty(System.String)"/> for details of the composite properties 
-            stored by the event.
-            </para>
-            <para>
-            This method returns a single <see cref="T:log4net.Util.PropertiesDictionary"/> containing all the
-            properties defined for this event.
-            </para>
-            </remarks>
-        </member>
-        <member name="F:log4net.Core.LoggingEvent.m_data">
-            <summary>
-            The internal logging event data.
-            </summary>
-        </member>
-        <member name="F:log4net.Core.LoggingEvent.m_compositeProperties">
-            <summary>
-            The internal logging event data.
-            </summary>
-        </member>
-        <member name="F:log4net.Core.LoggingEvent.m_eventProperties">
-            <summary>
-            The internal logging event data.
-            </summary>
-        </member>
-        <member name="F:log4net.Core.LoggingEvent.m_callerStackBoundaryDeclaringType">
-            <summary>
-            The fully qualified Type of the calling 
-            logger class in the stack frame (i.e. the declaring type of the method).
-            </summary>
-        </member>
-        <member name="F:log4net.Core.LoggingEvent.m_message">
-            <summary>
-            The application supplied message of logging event.
-            </summary>
-        </member>
-        <member name="F:log4net.Core.LoggingEvent.m_thrownException">
-            <summary>
-            The exception that was thrown.
-            </summary>
-            <remarks>
-            This is not serialized. The string representation
-            is serialized instead.
-            </remarks>
-        </member>
-        <member name="F:log4net.Core.LoggingEvent.m_repository">
-            <summary>
-            The repository that generated the logging event
-            </summary>
-            <remarks>
-            This is not serialized.
-            </remarks>
-        </member>
-        <member name="F:log4net.Core.LoggingEvent.m_fixFlags">
-            <summary>
-            The fix state for this event
-            </summary>
-            <remarks>
-            These flags indicate which fields have been fixed.
-            Not serialized.
-            </remarks>
-        </member>
-        <member name="F:log4net.Core.LoggingEvent.m_cacheUpdatable">
-            <summary>
-            Indicated that the internal cache is updateable (ie not fixed)
-            </summary>
-            <remarks>
-            This is a seperate flag to m_fixFlags as it allows incrementel fixing and simpler
-            changes in the caching strategy.
-            </remarks>
-        </member>
-        <member name="P:log4net.Core.LoggingEvent.StartTime">
-            <summary>
-            Gets the time when the current process started.
-            </summary>
-            <value>
-            This is the time when this process started.
-            </value>
-            <remarks>
-            <para>
-            The TimeStamp is stored in the local time zone for this computer.
-            </para>
-            <para>
-            Tries to get the start time for the current process.
-            Failing that it returns the time of the first call to
-            this property.
-            </para>
-            <para>
-            Note that AppDomains may be loaded and unloaded within the
-            same process without the process terminating and therefore
-            without the process start time being reset.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Core.LoggingEvent.Level">
-            <summary>
-            Gets the <see cref="P:log4net.Core.LoggingEvent.Level"/> of the logging event.
-            </summary>
-            <value>
-            The <see cref="P:log4net.Core.LoggingEvent.Level"/> of the logging event.
-            </value>
-            <remarks>
-            <para>
-            Gets the <see cref="P:log4net.Core.LoggingEvent.Level"/> of the logging event.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Core.LoggingEvent.TimeStamp">
-            <summary>
-            Gets the time of the logging event.
-            </summary>
-            <value>
-            The time of the logging event.
-            </value>
-            <remarks>
-            <para>
-            The TimeStamp is stored in the local time zone for this computer.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Core.LoggingEvent.LoggerName">
-            <summary>
-            Gets the name of the logger that logged the event.
-            </summary>
-            <value>
-            The name of the logger that logged the event.
-            </value>
-            <remarks>
-            <para>
-            Gets the name of the logger that logged the event.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Core.LoggingEvent.LocationInformation">
-            <summary>
-            Gets the location information for this logging event.
-            </summary>
-            <value>
-            The location information for this logging event.
-            </value>
-            <remarks>
-            <para>
-            The collected information is cached for future use.
-            </para>
-            <para>
-            See the <see cref="T:log4net.Core.LocationInfo"/> class for more information on
-            supported frameworks and the different behavior in Debug and
-            Release builds.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Core.LoggingEvent.MessageObject">
-            <summary>
-            Gets the message object used to initialize this event.
-            </summary>
-            <value>
-            The message object used to initialize this event.
-            </value>
-            <remarks>
-            <para>
-            Gets the message object used to initialize this event.
-            Note that this event may not have a valid message object.
-            If the event is serialized the message object will not 
-            be transferred. To get the text of the message the
-            <see cref="P:log4net.Core.LoggingEvent.RenderedMessage"/> property must be used 
-            not this property.
-            </para>
-            <para>
-            If there is no defined message object for this event then
-            null will be returned.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Core.LoggingEvent.ExceptionObject">
-            <summary>
-            Gets the exception object used to initialize this event.
-            </summary>
-            <value>
-            The exception object used to initialize this event.
-            </value>
-            <remarks>
-            <para>
-            Gets the exception object used to initialize this event.
-            Note that this event may not have a valid exception object.
-            If the event is serialized the exception object will not 
-            be transferred. To get the text of the exception the
-            <see cref="M:log4net.Core.LoggingEvent.GetExceptionString"/> method must be used 
-            not this property.
-            </para>
-            <para>
-            If there is no defined exception object for this event then
-            null will be returned.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Core.LoggingEvent.Repository">
-            <summary>
-            The <see cref="T:log4net.Repository.ILoggerRepository"/> that this event was created in.
-            </summary>
-            <remarks>
-            <para>
-            The <see cref="T:log4net.Repository.ILoggerRepository"/> that this event was created in.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Core.LoggingEvent.RenderedMessage">
-            <summary>
-            Gets the message, rendered through the <see cref="P:log4net.Repository.ILoggerRepository.RendererMap"/>.
-            </summary>
-            <value>
-            The message rendered through the <see cref="P:log4net.Repository.ILoggerRepository.RendererMap"/>.
-            </value>
-            <remarks>
-            <para>
-            The collected information is cached for future use.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Core.LoggingEvent.ThreadName">
-            <summary>
-            Gets the name of the current thread.  
-            </summary>
-            <value>
-            The name of the current thread, or the thread ID when 
-            the name is not available.
-            </value>
-            <remarks>
-            <para>
-            The collected information is cached for future use.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Core.LoggingEvent.UserName">
-            <summary>
-            Gets the name of the current user.
-            </summary>
-            <value>
-            The name of the current user, or <c>NOT AVAILABLE</c> when the 
-            underlying runtime has no support for retrieving the name of the 
-            current user.
-            </value>
-            <remarks>
-            <para>
-            Calls <c>WindowsIdentity.GetCurrent().Name</c> to get the name of
-            the current windows user.
-            </para>
-            <para>
-            To improve performance, we could cache the string representation of 
-            the name, and reuse that as long as the identity stayed constant.  
-            Once the identity changed, we would need to re-assign and re-render 
-            the string.
-            </para>
-            <para>
-            However, the <c>WindowsIdentity.GetCurrent()</c> call seems to 
-            return different objects every time, so the current implementation 
-            doesn't do this type of caching.
-            </para>
-            <para>
-            Timing for these operations:
-            </para>
-            <list type="table">
-              <listheader>
-                <term>Method</term>
-                <description>Results</description>
-              </listheader>
-              <item>
-                <term><c>WindowsIdentity.GetCurrent()</c></term>
-                <description>10000 loops, 00:00:00.2031250 seconds</description>
-              </item>
-              <item>
-                <term><c>WindowsIdentity.GetCurrent().Name</c></term>
-                <description>10000 loops, 00:00:08.0468750 seconds</description>
-              </item>
-            </list>
-            <para>
-            This means we could speed things up almost 40 times by caching the 
-            value of the <c>WindowsIdentity.GetCurrent().Name</c> property, since 
-            this takes (8.04-0.20) = 7.84375 seconds.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Core.LoggingEvent.Identity">
-            <summary>
-            Gets the identity of the current thread principal.
-            </summary>
-            <value>
-            The string name of the identity of the current thread principal.
-            </value>
-            <remarks>
-            <para>
-            Calls <c>System.Threading.Thread.CurrentPrincipal.Identity.Name</c> to get
-            the name of the current thread principal.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Core.LoggingEvent.Domain">
-            <summary>
-            Gets the AppDomain friendly name.
-            </summary>
-            <value>
-            The AppDomain friendly name.
-            </value>
-            <remarks>
-            <para>
-            Gets the AppDomain friendly name.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Core.LoggingEvent.Properties">
-            <summary>
-            Additional event specific properties.
-            </summary>
-            <value>
-            Additional event specific properties.
-            </value>
-            <remarks>
-            <para>
-            A logger or an appender may attach additional
-            properties to specific events. These properties
-            have a string key and an object value.
-            </para>
-            <para>
-            This property is for events that have been added directly to
-            this event. The aggregate properties (which include these
-            event properties) can be retrieved using <see cref="M:log4net.Core.LoggingEvent.LookupProperty(System.String)"/>
-            and <see cref="M:log4net.Core.LoggingEvent.GetProperties"/>.
-            </para>
-            <para>
-            Once the properties have been fixed <see cref="P:log4net.Core.LoggingEvent.Fix"/> this property
-            returns the combined cached properties. This ensures that updates to
-            this property are always reflected in the underlying storage. When
-            returning the combined properties there may be more keys in the
-            Dictionary than expected.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Core.LoggingEvent.Fix">
-            <summary>
-            The fixed fields in this event
-            </summary>
-            <value>
-            The set of fields that are fixed in this event
-            </value>
-            <remarks>
-            <para>
-            Fields will not be fixed if they have previously been fixed.
-            It is not possible to 'unfix' a field.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Core.LogImpl">
-            <summary>
-            Implementation of <see cref="T:log4net.ILog"/> wrapper interface.
-            </summary>
-            <remarks>
-            <para>
-            This implementation of the <see cref="T:log4net.ILog"/> interface
-            forwards to the <see cref="T:log4net.Core.ILogger"/> held by the base class.
-            </para>
-            <para>
-            This logger has methods to allow the caller to log at the following
-            levels:
-            </para>
-            <list type="definition">
-              <item>
-                <term>DEBUG</term>
-                <description>
-                The <see cref="M:log4net.Core.LogImpl.Debug(System.Object)"/> and <see cref="M:log4net.Core.LogImpl.DebugFormat(System.String,System.Object[])"/> methods log messages
-                at the <c>DEBUG</c> level. That is the level with that name defined in the
-                repositories <see cref="P:log4net.Repository.ILoggerRepository.LevelMap"/>. The default value
-                for this level is <see cref="F:log4net.Core.Level.Debug"/>. The <see cref="P:log4net.Core.LogImpl.IsDebugEnabled"/>
-                property tests if this level is enabled for logging.
-                </description>
-              </item>
-              <item>
-                <term>INFO</term>
-                <description>
-                The <see cref="M:log4net.Core.LogImpl.Info(System.Object)"/> and <see cref="M:log4net.Core.LogImpl.InfoFormat(System.String,System.Object[])"/> methods log messages
-                at the <c>INFO</c> level. That is the level with that name defined in the
-                repositories <see cref="P:log4net.Repository.ILoggerRepository.LevelMap"/>. The default value
-                for this level is <see cref="F:log4net.Core.Level.Info"/>. The <see cref="P:log4net.Core.LogImpl.IsInfoEnabled"/>
-                property tests if this level is enabled for logging.
-                </description>
-              </item>
-              <item>
-                <term>WARN</term>
-                <description>
-                The <see cref="M:log4net.Core.LogImpl.Warn(System.Object)"/> and <see cref="M:log4net.Core.LogImpl.WarnFormat(System.String,System.Object[])"/> methods log messages
-                at the <c>WARN</c> level. That is the level with that name defined in the
-                repositories <see cref="P:log4net.Repository.ILoggerRepository.LevelMap"/>. The default value
-                for this level is <see cref="F:log4net.Core.Level.Warn"/>. The <see cref="P:log4net.Core.LogImpl.IsWarnEnabled"/>
-                property tests if this level is enabled for logging.
-                </description>
-              </item>
-              <item>
-                <term>ERROR</term>
-                <description>
-                The <see cref="M:log4net.Core.LogImpl.Error(System.Object)"/> and <see cref="M:log4net.Core.LogImpl.ErrorFormat(System.String,System.Object[])"/> methods log messages
-                at the <c>ERROR</c> level. That is the level with that name defined in the
-                repositories <see cref="P:log4net.Repository.ILoggerRepository.LevelMap"/>. The default value
-                for this level is <see cref="F:log4net.Core.Level.Error"/>. The <see cref="P:log4net.Core.LogImpl.IsErrorEnabled"/>
-                property tests if this level is enabled for logging.
-                </description>
-              </item>
-              <item>
-                <term>FATAL</term>
-                <description>
-                The <see cref="M:log4net.Core.LogImpl.Fatal(System.Object)"/> and <see cref="M:log4net.Core.LogImpl.FatalFormat(System.String,System.Object[])"/> methods log messages
-                at the <c>FATAL</c> level. That is the level with that name defined in the
-                repositories <see cref="P:log4net.Repository.ILoggerRepository.LevelMap"/>. The default value
-                for this level is <see cref="F:log4net.Core.Level.Fatal"/>. The <see cref="P:log4net.Core.LogImpl.IsFatalEnabled"/>
-                property tests if this level is enabled for logging.
-                </description>
-              </item>
-            </list>
-            <para>
-            The values for these levels and their semantic meanings can be changed by 
-            configuring the <see cref="P:log4net.Repository.ILoggerRepository.LevelMap"/> for the repository.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-        </member>
-        <member name="T:log4net.ILog">
-            <summary>
-            The ILog interface is use by application to log messages into
-            the log4net framework.
-            </summary>
-            <remarks>
-            <para>
-            Use the <see cref="T:log4net.LogManager"/> to obtain logger instances
-            that implement this interface. The <see cref="M:log4net.LogManager.GetLogger(System.Reflection.Assembly,System.Type)"/>
-            static method is used to get logger instances.
-            </para>
-            <para>
-            This class contains methods for logging at different levels and also
-            has properties for determining if those logging levels are
-            enabled in the current configuration.
-            </para>
-            <para>
-            This interface can be implemented in different ways. This documentation
-            specifies reasonable behavior that a caller can expect from the actual
-            implementation, however different implementations reserve the right to
-            do things differently.
-            </para>
-            </remarks>
-            <example>Simple example of logging messages
-            <code lang="C#">
-            ILog log = LogManager.GetLogger("application-log");
-            
-            log.Info("Application Start");
-            log.Debug("This is a debug message");
-            
-            if (log.IsDebugEnabled)
-            {
-            	log.Debug("This is another debug message");
-            }
-            </code>
-            </example>
-            <seealso cref="T:log4net.LogManager"/>
-            <seealso cref="M:log4net.LogManager.GetLogger(System.Reflection.Assembly,System.Type)"/>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-        </member>
-        <member name="M:log4net.ILog.Debug(System.Object)">
-            <overloads>Log a message object with the <see cref="F:log4net.Core.Level.Debug"/> level.</overloads>
-            <summary>
-            Log a message object with the <see cref="F:log4net.Core.Level.Debug"/> level.
-            </summary>
-            <param name="message">The message object to log.</param>
-            <remarks>
-            <para>
-            This method first checks if this logger is <c>DEBUG</c>
-            enabled by comparing the level of this logger with the 
-            <see cref="F:log4net.Core.Level.Debug"/> level. If this logger is
-            <c>DEBUG</c> enabled, then it converts the message object
-            (passed as parameter) to a string by invoking the appropriate
-            <see cref="T:log4net.ObjectRenderer.IObjectRenderer"/>. It then 
-            proceeds to call all the registered appenders in this logger 
-            and also higher in the hierarchy depending on the value of 
-            the additivity flag.
-            </para>
-            <para><b>WARNING</b> Note that passing an <see cref="T:System.Exception"/> 
-            to this method will print the name of the <see cref="T:System.Exception"/> 
-            but no stack trace. To print a stack trace use the 
-            <see cref="M:log4net.ILog.Debug(System.Object,System.Exception)"/> form instead.
-            </para>
-            </remarks>
-            <seealso cref="M:log4net.ILog.Debug(System.Object,System.Exception)"/>
-            <seealso cref="P:log4net.ILog.IsDebugEnabled"/>
-        </member>
-        <member name="M:log4net.ILog.Debug(System.Object,System.Exception)">
-            <summary>
-            Log a message object with the <see cref="F:log4net.Core.Level.Debug"/> level including
-            the stack trace of the <see cref="T:System.Exception"/> passed
-            as a parameter.
-            </summary>
-            <param name="message">The message object to log.</param>
-            <param name="exception">The exception to log, including its stack trace.</param>
-            <remarks>
-            <para>
-            See the <see cref="M:log4net.ILog.Debug(System.Object)"/> form for more detailed information.
-            </para>
-            </remarks>
-            <seealso cref="M:log4net.ILog.Debug(System.Object)"/>
-            <seealso cref="P:log4net.ILog.IsDebugEnabled"/>
-        </member>
-        <member name="M:log4net.ILog.DebugFormat(System.String,System.Object[])">
-            <overloads>Log a formatted string with the <see cref="F:log4net.Core.Level.Debug"/> level.</overloads>
-            <summary>
-            Logs a formatted message string with the <see cref="F:log4net.Core.Level.Debug"/> level.
-            </summary>
-            <param name="format">A String containing zero or more format items</param>
-            <param name="args">An Object array containing zero or more objects to format</param>
-            <remarks>
-            <para>
-            The message is formatted using the <c>String.Format</c> method. See
-            <see cref="M:System.String.Format(System.String,System.Object[])"/> for details of the syntax of the format string and the behavior
-            of the formatting.
-            </para>
-            <para>
-            This method does not take an <see cref="T:System.Exception"/> object to include in the
-            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:log4net.ILog.Debug(System.Object,System.Exception)"/>
-            methods instead.
-            </para>
-            </remarks>
-            <seealso cref="M:log4net.ILog.Debug(System.Object)"/>
-            <seealso cref="P:log4net.ILog.IsDebugEnabled"/>
-        </member>
-        <member name="M:log4net.ILog.DebugFormat(System.String,System.Object)">
-            <summary>
-            Logs a formatted message string with the <see cref="F:log4net.Core.Level.Debug"/> level.
-            </summary>
-            <param name="format">A String containing zero or more format items</param>
-            <param name="arg0">An Object to format</param>
-            <remarks>
-            <para>
-            The message is formatted using the <c>String.Format</c> method. See
-            <see cref="M:System.String.Format(System.String,System.Object[])"/> for details of the syntax of the format string and the behavior
-            of the formatting.
-            </para>
-            <para>
-            This method does not take an <see cref="T:System.Exception"/> object to include in the
-            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:log4net.ILog.Debug(System.Object,System.Exception)"/>
-            methods instead.
-            </para>
-            </remarks>
-            <seealso cref="M:log4net.ILog.Debug(System.Object)"/>
-            <seealso cref="P:log4net.ILog.IsDebugEnabled"/>
-        </member>
-        <member name="M:log4net.ILog.DebugFormat(System.String,System.Object,System.Object)">
-            <summary>
-            Logs a formatted message string with the <see cref="F:log4net.Core.Level.Debug"/> level.
-            </summary>
-            <param name="format">A String containing zero or more format items</param>
-            <param name="arg0">An Object to format</param>
-            <param name="arg1">An Object to format</param>
-            <remarks>
-            <para>
-            The message is formatted using the <c>String.Format</c> method. See
-            <see cref="M:System.String.Format(System.String,System.Object[])"/> for details of the syntax of the format string and the behavior
-            of the formatting.
-            </para>
-            <para>
-            This method does not take an <see cref="T:System.Exception"/> object to include in the
-            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:log4net.ILog.Debug(System.Object,System.Exception)"/>
-            methods instead.
-            </para>
-            </remarks>
-            <seealso cref="M:log4net.ILog.Debug(System.Object)"/>
-            <seealso cref="P:log4net.ILog.IsDebugEnabled"/>
-        </member>
-        <member name="M:log4net.ILog.DebugFormat(System.String,System.Object,System.Object,System.Object)">
-            <summary>
-            Logs a formatted message string with the <see cref="F:log4net.Core.Level.Debug"/> level.
-            </summary>
-            <param name="format">A String containing zero or more format items</param>
-            <param name="arg0">An Object to format</param>
-            <param name="arg1">An Object to format</param>
-            <param name="arg2">An Object to format</param>
-            <remarks>
-            <para>
-            The message is formatted using the <c>String.Format</c> method. See
-            <see cref="M:System.String.Format(System.String,System.Object[])"/> for details of the syntax of the format string and the behavior
-            of the formatting.
-            </para>
-            <para>
-            This method does not take an <see cref="T:System.Exception"/> object to include in the
-            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:log4net.ILog.Debug(System.Object,System.Exception)"/>
-            methods instead.
-            </para>
-            </remarks>
-            <seealso cref="M:log4net.ILog.Debug(System.Object)"/>
-            <seealso cref="P:log4net.ILog.IsDebugEnabled"/>
-        </member>
-        <member name="M:log4net.ILog.DebugFormat(System.IFormatProvider,System.String,System.Object[])">
-            <summary>
-            Logs a formatted message string with the <see cref="F:log4net.Core.Level.Debug"/> level.
-            </summary>
-            <param name="provider">An <see cref="T:System.IFormatProvider"/> that supplies culture-specific formatting information</param>
-            <param name="format">A String containing zero or more format items</param>
-            <param name="args">An Object array containing zero or more objects to format</param>
-            <remarks>
-            <para>
-            The message is formatted using the <c>String.Format</c> method. See
-            <see cref="M:System.String.Format(System.String,System.Object[])"/> for details of the syntax of the format string and the behavior
-            of the formatting.
-            </para>
-            <para>
-            This method does not take an <see cref="T:System.Exception"/> object to include in the
-            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:log4net.ILog.Debug(System.Object,System.Exception)"/>
-            methods instead.
-            </para>
-            </remarks>
-            <seealso cref="M:log4net.ILog.Debug(System.Object)"/>
-            <seealso cref="P:log4net.ILog.IsDebugEnabled"/>
-        </member>
-        <member name="M:log4net.ILog.Info(System.Object)">
-            <overloads>Log a message object with the <see cref="F:log4net.Core.Level.Info"/> level.</overloads>
-            <summary>
-            Logs a message object with the <see cref="F:log4net.Core.Level.Info"/> level.
-            </summary>
-            <remarks>
-            <para>
-            This method first checks if this logger is <c>INFO</c>
-            enabled by comparing the level of this logger with the 
-            <see cref="F:log4net.Core.Level.Info"/> level. If this logger is
-            <c>INFO</c> enabled, then it converts the message object
-            (passed as parameter) to a string by invoking the appropriate
-            <see cref="T:log4net.ObjectRenderer.IObjectRenderer"/>. It then 
-            proceeds to call all the registered appenders in this logger 
-            and also higher in the hierarchy depending on the value of the 
-            additivity flag.
-            </para>
-            <para><b>WARNING</b> Note that passing an <see cref="T:System.Exception"/> 
-            to this method will print the name of the <see cref="T:System.Exception"/> 
-            but no stack trace. To print a stack trace use the 
-            <see cref="M:log4net.ILog.Info(System.Object,System.Exception)"/> form instead.
-            </para>
-            </remarks>
-            <param name="message">The message object to log.</param>
-            <seealso cref="M:log4net.ILog.Info(System.Object,System.Exception)"/>
-            <seealso cref="P:log4net.ILog.IsInfoEnabled"/>
-        </member>
-        <member name="M:log4net.ILog.Info(System.Object,System.Exception)">
-            <summary>
-            Logs a message object with the <c>INFO</c> level including
-            the stack trace of the <see cref="T:System.Exception"/> passed
-            as a parameter.
-            </summary>
-            <param name="message">The message object to log.</param>
-            <param name="exception">The exception to log, including its stack trace.</param>
-            <remarks>
-            <para>
-            See the <see cref="M:log4net.ILog.Info(System.Object)"/> form for more detailed information.
-            </para>
-            </remarks>
-            <seealso cref="M:log4net.ILog.Info(System.Object)"/>
-            <seealso cref="P:log4net.ILog.IsInfoEnabled"/>
-        </member>
-        <member name="M:log4net.ILog.InfoFormat(System.String,System.Object[])">
-            <overloads>Log a formatted message string with the <see cref="F:log4net.Core.Level.Info"/> level.</overloads>
-            <summary>
-            Logs a formatted message string with the <see cref="F:log4net.Core.Level.Info"/> level.
-            </summary>
-            <param name="format">A String containing zero or more format items</param>
-            <param name="args">An Object array containing zero or more objects to format</param>
-            <remarks>
-            <para>
-            The message is formatted using the <c>String.Format</c> method. See
-            <see cref="M:System.String.Format(System.String,System.Object[])"/> for details of the syntax of the format string and the behavior
-            of the formatting.
-            </para>
-            <para>
-            This method does not take an <see cref="T:System.Exception"/> object to include in the
-            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:log4net.ILog.Info(System.Object)"/>
-            methods instead.
-            </para>
-            </remarks>
-            <seealso cref="M:log4net.ILog.Info(System.Object,System.Exception)"/>
-            <seealso cref="P:log4net.ILog.IsInfoEnabled"/>
-        </member>
-        <member name="M:log4net.ILog.InfoFormat(System.String,System.Object)">
-            <summary>
-            Logs a formatted message string with the <see cref="F:log4net.Core.Level.Info"/> level.
-            </summary>
-            <param name="format">A String containing zero or more format items</param>
-            <param name="arg0">An Object to format</param>
-            <remarks>
-            <para>
-            The message is formatted using the <c>String.Format</c> method. See
-            <see cref="M:System.String.Format(System.String,System.Object[])"/> for details of the syntax of the format string and the behavior
-            of the formatting.
-            </para>
-            <para>
-            This method does not take an <see cref="T:System.Exception"/> object to include in the
-            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:log4net.ILog.Info(System.Object,System.Exception)"/>
-            methods instead.
-            </para>
-            </remarks>
-            <seealso cref="M:log4net.ILog.Info(System.Object)"/>
-            <seealso cref="P:log4net.ILog.IsInfoEnabled"/>
-        </member>
-        <member name="M:log4net.ILog.InfoFormat(System.String,System.Object,System.Object)">
-            <summary>
-            Logs a formatted message string with the <see cref="F:log4net.Core.Level.Info"/> level.
-            </summary>
-            <param name="format">A String containing zero or more format items</param>
-            <param name="arg0">An Object to format</param>
-            <param name="arg1">An Object to format</param>
-            <remarks>
-            <para>
-            The message is formatted using the <c>String.Format</c> method. See
-            <see cref="M:System.String.Format(System.String,System.Object[])"/> for details of the syntax of the format string and the behavior
-            of the formatting.
-            </para>
-            <para>
-            This method does not take an <see cref="T:System.Exception"/> object to include in the
-            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:log4net.ILog.Info(System.Object,System.Exception)"/>
-            methods instead.
-            </para>
-            </remarks>
-            <seealso cref="M:log4net.ILog.Info(System.Object)"/>
-            <seealso cref="P:log4net.ILog.IsInfoEnabled"/>
-        </member>
-        <member name="M:log4net.ILog.InfoFormat(System.String,System.Object,System.Object,System.Object)">
-            <summary>
-            Logs a formatted message string with the <see cref="F:log4net.Core.Level.Info"/> level.
-            </summary>
-            <param name="format">A String containing zero or more format items</param>
-            <param name="arg0">An Object to format</param>
-            <param name="arg1">An Object to format</param>
-            <param name="arg2">An Object to format</param>
-            <remarks>
-            <para>
-            The message is formatted using the <c>String.Format</c> method. See
-            <see cref="M:System.String.Format(System.String,System.Object[])"/> for details of the syntax of the format string and the behavior
-            of the formatting.
-            </para>
-            <para>
-            This method does not take an <see cref="T:System.Exception"/> object to include in the
-            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:log4net.ILog.Info(System.Object,System.Exception)"/>
-            methods instead.
-            </para>
-            </remarks>
-            <seealso cref="M:log4net.ILog.Info(System.Object)"/>
-            <seealso cref="P:log4net.ILog.IsInfoEnabled"/>
-        </member>
-        <member name="M:log4net.ILog.InfoFormat(System.IFormatProvider,System.String,System.Object[])">
-            <summary>
-            Logs a formatted message string with the <see cref="F:log4net.Core.Level.Info"/> level.
-            </summary>
-            <param name="provider">An <see cref="T:System.IFormatProvider"/> that supplies culture-specific formatting information</param>
-            <param name="format">A String containing zero or more format items</param>
-            <param name="args">An Object array containing zero or more objects to format</param>
-            <remarks>
-            <para>
-            The message is formatted using the <c>String.Format</c> method. See
-            <see cref="M:System.String.Format(System.String,System.Object[])"/> for details of the syntax of the format string and the behavior
-            of the formatting.
-            </para>
-            <para>
-            This method does not take an <see cref="T:System.Exception"/> object to include in the
-            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:log4net.ILog.Info(System.Object)"/>
-            methods instead.
-            </para>
-            </remarks>
-            <seealso cref="M:log4net.ILog.Info(System.Object,System.Exception)"/>
-            <seealso cref="P:log4net.ILog.IsInfoEnabled"/>
-        </member>
-        <member name="M:log4net.ILog.Warn(System.Object)">
-            <overloads>Log a message object with the <see cref="F:log4net.Core.Level.Warn"/> level.</overloads>
-            <summary>
-            Log a message object with the <see cref="F:log4net.Core.Level.Warn"/> level.
-            </summary>
-            <remarks>
-            <para>
-            This method first checks if this logger is <c>WARN</c>
-            enabled by comparing the level of this logger with the 
-            <see cref="F:log4net.Core.Level.Warn"/> level. If this logger is
-            <c>WARN</c> enabled, then it converts the message object
-            (passed as parameter) to a string by invoking the appropriate
-            <see cref="T:log4net.ObjectRenderer.IObjectRenderer"/>. It then 
-            proceeds to call all the registered appenders in this logger 
-            and also higher in the hierarchy depending on the value of the 
-            additivity flag.
-            </para>
-            <para><b>WARNING</b> Note that passing an <see cref="T:System.Exception"/> 
-            to this method will print the name of the <see cref="T:System.Exception"/> 
-            but no stack trace. To print a stack trace use the 
-            <see cref="M:log4net.ILog.Warn(System.Object,System.Exception)"/> form instead.
-            </para>
-            </remarks>
-            <param name="message">The message object to log.</param>
-            <seealso cref="M:log4net.ILog.Warn(System.Object,System.Exception)"/>
-            <seealso cref="P:log4net.ILog.IsWarnEnabled"/>
-        </member>
-        <member name="M:log4net.ILog.Warn(System.Object,System.Exception)">
-            <summary>
-            Log a message object with the <see cref="F:log4net.Core.Level.Warn"/> level including
-            the stack trace of the <see cref="T:System.Exception"/> passed
-            as a parameter.
-            </summary>
-            <param name="message">The message object to log.</param>
-            <param name="exception">The exception to log, including its stack trace.</param>
-            <remarks>
-            <para>
-            See the <see cref="M:log4net.ILog.Warn(System.Object)"/> form for more detailed information.
-            </para>
-            </remarks>
-            <seealso cref="M:log4net.ILog.Warn(System.Object)"/>
-            <seealso cref="P:log4net.ILog.IsWarnEnabled"/>
-        </member>
-        <member name="M:log4net.ILog.WarnFormat(System.String,System.Object[])">
-            <overloads>Log a formatted message string with the <see cref="F:log4net.Core.Level.Warn"/> level.</overloads>
-            <summary>
-            Logs a formatted message string with the <see cref="F:log4net.Core.Level.Warn"/> level.
-            </summary>
-            <param name="format">A String containing zero or more format items</param>
-            <param name="args">An Object array containing zero or more objects to format</param>
-            <remarks>
-            <para>
-            The message is formatted using the <c>String.Format</c> method. See
-            <see cref="M:System.String.Format(System.String,System.Object[])"/> for details of the syntax of the format string and the behavior
-            of the formatting.
-            </para>
-            <para>
-            This method does not take an <see cref="T:System.Exception"/> object to include in the
-            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:log4net.ILog.Warn(System.Object)"/>
-            methods instead.
-            </para>
-            </remarks>
-            <seealso cref="M:log4net.ILog.Warn(System.Object,System.Exception)"/>
-            <seealso cref="P:log4net.ILog.IsWarnEnabled"/>
-        </member>
-        <member name="M:log4net.ILog.WarnFormat(System.String,System.Object)">
-            <summary>
-            Logs a formatted message string with the <see cref="F:log4net.Core.Level.Warn"/> level.
-            </summary>
-            <param name="format">A String containing zero or more format items</param>
-            <param name="arg0">An Object to format</param>
-            <remarks>
-            <para>
-            The message is formatted using the <c>String.Format</c> method. See
-            <see cref="M:System.String.Format(System.String,System.Object[])"/> for details of the syntax of the format string and the behavior
-            of the formatting.
-            </para>
-            <para>
-            This method does not take an <see cref="T:System.Exception"/> object to include in the
-            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:log4net.ILog.Warn(System.Object,System.Exception)"/>
-            methods instead.
-            </para>
-            </remarks>
-            <seealso cref="M:log4net.ILog.Warn(System.Object)"/>
-            <seealso cref="P:log4net.ILog.IsWarnEnabled"/>
-        </member>
-        <member name="M:log4net.ILog.WarnFormat(System.String,System.Object,System.Object)">
-            <summary>
-            Logs a formatted message string with the <see cref="F:log4net.Core.Level.Warn"/> level.
-            </summary>
-            <param name="format">A String containing zero or more format items</param>
-            <param name="arg0">An Object to format</param>
-            <param name="arg1">An Object to format</param>
-            <remarks>
-            <para>
-            The message is formatted using the <c>String.Format</c> method. See
-            <see cref="M:System.String.Format(System.String,System.Object[])"/> for details of the syntax of the format string and the behavior
-            of the formatting.
-            </para>
-            <para>
-            This method does not take an <see cref="T:System.Exception"/> object to include in the
-            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:log4net.ILog.Warn(System.Object,System.Exception)"/>
-            methods instead.
-            </para>
-            </remarks>
-            <seealso cref="M:log4net.ILog.Warn(System.Object)"/>
-            <seealso cref="P:log4net.ILog.IsWarnEnabled"/>
-        </member>
-        <member name="M:log4net.ILog.WarnFormat(System.String,System.Object,System.Object,System.Object)">
-            <summary>
-            Logs a formatted message string with the <see cref="F:log4net.Core.Level.Warn"/> level.
-            </summary>
-            <param name="format">A String containing zero or more format items</param>
-            <param name="arg0">An Object to format</param>
-            <param name="arg1">An Object to format</param>
-            <param name="arg2">An Object to format</param>
-            <remarks>
-            <para>
-            The message is formatted using the <c>String.Format</c> method. See
-            <see cref="M:System.String.Format(System.String,System.Object[])"/> for details of the syntax of the format string and the behavior
-            of the formatting.
-            </para>
-            <para>
-            This method does not take an <see cref="T:System.Exception"/> object to include in the
-            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:log4net.ILog.Warn(System.Object,System.Exception)"/>
-            methods instead.
-            </para>
-            </remarks>
-            <seealso cref="M:log4net.ILog.Warn(System.Object)"/>
-            <seealso cref="P:log4net.ILog.IsWarnEnabled"/>
-        </member>
-        <member name="M:log4net.ILog.WarnFormat(System.IFormatProvider,System.String,System.Object[])">
-            <summary>
-            Logs a formatted message string with the <see cref="F:log4net.Core.Level.Warn"/> level.
-            </summary>
-            <param name="provider">An <see cref="T:System.IFormatProvider"/> that supplies culture-specific formatting information</param>
-            <param name="format">A String containing zero or more format items</param>
-            <param name="args">An Object array containing zero or more objects to format</param>
-            <remarks>
-            <para>
-            The message is formatted using the <c>String.Format</c> method. See
-            <see cref="M:System.String.Format(System.String,System.Object[])"/> for details of the syntax of the format string and the behavior
-            of the formatting.
-            </para>
-            <para>
-            This method does not take an <see cref="T:System.Exception"/> object to include in the
-            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:log4net.ILog.Warn(System.Object)"/>
-            methods instead.
-            </para>
-            </remarks>
-            <seealso cref="M:log4net.ILog.Warn(System.Object,System.Exception)"/>
-            <seealso cref="P:log4net.ILog.IsWarnEnabled"/>
-        </member>
-        <member name="M:log4net.ILog.Error(System.Object)">
-            <overloads>Log a message object with the <see cref="F:log4net.Core.Level.Error"/> level.</overloads>
-            <summary>
-            Logs a message object with the <see cref="F:log4net.Core.Level.Error"/> level.
-            </summary>
-            <param name="message">The message object to log.</param>
-            <remarks>
-            <para>
-            This method first checks if this logger is <c>ERROR</c>
-            enabled by comparing the level of this logger with the 
-            <see cref="F:log4net.Core.Level.Error"/> level. If this logger is
-            <c>ERROR</c> enabled, then it converts the message object
-            (passed as parameter) to a string by invoking the appropriate
-            <see cref="T:log4net.ObjectRenderer.IObjectRenderer"/>. It then 
-            proceeds to call all the registered appenders in this logger 
-            and also higher in the hierarchy depending on the value of the 
-            additivity flag.
-            </para>
-            <para><b>WARNING</b> Note that passing an <see cref="T:System.Exception"/> 
-            to this method will print the name of the <see cref="T:System.Exception"/> 
-            but no stack trace. To print a stack trace use the 
-            <see cref="M:log4net.ILog.Error(System.Object,System.Exception)"/> form instead.
-            </para>
-            </remarks>
-            <seealso cref="M:log4net.ILog.Error(System.Object,System.Exception)"/>
-            <seealso cref="P:log4net.ILog.IsErrorEnabled"/>
-        </member>
-        <member name="M:log4net.ILog.Error(System.Object,System.Exception)">
-            <summary>
-            Log a message object with the <see cref="F:log4net.Core.Level.Error"/> level including
-            the stack trace of the <see cref="T:System.Exception"/> passed
-            as a parameter.
-            </summary>
-            <param name="message">The message object to log.</param>
-            <param name="exception">The exception to log, including its stack trace.</param>
-            <remarks>
-            <para>
-            See the <see cref="M:log4net.ILog.Error(System.Object)"/> form for more detailed information.
-            </para>
-            </remarks>
-            <seealso cref="M:log4net.ILog.Error(System.Object)"/>
-            <seealso cref="P:log4net.ILog.IsErrorEnabled"/>
-        </member>
-        <member name="M:log4net.ILog.ErrorFormat(System.String,System.Object[])">
-            <overloads>Log a formatted message string with the <see cref="F:log4net.Core.Level.Error"/> level.</overloads>
-            <summary>
-            Logs a formatted message string with the <see cref="F:log4net.Core.Level.Error"/> level.
-            </summary>
-            <param name="format">A String containing zero or more format items</param>
-            <param name="args">An Object array containing zero or more objects to format</param>
-            <remarks>
-            <para>
-            The message is formatted using the <c>String.Format</c> method. See
-            <see cref="M:System.String.Format(System.String,System.Object[])"/> for details of the syntax of the format string and the behavior
-            of the formatting.
-            </para>
-            <para>
-            This method does not take an <see cref="T:System.Exception"/> object to include in the
-            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:log4net.ILog.Error(System.Object)"/>
-            methods instead.
-            </para>
-            </remarks>
-            <seealso cref="M:log4net.ILog.Error(System.Object,System.Exception)"/>
-            <seealso cref="P:log4net.ILog.IsErrorEnabled"/>
-        </member>
-        <member name="M:log4net.ILog.ErrorFormat(System.String,System.Object)">
-            <summary>
-            Logs a formatted message string with the <see cref="F:log4net.Core.Level.Error"/> level.
-            </summary>
-            <param name="format">A String containing zero or more format items</param>
-            <param name="arg0">An Object to format</param>
-            <remarks>
-            <para>
-            The message is formatted using the <c>String.Format</c> method. See
-            <see cref="M:System.String.Format(System.String,System.Object[])"/> for details of the syntax of the format string and the behavior
-            of the formatting.
-            </para>
-            <para>
-            This method does not take an <see cref="T:System.Exception"/> object to include in the
-            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:log4net.ILog.Error(System.Object,System.Exception)"/>
-            methods instead.
-            </para>
-            </remarks>
-            <seealso cref="M:log4net.ILog.Error(System.Object)"/>
-            <seealso cref="P:log4net.ILog.IsErrorEnabled"/>
-        </member>
-        <member name="M:log4net.ILog.ErrorFormat(System.String,System.Object,System.Object)">
-            <summary>
-            Logs a formatted message string with the <see cref="F:log4net.Core.Level.Error"/> level.
-            </summary>
-            <param name="format">A String containing zero or more format items</param>
-            <param name="arg0">An Object to format</param>
-            <param name="arg1">An Object to format</param>
-            <remarks>
-            <para>
-            The message is formatted using the <c>String.Format</c> method. See
-            <see cref="M:System.String.Format(System.String,System.Object[])"/> for details of the syntax of the format string and the behavior
-            of the formatting.
-            </para>
-            <para>
-            This method does not take an <see cref="T:System.Exception"/> object to include in the
-            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:log4net.ILog.Error(System.Object,System.Exception)"/>
-            methods instead.
-            </para>
-            </remarks>
-            <seealso cref="M:log4net.ILog.Error(System.Object)"/>
-            <seealso cref="P:log4net.ILog.IsErrorEnabled"/>
-        </member>
-        <member name="M:log4net.ILog.ErrorFormat(System.String,System.Object,System.Object,System.Object)">
-            <summary>
-            Logs a formatted message string with the <see cref="F:log4net.Core.Level.Error"/> level.
-            </summary>
-            <param name="format">A String containing zero or more format items</param>
-            <param name="arg0">An Object to format</param>
-            <param name="arg1">An Object to format</param>
-            <param name="arg2">An Object to format</param>
-            <remarks>
-            <para>
-            The message is formatted using the <c>String.Format</c> method. See
-            <see cref="M:System.String.Format(System.String,System.Object[])"/> for details of the syntax of the format string and the behavior
-            of the formatting.
-            </para>
-            <para>
-            This method does not take an <see cref="T:System.Exception"/> object to include in the
-            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:log4net.ILog.Error(System.Object,System.Exception)"/>
-            methods instead.
-            </para>
-            </remarks>
-            <seealso cref="M:log4net.ILog.Error(System.Object)"/>
-            <seealso cref="P:log4net.ILog.IsErrorEnabled"/>
-        </member>
-        <member name="M:log4net.ILog.ErrorFormat(System.IFormatProvider,System.String,System.Object[])">
-            <summary>
-            Logs a formatted message string with the <see cref="F:log4net.Core.Level.Error"/> level.
-            </summary>
-            <param name="provider">An <see cref="T:System.IFormatProvider"/> that supplies culture-specific formatting information</param>
-            <param name="format">A String containing zero or more format items</param>
-            <param name="args">An Object array containing zero or more objects to format</param>
-            <remarks>
-            <para>
-            The message is formatted using the <c>String.Format</c> method. See
-            <see cref="M:System.String.Format(System.String,System.Object[])"/> for details of the syntax of the format string and the behavior
-            of the formatting.
-            </para>
-            <para>
-            This method does not take an <see cref="T:System.Exception"/> object to include in the
-            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:log4net.ILog.Error(System.Object)"/>
-            methods instead.
-            </para>
-            </remarks>
-            <seealso cref="M:log4net.ILog.Error(System.Object,System.Exception)"/>
-            <seealso cref="P:log4net.ILog.IsErrorEnabled"/>
-        </member>
-        <member name="M:log4net.ILog.Fatal(System.Object)">
-            <overloads>Log a message object with the <see cref="F:log4net.Core.Level.Fatal"/> level.</overloads>
-            <summary>
-            Log a message object with the <see cref="F:log4net.Core.Level.Fatal"/> level.
-            </summary>
-            <remarks>
-            <para>
-            This method first checks if this logger is <c>FATAL</c>
-            enabled by comparing the level of this logger with the 
-            <see cref="F:log4net.Core.Level.Fatal"/> level. If this logger is
-            <c>FATAL</c> enabled, then it converts the message object
-            (passed as parameter) to a string by invoking the appropriate
-            <see cref="T:log4net.ObjectRenderer.IObjectRenderer"/>. It then 
-            proceeds to call all the registered appenders in this logger 
-            and also higher in the hierarchy depending on the value of the 
-            additivity flag.
-            </para>
-            <para><b>WARNING</b> Note that passing an <see cref="T:System.Exception"/> 
-            to this method will print the name of the <see cref="T:System.Exception"/> 
-            but no stack trace. To print a stack trace use the 
-            <see cref="M:log4net.ILog.Fatal(System.Object,System.Exception)"/> form instead.
-            </para>
-            </remarks>
-            <param name="message">The message object to log.</param>
-            <seealso cref="M:log4net.ILog.Fatal(System.Object,System.Exception)"/>
-            <seealso cref="P:log4net.ILog.IsFatalEnabled"/>
-        </member>
-        <member name="M:log4net.ILog.Fatal(System.Object,System.Exception)">
-            <summary>
-            Log a message object with the <see cref="F:log4net.Core.Level.Fatal"/> level including
-            the stack trace of the <see cref="T:System.Exception"/> passed
-            as a parameter.
-            </summary>
-            <param name="message">The message object to log.</param>
-            <param name="exception">The exception to log, including its stack trace.</param>
-            <remarks>
-            <para>
-            See the <see cref="M:log4net.ILog.Fatal(System.Object)"/> form for more detailed information.
-            </para>
-            </remarks>
-            <seealso cref="M:log4net.ILog.Fatal(System.Object)"/>
-            <seealso cref="P:log4net.ILog.IsFatalEnabled"/>
-        </member>
-        <member name="M:log4net.ILog.FatalFormat(System.String,System.Object[])">
-            <overloads>Log a formatted message string with the <see cref="F:log4net.Core.Level.Fatal"/> level.</overloads>
-            <summary>
-            Logs a formatted message string with the <see cref="F:log4net.Core.Level.Fatal"/> level.
-            </summary>
-            <param name="format">A String containing zero or more format items</param>
-            <param name="args">An Object array containing zero or more objects to format</param>
-            <remarks>
-            <para>
-            The message is formatted using the <c>String.Format</c> method. See
-            <see cref="M:System.String.Format(System.String,System.Object[])"/> for details of the syntax of the format string and the behavior
-            of the formatting.
-            </para>
-            <para>
-            This method does not take an <see cref="T:System.Exception"/> object to include in the
-            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:log4net.ILog.Fatal(System.Object)"/>
-            methods instead.
-            </para>
-            </remarks>
-            <seealso cref="M:log4net.ILog.Fatal(System.Object,System.Exception)"/>
-            <seealso cref="P:log4net.ILog.IsFatalEnabled"/>
-        </member>
-        <member name="M:log4net.ILog.FatalFormat(System.String,System.Object)">
-            <summary>
-            Logs a formatted message string with the <see cref="F:log4net.Core.Level.Fatal"/> level.
-            </summary>
-            <param name="format">A String containing zero or more format items</param>
-            <param name="arg0">An Object to format</param>
-            <remarks>
-            <para>
-            The message is formatted using the <c>String.Format</c> method. See
-            <see cref="M:System.String.Format(System.String,System.Object[])"/> for details of the syntax of the format string and the behavior
-            of the formatting.
-            </para>
-            <para>
-            This method does not take an <see cref="T:System.Exception"/> object to include in the
-            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:log4net.ILog.Fatal(System.Object,System.Exception)"/>
-            methods instead.
-            </para>
-            </remarks>
-            <seealso cref="M:log4net.ILog.Fatal(System.Object)"/>
-            <seealso cref="P:log4net.ILog.IsFatalEnabled"/>
-        </member>
-        <member name="M:log4net.ILog.FatalFormat(System.String,System.Object,System.Object)">
-            <summary>
-            Logs a formatted message string with the <see cref="F:log4net.Core.Level.Fatal"/> level.
-            </summary>
-            <param name="format">A String containing zero or more format items</param>
-            <param name="arg0">An Object to format</param>
-            <param name="arg1">An Object to format</param>
-            <remarks>
-            <para>
-            The message is formatted using the <c>String.Format</c> method. See
-            <see cref="M:System.String.Format(System.String,System.Object[])"/> for details of the syntax of the format string and the behavior
-            of the formatting.
-            </para>
-            <para>
-            This method does not take an <see cref="T:System.Exception"/> object to include in the
-            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:log4net.ILog.Fatal(System.Object,System.Exception)"/>
-            methods instead.
-            </para>
-            </remarks>
-            <seealso cref="M:log4net.ILog.Fatal(System.Object)"/>
-            <seealso cref="P:log4net.ILog.IsFatalEnabled"/>
-        </member>
-        <member name="M:log4net.ILog.FatalFormat(System.String,System.Object,System.Object,System.Object)">
-            <summary>
-            Logs a formatted message string with the <see cref="F:log4net.Core.Level.Fatal"/> level.
-            </summary>
-            <param name="format">A String containing zero or more format items</param>
-            <param name="arg0">An Object to format</param>
-            <param name="arg1">An Object to format</param>
-            <param name="arg2">An Object to format</param>
-            <remarks>
-            <para>
-            The message is formatted using the <c>String.Format</c> method. See
-            <see cref="M:System.String.Format(System.String,System.Object[])"/> for details of the syntax of the format string and the behavior
-            of the formatting.
-            </para>
-            <para>
-            This method does not take an <see cref="T:System.Exception"/> object to include in the
-            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:log4net.ILog.Fatal(System.Object,System.Exception)"/>
-            methods instead.
-            </para>
-            </remarks>
-            <seealso cref="M:log4net.ILog.Fatal(System.Object)"/>
-            <seealso cref="P:log4net.ILog.IsFatalEnabled"/>
-        </member>
-        <member name="M:log4net.ILog.FatalFormat(System.IFormatProvider,System.String,System.Object[])">
-            <summary>
-            Logs a formatted message string with the <see cref="F:log4net.Core.Level.Fatal"/> level.
-            </summary>
-            <param name="provider">An <see cref="T:System.IFormatProvider"/> that supplies culture-specific formatting information</param>
-            <param name="format">A String containing zero or more format items</param>
-            <param name="args">An Object array containing zero or more objects to format</param>
-            <remarks>
-            <para>
-            The message is formatted using the <c>String.Format</c> method. See
-            <see cref="M:System.String.Format(System.String,System.Object[])"/> for details of the syntax of the format string and the behavior
-            of the formatting.
-            </para>
-            <para>
-            This method does not take an <see cref="T:System.Exception"/> object to include in the
-            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:log4net.ILog.Fatal(System.Object)"/>
-            methods instead.
-            </para>
-            </remarks>
-            <seealso cref="M:log4net.ILog.Fatal(System.Object,System.Exception)"/>
-            <seealso cref="P:log4net.ILog.IsFatalEnabled"/>
-        </member>
-        <member name="P:log4net.ILog.IsDebugEnabled">
-            <summary>
-            Checks if this logger is enabled for the <see cref="F:log4net.Core.Level.Debug"/> level.
-            </summary>
-            <value>
-            <c>true</c> if this logger is enabled for <see cref="F:log4net.Core.Level.Debug"/> events, <c>false</c> otherwise.
-            </value>
-            <remarks>
-            <para>
-            This function is intended to lessen the computational cost of
-            disabled log debug statements.
-            </para>
-            <para> For some ILog interface <c>log</c>, when you write:</para>
-            <code lang="C#">
-            log.Debug("This is entry number: " + i );
-            </code>
-            <para>
-            You incur the cost constructing the message, string construction and concatenation in
-            this case, regardless of whether the message is logged or not.
-            </para>
-            <para>
-            If you are worried about speed (who isn't), then you should write:
-            </para>
-            <code lang="C#">
-            if (log.IsDebugEnabled)
-            { 
-                log.Debug("This is entry number: " + i );
-            }
-            </code>
-            <para>
-            This way you will not incur the cost of parameter
-            construction if debugging is disabled for <c>log</c>. On
-            the other hand, if the <c>log</c> is debug enabled, you
-            will incur the cost of evaluating whether the logger is debug
-            enabled twice. Once in <see cref="P:log4net.ILog.IsDebugEnabled"/> and once in
-            the <see cref="M:log4net.ILog.Debug(System.Object)"/>.  This is an insignificant overhead
-            since evaluating a logger takes about 1% of the time it
-            takes to actually log. This is the preferred style of logging.
-            </para>
-            <para>Alternatively if your logger is available statically then the is debug
-            enabled state can be stored in a static variable like this:
-            </para>
-            <code lang="C#">
-            private static readonly bool isDebugEnabled = log.IsDebugEnabled;
-            </code>
-            <para>
-            Then when you come to log you can write:
-            </para>
-            <code lang="C#">
-            if (isDebugEnabled)
-            { 
-                log.Debug("This is entry number: " + i );
-            }
-            </code>
-            <para>
-            This way the debug enabled state is only queried once
-            when the class is loaded. Using a <c>private static readonly</c>
-            variable is the most efficient because it is a run time constant
-            and can be heavily optimized by the JIT compiler.
-            </para>
-            <para>
-            Of course if you use a static readonly variable to
-            hold the enabled state of the logger then you cannot
-            change the enabled state at runtime to vary the logging
-            that is produced. You have to decide if you need absolute
-            speed or runtime flexibility.
-            </para>
-            </remarks>
-            <seealso cref="M:log4net.ILog.Debug(System.Object)"/>
-            <seealso cref="M:log4net.ILog.DebugFormat(System.IFormatProvider,System.String,System.Object[])"/>
-        </member>
-        <member name="P:log4net.ILog.IsInfoEnabled">
-            <summary>
-            Checks if this logger is enabled for the <see cref="F:log4net.Core.Level.Info"/> level.
-            </summary>
-            <value>
-            <c>true</c> if this logger is enabled for <see cref="F:log4net.Core.Level.Info"/> events, <c>false</c> otherwise.
-            </value>
-            <remarks>
-            For more information see <see cref="P:log4net.ILog.IsDebugEnabled"/>.
-            </remarks>
-            <seealso cref="M:log4net.ILog.Info(System.Object)"/>
-            <seealso cref="M:log4net.ILog.InfoFormat(System.IFormatProvider,System.String,System.Object[])"/>
-            <seealso cref="P:log4net.ILog.IsDebugEnabled"/>
-        </member>
-        <member name="P:log4net.ILog.IsWarnEnabled">
-            <summary>
-            Checks if this logger is enabled for the <see cref="F:log4net.Core.Level.Warn"/> level.
-            </summary>
-            <value>
-            <c>true</c> if this logger is enabled for <see cref="F:log4net.Core.Level.Warn"/> events, <c>false</c> otherwise.
-            </value>
-            <remarks>
-            For more information see <see cref="P:log4net.ILog.IsDebugEnabled"/>.
-            </remarks>
-            <seealso cref="M:log4net.ILog.Warn(System.Object)"/>
-            <seealso cref="M:log4net.ILog.WarnFormat(System.IFormatProvider,System.String,System.Object[])"/>
-            <seealso cref="P:log4net.ILog.IsDebugEnabled"/>
-        </member>
-        <member name="P:log4net.ILog.IsErrorEnabled">
-            <summary>
-            Checks if this logger is enabled for the <see cref="F:log4net.Core.Level.Error"/> level.
-            </summary>
-            <value>
-            <c>true</c> if this logger is enabled for <see cref="F:log4net.Core.Level.Error"/> events, <c>false</c> otherwise.
-            </value>
-            <remarks>
-            For more information see <see cref="P:log4net.ILog.IsDebugEnabled"/>.
-            </remarks>
-            <seealso cref="M:log4net.ILog.Error(System.Object)"/>
-            <seealso cref="M:log4net.ILog.ErrorFormat(System.IFormatProvider,System.String,System.Object[])"/>
-            <seealso cref="P:log4net.ILog.IsDebugEnabled"/>
-        </member>
-        <member name="P:log4net.ILog.IsFatalEnabled">
-            <summary>
-            Checks if this logger is enabled for the <see cref="F:log4net.Core.Level.Fatal"/> level.
-            </summary>
-            <value>
-            <c>true</c> if this logger is enabled for <see cref="F:log4net.Core.Level.Fatal"/> events, <c>false</c> otherwise.
-            </value>
-            <remarks>
-            For more information see <see cref="P:log4net.ILog.IsDebugEnabled"/>.
-            </remarks>
-            <seealso cref="M:log4net.ILog.Fatal(System.Object)"/>
-            <seealso cref="M:log4net.ILog.FatalFormat(System.IFormatProvider,System.String,System.Object[])"/>
-            <seealso cref="P:log4net.ILog.IsDebugEnabled"/>
-        </member>
-        <member name="M:log4net.Core.LogImpl.#ctor(log4net.Core.ILogger)">
-            <summary>
-            Construct a new wrapper for the specified logger.
-            </summary>
-            <param name="logger">The logger to wrap.</param>
-            <remarks>
-            <para>
-            Construct a new wrapper for the specified logger.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.LogImpl.ReloadLevels(log4net.Repository.ILoggerRepository)">
-            <summary>
-            Virtual method called when the configuration of the repository changes
-            </summary>
-            <param name="repository">the repository holding the levels</param>
-            <remarks>
-            <para>
-            Virtual method called when the configuration of the repository changes
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.LogImpl.Debug(System.Object)">
-            <summary>
-            Logs a message object with the <c>DEBUG</c> level.
-            </summary>
-            <param name="message">The message object to log.</param>
-            <remarks>
-            <para>
-            This method first checks if this logger is <c>DEBUG</c>
-            enabled by comparing the level of this logger with the 
-            <c>DEBUG</c> level. If this logger is
-            <c>DEBUG</c> enabled, then it converts the message object
-            (passed as parameter) to a string by invoking the appropriate
-            <see cref="T:log4net.ObjectRenderer.IObjectRenderer"/>. It then 
-            proceeds to call all the registered appenders in this logger 
-            and also higher in the hierarchy depending on the value of the 
-            additivity flag.
-            </para>
-            <para>
-            <b>WARNING</b> Note that passing an <see cref="T:System.Exception"/> 
-            to this method will print the name of the <see cref="T:System.Exception"/> 
-            but no stack trace. To print a stack trace use the 
-            <see cref="M:log4net.Core.LogImpl.Debug(System.Object,System.Exception)"/> form instead.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.LogImpl.Debug(System.Object,System.Exception)">
-            <summary>
-            Logs a message object with the <c>DEBUG</c> level
-            </summary>
-            <param name="message">The message object to log.</param>
-            <param name="exception">The exception to log, including its stack trace.</param>
-            <remarks>
-            <para>
-            Logs a message object with the <c>DEBUG</c> level including
-            the stack trace of the <see cref="T:System.Exception"/> <paramref name="exception"/> passed
-            as a parameter.
-            </para>
-            <para>
-            See the <see cref="M:log4net.Core.LogImpl.Debug(System.Object)"/> form for more detailed information.
-            </para>
-            </remarks>
-            <seealso cref="M:log4net.Core.LogImpl.Debug(System.Object)"/>
-        </member>
-        <member name="M:log4net.Core.LogImpl.DebugFormat(System.String,System.Object[])">
-            <summary>
-            Logs a formatted message string with the <c>DEBUG</c> level.
-            </summary>
-            <param name="format">A String containing zero or more format items</param>
-            <param name="args">An Object array containing zero or more objects to format</param>
-            <remarks>
-            <para>
-            The message is formatted using the <see cref="M:System.String.Format(System.IFormatProvider,System.String,System.Object[])"/> method. See
-            <c>String.Format</c> for details of the syntax of the format string and the behavior
-            of the formatting.
-            </para>
-            <para>
-            The string is formatted using the <see cref="P:System.Globalization.CultureInfo.InvariantCulture"/>
-            format provider. To specify a localized provider use the
-            <see cref="M:log4net.Core.LogImpl.DebugFormat(System.IFormatProvider,System.String,System.Object[])"/> method.
-            </para>
-            <para>
-            This method does not take an <see cref="T:System.Exception"/> object to include in the
-            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:log4net.Core.LogImpl.Debug(System.Object)"/>
-            methods instead.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.LogImpl.DebugFormat(System.String,System.Object)">
-            <summary>
-            Logs a formatted message string with the <c>DEBUG</c> level.
-            </summary>
-            <param name="format">A String containing zero or more format items</param>
-            <param name="arg0">An Object to format</param>
-            <remarks>
-            <para>
-            The message is formatted using the <see cref="M:System.String.Format(System.IFormatProvider,System.String,System.Object[])"/> method. See
-            <c>String.Format</c> for details of the syntax of the format string and the behavior
-            of the formatting.
-            </para>
-            <para>
-            The string is formatted using the <see cref="P:System.Globalization.CultureInfo.InvariantCulture"/>
-            format provider. To specify a localized provider use the
-            <see cref="M:log4net.Core.LogImpl.DebugFormat(System.IFormatProvider,System.String,System.Object[])"/> method.
-            </para>
-            <para>
-            This method does not take an <see cref="T:System.Exception"/> object to include in the
-            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:log4net.Core.LogImpl.Debug(System.Object)"/>
-            methods instead.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.LogImpl.DebugFormat(System.String,System.Object,System.Object)">
-            <summary>
-            Logs a formatted message string with the <c>DEBUG</c> level.
-            </summary>
-            <param name="format">A String containing zero or more format items</param>
-            <param name="arg0">An Object to format</param>
-            <param name="arg1">An Object to format</param>
-            <remarks>
-            <para>
-            The message is formatted using the <see cref="M:System.String.Format(System.IFormatProvider,System.String,System.Object[])"/> method. See
-            <c>String.Format</c> for details of the syntax of the format string and the behavior
-            of the formatting.
-            </para>
-            <para>
-            The string is formatted using the <see cref="P:System.Globalization.CultureInfo.InvariantCulture"/>
-            format provider. To specify a localized provider use the
-            <see cref="M:log4net.Core.LogImpl.DebugFormat(System.IFormatProvider,System.String,System.Object[])"/> method.
-            </para>
-            <para>
-            This method does not take an <see cref="T:System.Exception"/> object to include in the
-            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:log4net.Core.LogImpl.Debug(System.Object)"/>
-            methods instead.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.LogImpl.DebugFormat(System.String,System.Object,System.Object,System.Object)">
-            <summary>
-            Logs a formatted message string with the <c>DEBUG</c> level.
-            </summary>
-            <param name="format">A String containing zero or more format items</param>
-            <param name="arg0">An Object to format</param>
-            <param name="arg1">An Object to format</param>
-            <param name="arg2">An Object to format</param>
-            <remarks>
-            <para>
-            The message is formatted using the <see cref="M:System.String.Format(System.IFormatProvider,System.String,System.Object[])"/> method. See
-            <c>String.Format</c> for details of the syntax of the format string and the behavior
-            of the formatting.
-            </para>
-            <para>
-            The string is formatted using the <see cref="P:System.Globalization.CultureInfo.InvariantCulture"/>
-            format provider. To specify a localized provider use the
-            <see cref="M:log4net.Core.LogImpl.DebugFormat(System.IFormatProvider,System.String,System.Object[])"/> method.
-            </para>
-            <para>
-            This method does not take an <see cref="T:System.Exception"/> object to include in the
-            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:log4net.Core.LogImpl.Debug(System.Object)"/>
-            methods instead.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.LogImpl.DebugFormat(System.IFormatProvider,System.String,System.Object[])">
-            <summary>
-            Logs a formatted message string with the <c>DEBUG</c> level.
-            </summary>
-            <param name="provider">An <see cref="T:System.IFormatProvider"/> that supplies culture-specific formatting information</param>
-            <param name="format">A String containing zero or more format items</param>
-            <param name="args">An Object array containing zero or more objects to format</param>
-            <remarks>
-            <para>
-            The message is formatted using the <see cref="M:System.String.Format(System.IFormatProvider,System.String,System.Object[])"/> method. See
-            <c>String.Format</c> for details of the syntax of the format string and the behavior
-            of the formatting.
-            </para>
-            <para>
-            This method does not take an <see cref="T:System.Exception"/> object to include in the
-            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:log4net.Core.LogImpl.Debug(System.Object)"/>
-            methods instead.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.LogImpl.Info(System.Object)">
-            <summary>
-            Logs a message object with the <c>INFO</c> level.
-            </summary>
-            <param name="message">The message object to log.</param>
-            <remarks>
-            <para>
-            This method first checks if this logger is <c>INFO</c>
-            enabled by comparing the level of this logger with the 
-            <c>INFO</c> level. If this logger is
-            <c>INFO</c> enabled, then it converts the message object
-            (passed as parameter) to a string by invoking the appropriate
-            <see cref="T:log4net.ObjectRenderer.IObjectRenderer"/>. It then 
-            proceeds to call all the registered appenders in this logger 
-            and also higher in the hierarchy depending on the value of 
-            the additivity flag.
-            </para>
-            <para>
-            <b>WARNING</b> Note that passing an <see cref="T:System.Exception"/> 
-            to this method will print the name of the <see cref="T:System.Exception"/> 
-            but no stack trace. To print a stack trace use the 
-            <see cref="M:log4net.Core.LogImpl.Info(System.Object,System.Exception)"/> form instead.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.LogImpl.Info(System.Object,System.Exception)">
-            <summary>
-            Logs a message object with the <c>INFO</c> level.
-            </summary>
-            <param name="message">The message object to log.</param>
-            <param name="exception">The exception to log, including its stack trace.</param>
-            <remarks>
-            <para>
-            Logs a message object with the <c>INFO</c> level including
-            the stack trace of the <see cref="T:System.Exception"/> <paramref name="exception"/> 
-            passed as a parameter.
-            </para>
-            <para>
-            See the <see cref="M:log4net.Core.LogImpl.Info(System.Object)"/> form for more detailed information.
-            </para>
-            </remarks>
-            <seealso cref="M:log4net.Core.LogImpl.Info(System.Object)"/>
-        </member>
-        <member name="M:log4net.Core.LogImpl.InfoFormat(System.String,System.Object[])">
-            <summary>
-            Logs a formatted message string with the <c>INFO</c> level.
-            </summary>
-            <param name="format">A String containing zero or more format items</param>
-            <param name="args">An Object array containing zero or more objects to format</param>
-            <remarks>
-            <para>
-            The message is formatted using the <see cref="M:System.String.Format(System.IFormatProvider,System.String,System.Object[])"/> method. See
-            <c>String.Format</c> for details of the syntax of the format string and the behavior
-            of the formatting.
-            </para>
-            <para>
-            The string is formatted using the <see cref="P:System.Globalization.CultureInfo.InvariantCulture"/>
-            format provider. To specify a localized provider use the
-            <see cref="M:log4net.Core.LogImpl.InfoFormat(System.IFormatProvider,System.String,System.Object[])"/> method.
-            </para>
-            <para>
-            This method does not take an <see cref="T:System.Exception"/> object to include in the
-            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:log4net.Core.LogImpl.Info(System.Object)"/>
-            methods instead.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.LogImpl.InfoFormat(System.String,System.Object)">
-            <summary>
-            Logs a formatted message string with the <c>INFO</c> level.
-            </summary>
-            <param name="format">A String containing zero or more format items</param>
-            <param name="arg0">An Object to format</param>
-            <remarks>
-            <para>
-            The message is formatted using the <see cref="M:System.String.Format(System.IFormatProvider,System.String,System.Object[])"/> method. See
-            <c>String.Format</c> for details of the syntax of the format string and the behavior
-            of the formatting.
-            </para>
-            <para>
-            The string is formatted using the <see cref="P:System.Globalization.CultureInfo.InvariantCulture"/>
-            format provider. To specify a localized provider use the
-            <see cref="M:log4net.Core.LogImpl.InfoFormat(System.IFormatProvider,System.String,System.Object[])"/> method.
-            </para>
-            <para>
-            This method does not take an <see cref="T:System.Exception"/> object to include in the
-            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:log4net.Core.LogImpl.Info(System.Object)"/>
-            methods instead.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.LogImpl.InfoFormat(System.String,System.Object,System.Object)">
-            <summary>
-            Logs a formatted message string with the <c>INFO</c> level.
-            </summary>
-            <param name="format">A String containing zero or more format items</param>
-            <param name="arg0">An Object to format</param>
-            <param name="arg1">An Object to format</param>
-            <remarks>
-            <para>
-            The message is formatted using the <see cref="M:System.String.Format(System.IFormatProvider,System.String,System.Object[])"/> method. See
-            <c>String.Format</c> for details of the syntax of the format string and the behavior
-            of the formatting.
-            </para>
-            <para>
-            The string is formatted using the <see cref="P:System.Globalization.CultureInfo.InvariantCulture"/>
-            format provider. To specify a localized provider use the
-            <see cref="M:log4net.Core.LogImpl.InfoFormat(System.IFormatProvider,System.String,System.Object[])"/> method.
-            </para>
-            <para>
-            This method does not take an <see cref="T:System.Exception"/> object to include in the
-            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:log4net.Core.LogImpl.Info(System.Object)"/>
-            methods instead.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.LogImpl.InfoFormat(System.String,System.Object,System.Object,System.Object)">
-            <summary>
-            Logs a formatted message string with the <c>INFO</c> level.
-            </summary>
-            <param name="format">A String containing zero or more format items</param>
-            <param name="arg0">An Object to format</param>
-            <param name="arg1">An Object to format</param>
-            <param name="arg2">An Object to format</param>
-            <remarks>
-            <para>
-            The message is formatted using the <see cref="M:System.String.Format(System.IFormatProvider,System.String,System.Object[])"/> method. See
-            <c>String.Format</c> for details of the syntax of the format string and the behavior
-            of the formatting.
-            </para>
-            <para>
-            The string is formatted using the <see cref="P:System.Globalization.CultureInfo.InvariantCulture"/>
-            format provider. To specify a localized provider use the
-            <see cref="M:log4net.Core.LogImpl.InfoFormat(System.IFormatProvider,System.String,System.Object[])"/> method.
-            </para>
-            <para>
-            This method does not take an <see cref="T:System.Exception"/> object to include in the
-            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:log4net.Core.LogImpl.Info(System.Object)"/>
-            methods instead.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.LogImpl.InfoFormat(System.IFormatProvider,System.String,System.Object[])">
-            <summary>
-            Logs a formatted message string with the <c>INFO</c> level.
-            </summary>
-            <param name="provider">An <see cref="T:System.IFormatProvider"/> that supplies culture-specific formatting information</param>
-            <param name="format">A String containing zero or more format items</param>
-            <param name="args">An Object array containing zero or more objects to format</param>
-            <remarks>
-            <para>
-            The message is formatted using the <see cref="M:System.String.Format(System.IFormatProvider,System.String,System.Object[])"/> method. See
-            <c>String.Format</c> for details of the syntax of the format string and the behavior
-            of the formatting.
-            </para>
-            <para>
-            This method does not take an <see cref="T:System.Exception"/> object to include in the
-            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:log4net.Core.LogImpl.Info(System.Object)"/>
-            methods instead.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.LogImpl.Warn(System.Object)">
-            <summary>
-            Logs a message object with the <c>WARN</c> level.
-            </summary>
-            <param name="message">the message object to log</param>
-            <remarks>
-            <para>
-            This method first checks if this logger is <c>WARN</c>
-            enabled by comparing the level of this logger with the 
-            <c>WARN</c> level. If this logger is
-            <c>WARN</c> enabled, then it converts the message object
-            (passed as parameter) to a string by invoking the appropriate
-            <see cref="T:log4net.ObjectRenderer.IObjectRenderer"/>. It then 
-            proceeds to call all the registered appenders in this logger and 
-            also higher in the hierarchy depending on the value of the 
-            additivity flag.
-            </para>
-            <para>
-            <b>WARNING</b> Note that passing an <see cref="T:System.Exception"/> to this
-            method will print the name of the <see cref="T:System.Exception"/> but no
-            stack trace. To print a stack trace use the 
-            <see cref="M:log4net.Core.LogImpl.Warn(System.Object,System.Exception)"/> form instead.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.LogImpl.Warn(System.Object,System.Exception)">
-            <summary>
-            Logs a message object with the <c>WARN</c> level
-            </summary>
-            <param name="message">The message object to log.</param>
-            <param name="exception">The exception to log, including its stack trace.</param>
-            <remarks>
-            <para>
-            Logs a message object with the <c>WARN</c> level including
-            the stack trace of the <see cref="T:System.Exception"/> <paramref name="exception"/> 
-            passed as a parameter.
-            </para>
-            <para>
-            See the <see cref="M:log4net.Core.LogImpl.Warn(System.Object)"/> form for more detailed information.
-            </para>
-            </remarks>
-            <seealso cref="M:log4net.Core.LogImpl.Warn(System.Object)"/>
-        </member>
-        <member name="M:log4net.Core.LogImpl.WarnFormat(System.String,System.Object[])">
-            <summary>
-            Logs a formatted message string with the <c>WARN</c> level.
-            </summary>
-            <param name="format">A String containing zero or more format items</param>
-            <param name="args">An Object array containing zero or more objects to format</param>
-            <remarks>
-            <para>
-            The message is formatted using the <see cref="M:System.String.Format(System.IFormatProvider,System.String,System.Object[])"/> method. See
-            <c>String.Format</c> for details of the syntax of the format string and the behavior
-            of the formatting.
-            </para>
-            <para>
-            The string is formatted using the <see cref="P:System.Globalization.CultureInfo.InvariantCulture"/>
-            format provider. To specify a localized provider use the
-            <see cref="M:log4net.Core.LogImpl.WarnFormat(System.IFormatProvider,System.String,System.Object[])"/> method.
-            </para>
-            <para>
-            This method does not take an <see cref="T:System.Exception"/> object to include in the
-            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:log4net.Core.LogImpl.Warn(System.Object)"/>
-            methods instead.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.LogImpl.WarnFormat(System.String,System.Object)">
-            <summary>
-            Logs a formatted message string with the <c>WARN</c> level.
-            </summary>
-            <param name="format">A String containing zero or more format items</param>
-            <param name="arg0">An Object to format</param>
-            <remarks>
-            <para>
-            The message is formatted using the <see cref="M:System.String.Format(System.IFormatProvider,System.String,System.Object[])"/> method. See
-            <c>String.Format</c> for details of the syntax of the format string and the behavior
-            of the formatting.
-            </para>
-            <para>
-            The string is formatted using the <see cref="P:System.Globalization.CultureInfo.InvariantCulture"/>
-            format provider. To specify a localized provider use the
-            <see cref="M:log4net.Core.LogImpl.WarnFormat(System.IFormatProvider,System.String,System.Object[])"/> method.
-            </para>
-            <para>
-            This method does not take an <see cref="T:System.Exception"/> object to include in the
-            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:log4net.Core.LogImpl.Warn(System.Object)"/>
-            methods instead.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.LogImpl.WarnFormat(System.String,System.Object,System.Object)">
-            <summary>
-            Logs a formatted message string with the <c>WARN</c> level.
-            </summary>
-            <param name="format">A String containing zero or more format items</param>
-            <param name="arg0">An Object to format</param>
-            <param name="arg1">An Object to format</param>
-            <remarks>
-            <para>
-            The message is formatted using the <see cref="M:System.String.Format(System.IFormatProvider,System.String,System.Object[])"/> method. See
-            <c>String.Format</c> for details of the syntax of the format string and the behavior
-            of the formatting.
-            </para>
-            <para>
-            The string is formatted using the <see cref="P:System.Globalization.CultureInfo.InvariantCulture"/>
-            format provider. To specify a localized provider use the
-            <see cref="M:log4net.Core.LogImpl.WarnFormat(System.IFormatProvider,System.String,System.Object[])"/> method.
-            </para>
-            <para>
-            This method does not take an <see cref="T:System.Exception"/> object to include in the
-            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:log4net.Core.LogImpl.Warn(System.Object)"/>
-            methods instead.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.LogImpl.WarnFormat(System.String,System.Object,System.Object,System.Object)">
-            <summary>
-            Logs a formatted message string with the <c>WARN</c> level.
-            </summary>
-            <param name="format">A String containing zero or more format items</param>
-            <param name="arg0">An Object to format</param>
-            <param name="arg1">An Object to format</param>
-            <param name="arg2">An Object to format</param>
-            <remarks>
-            <para>
-            The message is formatted using the <see cref="M:System.String.Format(System.IFormatProvider,System.String,System.Object[])"/> method. See
-            <c>String.Format</c> for details of the syntax of the format string and the behavior
-            of the formatting.
-            </para>
-            <para>
-            The string is formatted using the <see cref="P:System.Globalization.CultureInfo.InvariantCulture"/>
-            format provider. To specify a localized provider use the
-            <see cref="M:log4net.Core.LogImpl.WarnFormat(System.IFormatProvider,System.String,System.Object[])"/> method.
-            </para>
-            <para>
-            This method does not take an <see cref="T:System.Exception"/> object to include in the
-            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:log4net.Core.LogImpl.Warn(System.Object)"/>
-            methods instead.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.LogImpl.WarnFormat(System.IFormatProvider,System.String,System.Object[])">
-            <summary>
-            Logs a formatted message string with the <c>WARN</c> level.
-            </summary>
-            <param name="provider">An <see cref="T:System.IFormatProvider"/> that supplies culture-specific formatting information</param>
-            <param name="format">A String containing zero or more format items</param>
-            <param name="args">An Object array containing zero or more objects to format</param>
-            <remarks>
-            <para>
-            The message is formatted using the <see cref="M:System.String.Format(System.IFormatProvider,System.String,System.Object[])"/> method. See
-            <c>String.Format</c> for details of the syntax of the format string and the behavior
-            of the formatting.
-            </para>
-            <para>
-            This method does not take an <see cref="T:System.Exception"/> object to include in the
-            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:log4net.Core.LogImpl.Warn(System.Object)"/>
-            methods instead.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.LogImpl.Error(System.Object)">
-            <summary>
-            Logs a message object with the <c>ERROR</c> level.
-            </summary>
-            <param name="message">The message object to log.</param>
-            <remarks>
-            <para>
-            This method first checks if this logger is <c>ERROR</c>
-            enabled by comparing the level of this logger with the 
-            <c>ERROR</c> level. If this logger is
-            <c>ERROR</c> enabled, then it converts the message object
-            (passed as parameter) to a string by invoking the appropriate
-            <see cref="T:log4net.ObjectRenderer.IObjectRenderer"/>. It then 
-            proceeds to call all the registered appenders in this logger and 
-            also higher in the hierarchy depending on the value of the 
-            additivity flag.
-            </para>
-            <para>
-            <b>WARNING</b> Note that passing an <see cref="T:System.Exception"/> to this
-            method will print the name of the <see cref="T:System.Exception"/> but no
-            stack trace. To print a stack trace use the 
-            <see cref="M:log4net.Core.LogImpl.Error(System.Object,System.Exception)"/> form instead.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.LogImpl.Error(System.Object,System.Exception)">
-            <summary>
-            Logs a message object with the <c>ERROR</c> level
-            </summary>
-            <param name="message">The message object to log.</param>
-            <param name="exception">The exception to log, including its stack trace.</param>
-            <remarks>
-            <para>
-            Logs a message object with the <c>ERROR</c> level including
-            the stack trace of the <see cref="T:System.Exception"/> <paramref name="exception"/> 
-            passed as a parameter.
-            </para>
-            <para>
-            See the <see cref="M:log4net.Core.LogImpl.Error(System.Object)"/> form for more detailed information.
-            </para>
-            </remarks>
-            <seealso cref="M:log4net.Core.LogImpl.Error(System.Object)"/>
-        </member>
-        <member name="M:log4net.Core.LogImpl.ErrorFormat(System.String,System.Object[])">
-            <summary>
-            Logs a formatted message string with the <c>ERROR</c> level.
-            </summary>
-            <param name="format">A String containing zero or more format items</param>
-            <param name="args">An Object array containing zero or more objects to format</param>
-            <remarks>
-            <para>
-            The message is formatted using the <see cref="M:System.String.Format(System.IFormatProvider,System.String,System.Object[])"/> method. See
-            <c>String.Format</c> for details of the syntax of the format string and the behavior
-            of the formatting.
-            </para>
-            <para>
-            The string is formatted using the <see cref="P:System.Globalization.CultureInfo.InvariantCulture"/>
-            format provider. To specify a localized provider use the
-            <see cref="M:log4net.Core.LogImpl.ErrorFormat(System.IFormatProvider,System.String,System.Object[])"/> method.
-            </para>
-            <para>
-            This method does not take an <see cref="T:System.Exception"/> object to include in the
-            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:log4net.Core.LogImpl.Error(System.Object)"/>
-            methods instead.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.LogImpl.ErrorFormat(System.String,System.Object)">
-            <summary>
-            Logs a formatted message string with the <c>ERROR</c> level.
-            </summary>
-            <param name="format">A String containing zero or more format items</param>
-            <param name="arg0">An Object to format</param>
-            <remarks>
-            <para>
-            The message is formatted using the <see cref="M:System.String.Format(System.IFormatProvider,System.String,System.Object[])"/> method. See
-            <c>String.Format</c> for details of the syntax of the format string and the behavior
-            of the formatting.
-            </para>
-            <para>
-            The string is formatted using the <see cref="P:System.Globalization.CultureInfo.InvariantCulture"/>
-            format provider. To specify a localized provider use the
-            <see cref="M:log4net.Core.LogImpl.ErrorFormat(System.IFormatProvider,System.String,System.Object[])"/> method.
-            </para>
-            <para>
-            This method does not take an <see cref="T:System.Exception"/> object to include in the
-            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:log4net.Core.LogImpl.Error(System.Object)"/>
-            methods instead.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.LogImpl.ErrorFormat(System.String,System.Object,System.Object)">
-            <summary>
-            Logs a formatted message string with the <c>ERROR</c> level.
-            </summary>
-            <param name="format">A String containing zero or more format items</param>
-            <param name="arg0">An Object to format</param>
-            <param name="arg1">An Object to format</param>
-            <remarks>
-            <para>
-            The message is formatted using the <see cref="M:System.String.Format(System.IFormatProvider,System.String,System.Object[])"/> method. See
-            <c>String.Format</c> for details of the syntax of the format string and the behavior
-            of the formatting.
-            </para>
-            <para>
-            The string is formatted using the <see cref="P:System.Globalization.CultureInfo.InvariantCulture"/>
-            format provider. To specify a localized provider use the
-            <see cref="M:log4net.Core.LogImpl.ErrorFormat(System.IFormatProvider,System.String,System.Object[])"/> method.
-            </para>
-            <para>
-            This method does not take an <see cref="T:System.Exception"/> object to include in the
-            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:log4net.Core.LogImpl.Error(System.Object)"/>
-            methods instead.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.LogImpl.ErrorFormat(System.String,System.Object,System.Object,System.Object)">
-            <summary>
-            Logs a formatted message string with the <c>ERROR</c> level.
-            </summary>
-            <param name="format">A String containing zero or more format items</param>
-            <param name="arg0">An Object to format</param>
-            <param name="arg1">An Object to format</param>
-            <param name="arg2">An Object to format</param>
-            <remarks>
-            <para>
-            The message is formatted using the <see cref="M:System.String.Format(System.IFormatProvider,System.String,System.Object[])"/> method. See
-            <c>String.Format</c> for details of the syntax of the format string and the behavior
-            of the formatting.
-            </para>
-            <para>
-            The string is formatted using the <see cref="P:System.Globalization.CultureInfo.InvariantCulture"/>
-            format provider. To specify a localized provider use the
-            <see cref="M:log4net.Core.LogImpl.ErrorFormat(System.IFormatProvider,System.String,System.Object[])"/> method.
-            </para>
-            <para>
-            This method does not take an <see cref="T:System.Exception"/> object to include in the
-            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:log4net.Core.LogImpl.Error(System.Object)"/>
-            methods instead.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.LogImpl.ErrorFormat(System.IFormatProvider,System.String,System.Object[])">
-            <summary>
-            Logs a formatted message string with the <c>ERROR</c> level.
-            </summary>
-            <param name="provider">An <see cref="T:System.IFormatProvider"/> that supplies culture-specific formatting information</param>
-            <param name="format">A String containing zero or more format items</param>
-            <param name="args">An Object array containing zero or more objects to format</param>
-            <remarks>
-            <para>
-            The message is formatted using the <see cref="M:System.String.Format(System.IFormatProvider,System.String,System.Object[])"/> method. See
-            <c>String.Format</c> for details of the syntax of the format string and the behavior
-            of the formatting.
-            </para>
-            <para>
-            This method does not take an <see cref="T:System.Exception"/> object to include in the
-            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:log4net.Core.LogImpl.Error(System.Object)"/>
-            methods instead.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.LogImpl.Fatal(System.Object)">
-            <summary>
-            Logs a message object with the <c>FATAL</c> level.
-            </summary>
-            <param name="message">The message object to log.</param>
-            <remarks>
-            <para>
-            This method first checks if this logger is <c>FATAL</c>
-            enabled by comparing the level of this logger with the 
-            <c>FATAL</c> level. If this logger is
-            <c>FATAL</c> enabled, then it converts the message object
-            (passed as parameter) to a string by invoking the appropriate
-            <see cref="T:log4net.ObjectRenderer.IObjectRenderer"/>. It then 
-            proceeds to call all the registered appenders in this logger and 
-            also higher in the hierarchy depending on the value of the 
-            additivity flag.
-            </para>
-            <para>
-            <b>WARNING</b> Note that passing an <see cref="T:System.Exception"/> to this
-            method will print the name of the <see cref="T:System.Exception"/> but no
-            stack trace. To print a stack trace use the 
-            <see cref="M:log4net.Core.LogImpl.Fatal(System.Object,System.Exception)"/> form instead.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.LogImpl.Fatal(System.Object,System.Exception)">
-            <summary>
-            Logs a message object with the <c>FATAL</c> level
-            </summary>
-            <param name="message">The message object to log.</param>
-            <param name="exception">The exception to log, including its stack trace.</param>
-            <remarks>
-            <para>
-            Logs a message object with the <c>FATAL</c> level including
-            the stack trace of the <see cref="T:System.Exception"/> <paramref name="exception"/> 
-            passed as a parameter.
-            </para>
-            <para>
-            See the <see cref="M:log4net.Core.LogImpl.Fatal(System.Object)"/> form for more detailed information.
-            </para>
-            </remarks>
-            <seealso cref="M:log4net.Core.LogImpl.Fatal(System.Object)"/>
-        </member>
-        <member name="M:log4net.Core.LogImpl.FatalFormat(System.String,System.Object[])">
-            <summary>
-            Logs a formatted message string with the <c>FATAL</c> level.
-            </summary>
-            <param name="format">A String containing zero or more format items</param>
-            <param name="args">An Object array containing zero or more objects to format</param>
-            <remarks>
-            <para>
-            The message is formatted using the <see cref="M:System.String.Format(System.IFormatProvider,System.String,System.Object[])"/> method. See
-            <c>String.Format</c> for details of the syntax of the format string and the behavior
-            of the formatting.
-            </para>
-            <para>
-            The string is formatted using the <see cref="P:System.Globalization.CultureInfo.InvariantCulture"/>
-            format provider. To specify a localized provider use the
-            <see cref="M:log4net.Core.LogImpl.FatalFormat(System.IFormatProvider,System.String,System.Object[])"/> method.
-            </para>
-            <para>
-            This method does not take an <see cref="T:System.Exception"/> object to include in the
-            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:log4net.Core.LogImpl.Fatal(System.Object)"/>
-            methods instead.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.LogImpl.FatalFormat(System.String,System.Object)">
-            <summary>
-            Logs a formatted message string with the <c>FATAL</c> level.
-            </summary>
-            <param name="format">A String containing zero or more format items</param>
-            <param name="arg0">An Object to format</param>
-            <remarks>
-            <para>
-            The message is formatted using the <see cref="M:System.String.Format(System.IFormatProvider,System.String,System.Object[])"/> method. See
-            <c>String.Format</c> for details of the syntax of the format string and the behavior
-            of the formatting.
-            </para>
-            <para>
-            The string is formatted using the <see cref="P:System.Globalization.CultureInfo.InvariantCulture"/>
-            format provider. To specify a localized provider use the
-            <see cref="M:log4net.Core.LogImpl.FatalFormat(System.IFormatProvider,System.String,System.Object[])"/> method.
-            </para>
-            <para>
-            This method does not take an <see cref="T:System.Exception"/> object to include in the
-            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:log4net.Core.LogImpl.Fatal(System.Object)"/>
-            methods instead.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.LogImpl.FatalFormat(System.String,System.Object,System.Object)">
-            <summary>
-            Logs a formatted message string with the <c>FATAL</c> level.
-            </summary>
-            <param name="format">A String containing zero or more format items</param>
-            <param name="arg0">An Object to format</param>
-            <param name="arg1">An Object to format</param>
-            <remarks>
-            <para>
-            The message is formatted using the <see cref="M:System.String.Format(System.IFormatProvider,System.String,System.Object[])"/> method. See
-            <c>String.Format</c> for details of the syntax of the format string and the behavior
-            of the formatting.
-            </para>
-            <para>
-            The string is formatted using the <see cref="P:System.Globalization.CultureInfo.InvariantCulture"/>
-            format provider. To specify a localized provider use the
-            <see cref="M:log4net.Core.LogImpl.FatalFormat(System.IFormatProvider,System.String,System.Object[])"/> method.
-            </para>
-            <para>
-            This method does not take an <see cref="T:System.Exception"/> object to include in the
-            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:log4net.Core.LogImpl.Fatal(System.Object)"/>
-            methods instead.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.LogImpl.FatalFormat(System.String,System.Object,System.Object,System.Object)">
-            <summary>
-            Logs a formatted message string with the <c>FATAL</c> level.
-            </summary>
-            <param name="format">A String containing zero or more format items</param>
-            <param name="arg0">An Object to format</param>
-            <param name="arg1">An Object to format</param>
-            <param name="arg2">An Object to format</param>
-            <remarks>
-            <para>
-            The message is formatted using the <see cref="M:System.String.Format(System.IFormatProvider,System.String,System.Object[])"/> method. See
-            <c>String.Format</c> for details of the syntax of the format string and the behavior
-            of the formatting.
-            </para>
-            <para>
-            The string is formatted using the <see cref="P:System.Globalization.CultureInfo.InvariantCulture"/>
-            format provider. To specify a localized provider use the
-            <see cref="M:log4net.Core.LogImpl.FatalFormat(System.IFormatProvider,System.String,System.Object[])"/> method.
-            </para>
-            <para>
-            This method does not take an <see cref="T:System.Exception"/> object to include in the
-            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:log4net.Core.LogImpl.Fatal(System.Object)"/>
-            methods instead.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.LogImpl.FatalFormat(System.IFormatProvider,System.String,System.Object[])">
-            <summary>
-            Logs a formatted message string with the <c>FATAL</c> level.
-            </summary>
-            <param name="provider">An <see cref="T:System.IFormatProvider"/> that supplies culture-specific formatting information</param>
-            <param name="format">A String containing zero or more format items</param>
-            <param name="args">An Object array containing zero or more objects to format</param>
-            <remarks>
-            <para>
-            The message is formatted using the <see cref="M:System.String.Format(System.IFormatProvider,System.String,System.Object[])"/> method. See
-            <c>String.Format</c> for details of the syntax of the format string and the behavior
-            of the formatting.
-            </para>
-            <para>
-            This method does not take an <see cref="T:System.Exception"/> object to include in the
-            log event. To pass an <see cref="T:System.Exception"/> use one of the <see cref="M:log4net.Core.LogImpl.Fatal(System.Object)"/>
-            methods instead.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.LogImpl.LoggerRepositoryConfigurationChanged(System.Object,System.EventArgs)">
-            <summary>
-            Event handler for the <see cref="E:log4net.Repository.ILoggerRepository.ConfigurationChanged"/> event
-            </summary>
-            <param name="sender">the repository</param>
-            <param name="e">Empty</param>
-        </member>
-        <member name="F:log4net.Core.LogImpl.ThisDeclaringType">
-            <summary>
-            The fully qualified name of this declaring type not the type of any subclass.
-            </summary>
-        </member>
-        <member name="P:log4net.Core.LogImpl.IsDebugEnabled">
-            <summary>
-            Checks if this logger is enabled for the <c>DEBUG</c>
-            level.
-            </summary>
-            <value>
-            <c>true</c> if this logger is enabled for <c>DEBUG</c> events,
-            <c>false</c> otherwise.
-            </value>
-            <remarks>
-            <para>
-            This function is intended to lessen the computational cost of
-            disabled log debug statements.
-            </para>
-            <para>
-            For some <c>log</c> Logger object, when you write:
-            </para>
-            <code lang="C#">
-            log.Debug("This is entry number: " + i );
-            </code>
-            <para>
-            You incur the cost constructing the message, concatenation in
-            this case, regardless of whether the message is logged or not.
-            </para>
-            <para>
-            If you are worried about speed, then you should write:
-            </para>
-            <code lang="C#">
-            if (log.IsDebugEnabled())
-            { 
-             log.Debug("This is entry number: " + i );
-            }
-            </code>
-            <para>
-            This way you will not incur the cost of parameter
-            construction if debugging is disabled for <c>log</c>. On
-            the other hand, if the <c>log</c> is debug enabled, you
-            will incur the cost of evaluating whether the logger is debug
-            enabled twice. Once in <c>IsDebugEnabled</c> and once in
-            the <c>Debug</c>.  This is an insignificant overhead
-            since evaluating a logger takes about 1% of the time it
-            takes to actually log.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Core.LogImpl.IsInfoEnabled">
-            <summary>
-            Checks if this logger is enabled for the <c>INFO</c> level.
-            </summary>
-            <value>
-            <c>true</c> if this logger is enabled for <c>INFO</c> events,
-            <c>false</c> otherwise.
-            </value>
-            <remarks>
-            <para>
-            See <see cref="P:log4net.Core.LogImpl.IsDebugEnabled"/> for more information and examples 
-            of using this method.
-            </para>
-            </remarks>
-            <seealso cref="P:log4net.Core.LogImpl.IsDebugEnabled"/>
-        </member>
-        <member name="P:log4net.Core.LogImpl.IsWarnEnabled">
-            <summary>
-            Checks if this logger is enabled for the <c>WARN</c> level.
-            </summary>
-            <value>
-            <c>true</c> if this logger is enabled for <c>WARN</c> events,
-            <c>false</c> otherwise.
-            </value>
-            <remarks>
-            <para>
-            See <see cref="P:log4net.Core.LogImpl.IsDebugEnabled"/> for more information and examples 
-            of using this method.
-            </para>
-            </remarks>
-            <seealso cref="P:log4net.ILog.IsDebugEnabled"/>
-        </member>
-        <member name="P:log4net.Core.LogImpl.IsErrorEnabled">
-            <summary>
-            Checks if this logger is enabled for the <c>ERROR</c> level.
-            </summary>
-            <value>
-            <c>true</c> if this logger is enabled for <c>ERROR</c> events,
-            <c>false</c> otherwise.
-            </value>
-            <remarks>
-            <para>
-            See <see cref="P:log4net.Core.LogImpl.IsDebugEnabled"/> for more information and examples of using this method.
-            </para>
-            </remarks>
-            <seealso cref="P:log4net.ILog.IsDebugEnabled"/>
-        </member>
-        <member name="P:log4net.Core.LogImpl.IsFatalEnabled">
-            <summary>
-            Checks if this logger is enabled for the <c>FATAL</c> level.
-            </summary>
-            <value>
-            <c>true</c> if this logger is enabled for <c>FATAL</c> events,
-            <c>false</c> otherwise.
-            </value>
-            <remarks>
-            <para>
-            See <see cref="P:log4net.Core.LogImpl.IsDebugEnabled"/> for more information and examples of using this method.
-            </para>
-            </remarks>
-            <seealso cref="P:log4net.ILog.IsDebugEnabled"/>
-        </member>
-        <member name="T:log4net.Core.SecurityContext">
-            <summary>
-            A SecurityContext used by log4net when interacting with protected resources
-            </summary>
-            <remarks>
-            <para>
-            A SecurityContext used by log4net when interacting with protected resources
-            for example with operating system services. This can be used to impersonate
-            a principal that has been granted privileges on the system resources.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-        </member>
-        <member name="M:log4net.Core.SecurityContext.Impersonate(System.Object)">
-            <summary>
-            Impersonate this SecurityContext
-            </summary>
-            <param name="state">State supplied by the caller</param>
-            <returns>An <see cref="T:System.IDisposable"/> instance that will
-            revoke the impersonation of this SecurityContext, or <c>null</c></returns>
-            <remarks>
-            <para>
-            Impersonate this security context. Further calls on the current
-            thread should now be made in the security context provided
-            by this object. When the <see cref="T:System.IDisposable"/> result 
-            <see cref="M:System.IDisposable.Dispose"/> method is called the security
-            context of the thread should be reverted to the state it was in
-            before <see cref="M:log4net.Core.SecurityContext.Impersonate(System.Object)"/> was called.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Core.SecurityContextProvider">
-            <summary>
-            The <see cref="T:log4net.Core.SecurityContextProvider"/> providers default <see cref="T:log4net.Core.SecurityContext"/> instances.
-            </summary>
-            <remarks>
-            <para>
-            A configured component that interacts with potentially protected system
-            resources uses a <see cref="T:log4net.Core.SecurityContext"/> to provide the elevated
-            privileges required. If the <see cref="T:log4net.Core.SecurityContext"/> object has
-            been not been explicitly provided to the component then the component
-            will request one from this <see cref="T:log4net.Core.SecurityContextProvider"/>.
-            </para>
-            <para>
-            By default the <see cref="P:log4net.Core.SecurityContextProvider.DefaultProvider"/> is
-            an instance of <see cref="T:log4net.Core.SecurityContextProvider"/> which returns only
-            <see cref="T:log4net.Util.NullSecurityContext"/> objects. This is a reasonable default
-            where the privileges required are not know by the system.
-            </para>
-            <para>
-            This default behavior can be overridden by subclassing the <see cref="T:log4net.Core.SecurityContextProvider"/>
-            and overriding the <see cref="M:log4net.Core.SecurityContextProvider.CreateSecurityContext(System.Object)"/> method to return
-            the desired <see cref="T:log4net.Core.SecurityContext"/> objects. The default provider
-            can be replaced by programmatically setting the value of the 
-            <see cref="P:log4net.Core.SecurityContextProvider.DefaultProvider"/> property.
-            </para>
-            <para>
-            An alternative is to use the <c>log4net.Config.SecurityContextProviderAttribute</c>
-            This attribute can be applied to an assembly in the same way as the
-            <c>log4net.Config.XmlConfiguratorAttribute"</c>. The attribute takes
-            the type to use as the <see cref="T:log4net.Core.SecurityContextProvider"/> as an argument.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-        </member>
-        <member name="F:log4net.Core.SecurityContextProvider.s_defaultProvider">
-            <summary>
-            The default provider
-            </summary>
-        </member>
-        <member name="M:log4net.Core.SecurityContextProvider.#ctor">
-            <summary>
-            Protected default constructor to allow subclassing
-            </summary>
-            <remarks>
-            <para>
-            Protected default constructor to allow subclassing
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.SecurityContextProvider.CreateSecurityContext(System.Object)">
-            <summary>
-            Create a SecurityContext for a consumer
-            </summary>
-            <param name="consumer">The consumer requesting the SecurityContext</param>
-            <returns>An impersonation context</returns>
-            <remarks>
-            <para>
-            The default implementation is to return a <see cref="T:log4net.Util.NullSecurityContext"/>.
-            </para>
-            <para>
-            Subclasses should override this method to provide their own
-            behavior.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Core.SecurityContextProvider.DefaultProvider">
-            <summary>
-            Gets or sets the default SecurityContextProvider
-            </summary>
-            <value>
-            The default SecurityContextProvider
-            </value>
-            <remarks>
-            <para>
-            The default provider is used by configured components that
-            require a <see cref="T:log4net.Core.SecurityContext"/> and have not had one
-            given to them.
-            </para>
-            <para>
-            By default this is an instance of <see cref="T:log4net.Core.SecurityContextProvider"/>
-            that returns <see cref="T:log4net.Util.NullSecurityContext"/> objects.
-            </para>
-            <para>
-            The default provider can be set programmatically by setting
-            the value of this property to a sub class of <see cref="T:log4net.Core.SecurityContextProvider"/>
-            that has the desired behavior.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Core.WrapperCreationHandler">
-            <summary>
-            Delegate used to handle creation of new wrappers.
-            </summary>
-            <param name="logger">The logger to wrap in a wrapper.</param>
-            <remarks>
-            <para>
-            Delegate used to handle creation of new wrappers. This delegate
-            is called from the <see cref="M:log4net.Core.WrapperMap.CreateNewWrapperObject(log4net.Core.ILogger)"/>
-            method to construct the wrapper for the specified logger.
-            </para>
-            <para>
-            The delegate to use is supplied to the <see cref="T:log4net.Core.WrapperMap"/>
-            constructor.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Core.WrapperMap">
-            <summary>
-            Maps between logger objects and wrapper objects.
-            </summary>
-            <remarks>
-            <para>
-            This class maintains a mapping between <see cref="T:log4net.Core.ILogger"/> objects and
-            <see cref="T:log4net.Core.ILoggerWrapper"/> objects. Use the <see cref="M:log4net.Core.WrapperMap.GetWrapper(log4net.Core.ILogger)"/> method to 
-            lookup the <see cref="T:log4net.Core.ILoggerWrapper"/> for the specified <see cref="T:log4net.Core.ILogger"/>.
-            </para>
-            <para>
-            New wrapper instances are created by the <see cref="M:log4net.Core.WrapperMap.CreateNewWrapperObject(log4net.Core.ILogger)"/>
-            method. The default behavior is for this method to delegate construction
-            of the wrapper to the <see cref="T:log4net.Core.WrapperCreationHandler"/> delegate supplied
-            to the constructor. This allows specialization of the behavior without
-            requiring subclassing of this type.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-        </member>
-        <member name="M:log4net.Core.WrapperMap.#ctor(log4net.Core.WrapperCreationHandler)">
-            <summary>
-            Initializes a new instance of the <see cref="T:log4net.Core.WrapperMap"/>
-            </summary>
-            <param name="createWrapperHandler">The handler to use to create the wrapper objects.</param>
-            <remarks>
-            <para>
-            Initializes a new instance of the <see cref="T:log4net.Core.WrapperMap"/> class with 
-            the specified handler to create the wrapper objects.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.WrapperMap.GetWrapper(log4net.Core.ILogger)">
-            <summary>
-            Gets the wrapper object for the specified logger.
-            </summary>
-            <returns>The wrapper object for the specified logger</returns>
-            <remarks>
-            <para>
-            If the logger is null then the corresponding wrapper is null.
-            </para>
-            <para>
-            Looks up the wrapper it it has previously been requested and
-            returns it. If the wrapper has never been requested before then
-            the <see cref="M:log4net.Core.WrapperMap.CreateNewWrapperObject(log4net.Core.ILogger)"/> virtual method is
-            called.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.WrapperMap.CreateNewWrapperObject(log4net.Core.ILogger)">
-            <summary>
-            Creates the wrapper object for the specified logger.
-            </summary>
-            <param name="logger">The logger to wrap in a wrapper.</param>
-            <returns>The wrapper object for the logger.</returns>
-            <remarks>
-            <para>
-            This implementation uses the <see cref="T:log4net.Core.WrapperCreationHandler"/>
-            passed to the constructor to create the wrapper. This method
-            can be overridden in a subclass.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.WrapperMap.RepositoryShutdown(log4net.Repository.ILoggerRepository)">
-            <summary>
-            Called when a monitored repository shutdown event is received.
-            </summary>
-            <param name="repository">The <see cref="T:log4net.Repository.ILoggerRepository"/> that is shutting down</param>
-            <remarks>
-            <para>
-            This method is called when a <see cref="T:log4net.Repository.ILoggerRepository"/> that this
-            <see cref="T:log4net.Core.WrapperMap"/> is holding loggers for has signaled its shutdown
-            event <see cref="E:log4net.Repository.ILoggerRepository.ShutdownEvent"/>. The default
-            behavior of this method is to release the references to the loggers
-            and their wrappers generated for this repository.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Core.WrapperMap.ILoggerRepository_Shutdown(System.Object,System.EventArgs)">
-            <summary>
-            Event handler for repository shutdown event.
-            </summary>
-            <param name="sender">The sender of the event.</param>
-            <param name="e">The event args.</param>
-        </member>
-        <member name="F:log4net.Core.WrapperMap.m_repositories">
-            <summary>
-            Map of logger repositories to hashtables of ILogger to ILoggerWrapper mappings
-            </summary>
-        </member>
-        <member name="F:log4net.Core.WrapperMap.m_createWrapperHandler">
-            <summary>
-            The handler to use to create the extension wrapper objects.
-            </summary>
-        </member>
-        <member name="F:log4net.Core.WrapperMap.m_shutdownHandler">
-            <summary>
-            Internal reference to the delegate used to register for repository shutdown events.
-            </summary>
-        </member>
-        <member name="P:log4net.Core.WrapperMap.Repositories">
-            <summary>
-            Gets the map of logger repositories.
-            </summary>
-            <value>
-            Map of logger repositories.
-            </value>
-            <remarks>
-            <para>
-            Gets the hashtable that is keyed on <see cref="T:log4net.Repository.ILoggerRepository"/>. The
-            values are hashtables keyed on <see cref="T:log4net.Core.ILogger"/> with the
-            value being the corresponding <see cref="T:log4net.Core.ILoggerWrapper"/>.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.DateFormatter.AbsoluteTimeDateFormatter">
-            <summary>
-            Formats a <see cref="T:System.DateTime"/> as <c>"HH:mm:ss,fff"</c>.
-            </summary>
-            <remarks>
-            <para>
-            Formats a <see cref="T:System.DateTime"/> in the format <c>"HH:mm:ss,fff"</c> for example, <c>"15:49:37,459"</c>.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-        </member>
-        <member name="T:log4net.DateFormatter.IDateFormatter">
-            <summary>
-            Render a <see cref="T:System.DateTime"/> as a string.
-            </summary>
-            <remarks>
-            <para>
-            Interface to abstract the rendering of a <see cref="T:System.DateTime"/>
-            instance into a string.
-            </para>
-            <para>
-            The <see cref="M:log4net.DateFormatter.IDateFormatter.FormatDate(System.DateTime,System.IO.TextWriter)"/> method is used to render the
-            date to a text writer.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-        </member>
-        <member name="M:log4net.DateFormatter.IDateFormatter.FormatDate(System.DateTime,System.IO.TextWriter)">
-            <summary>
-            Formats the specified date as a string.
-            </summary>
-            <param name="dateToFormat">The date to format.</param>
-            <param name="writer">The writer to write to.</param>
-            <remarks>
-            <para>
-            Format the <see cref="T:System.DateTime"/> as a string and write it
-            to the <see cref="T:System.IO.TextWriter"/> provided.
-            </para>
-            </remarks>
-        </member>
-        <member name="F:log4net.DateFormatter.AbsoluteTimeDateFormatter.AbsoluteTimeDateFormat">
-            <summary>
-            String constant used to specify AbsoluteTimeDateFormat in layouts. Current value is <b>ABSOLUTE</b>.
-            </summary>
-        </member>
-        <member name="F:log4net.DateFormatter.AbsoluteTimeDateFormatter.DateAndTimeDateFormat">
-            <summary>
-            String constant used to specify DateTimeDateFormat in layouts.  Current value is <b>DATE</b>.
-            </summary>
-        </member>
-        <member name="F:log4net.DateFormatter.AbsoluteTimeDateFormatter.Iso8601TimeDateFormat">
-            <summary>
-            String constant used to specify ISO8601DateFormat in layouts. Current value is <b>ISO8601</b>.
-            </summary>
-        </member>
-        <member name="M:log4net.DateFormatter.AbsoluteTimeDateFormatter.FormatDateWithoutMillis(System.DateTime,System.Text.StringBuilder)">
-            <summary>
-            Renders the date into a string. Format is <c>"HH:mm:ss"</c>.
-            </summary>
-            <param name="dateToFormat">The date to render into a string.</param>
-            <param name="buffer">The string builder to write to.</param>
-            <remarks>
-            <para>
-            Subclasses should override this method to render the date
-            into a string using a precision up to the second. This method
-            will be called at most once per second and the result will be
-            reused if it is needed again during the same second.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.DateFormatter.AbsoluteTimeDateFormatter.FormatDate(System.DateTime,System.IO.TextWriter)">
-            <summary>
-            Renders the date into a string. Format is "HH:mm:ss,fff".
-            </summary>
-            <param name="dateToFormat">The date to render into a string.</param>
-            <param name="writer">The writer to write to.</param>
-            <remarks>
-            <para>
-            Uses the <see cref="M:log4net.DateFormatter.AbsoluteTimeDateFormatter.FormatDateWithoutMillis(System.DateTime,System.Text.StringBuilder)"/> method to generate the
-            time string up to the seconds and then appends the current
-            milliseconds. The results from <see cref="M:log4net.DateFormatter.AbsoluteTimeDateFormatter.FormatDateWithoutMillis(System.DateTime,System.Text.StringBuilder)"/> are
-            cached and <see cref="M:log4net.DateFormatter.AbsoluteTimeDateFormatter.FormatDateWithoutMillis(System.DateTime,System.Text.StringBuilder)"/> is called at most once
-            per second.
-            </para>
-            <para>
-            Sub classes should override <see cref="M:log4net.DateFormatter.AbsoluteTimeDateFormatter.FormatDateWithoutMillis(System.DateTime,System.Text.StringBuilder)"/>
-            rather than <see cref="M:log4net.DateFormatter.AbsoluteTimeDateFormatter.FormatDate(System.DateTime,System.IO.TextWriter)"/>.
-            </para>
-            </remarks>
-        </member>
-        <member name="F:log4net.DateFormatter.AbsoluteTimeDateFormatter.s_lastTimeToTheSecond">
-            <summary>
-            Last stored time with precision up to the second.
-            </summary>
-        </member>
-        <member name="F:log4net.DateFormatter.AbsoluteTimeDateFormatter.s_lastTimeBuf">
-            <summary>
-            Last stored time with precision up to the second, formatted
-            as a string.
-            </summary>
-        </member>
-        <member name="F:log4net.DateFormatter.AbsoluteTimeDateFormatter.s_lastTimeString">
-            <summary>
-            Last stored time with precision up to the second, formatted
-            as a string.
-            </summary>
-        </member>
-        <member name="T:log4net.DateFormatter.DateTimeDateFormatter">
-            <summary>
-            Formats a <see cref="T:System.DateTime"/> as <c>"dd MMM yyyy HH:mm:ss,fff"</c>
-            </summary>
-            <remarks>
-            <para>
-            Formats a <see cref="T:System.DateTime"/> in the format 
-            <c>"dd MMM yyyy HH:mm:ss,fff"</c> for example, 
-            <c>"06 Nov 1994 15:49:37,459"</c>.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-            <author>Angelika Schnagl</author>
-        </member>
-        <member name="M:log4net.DateFormatter.DateTimeDateFormatter.#ctor">
-            <summary>
-            Default constructor.
-            </summary>
-            <remarks>
-            <para>
-            Initializes a new instance of the <see cref="T:log4net.DateFormatter.DateTimeDateFormatter"/> class.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.DateFormatter.DateTimeDateFormatter.FormatDateWithoutMillis(System.DateTime,System.Text.StringBuilder)">
-            <summary>
-            Formats the date without the milliseconds part
-            </summary>
-            <param name="dateToFormat">The date to format.</param>
-            <param name="buffer">The string builder to write to.</param>
-            <remarks>
-            <para>
-            Formats a DateTime in the format <c>"dd MMM yyyy HH:mm:ss"</c>
-            for example, <c>"06 Nov 1994 15:49:37"</c>.
-            </para>
-            <para>
-            The base class will append the <c>",fff"</c> milliseconds section.
-            This method will only be called at most once per second.
-            </para>
-            </remarks>
-        </member>
-        <member name="F:log4net.DateFormatter.DateTimeDateFormatter.m_dateTimeFormatInfo">
-            <summary>
-            The format info for the invariant culture.
-            </summary>
-        </member>
-        <member name="T:log4net.DateFormatter.Iso8601DateFormatter">
-            <summary>
-            Formats the <see cref="T:System.DateTime"/> as <c>"yyyy-MM-dd HH:mm:ss,fff"</c>.
-            </summary>
-            <remarks>
-            <para>
-            Formats the <see cref="T:System.DateTime"/> specified as a string: <c>"yyyy-MM-dd HH:mm:ss,fff"</c>.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-        </member>
-        <member name="M:log4net.DateFormatter.Iso8601DateFormatter.#ctor">
-            <summary>
-            Default constructor
-            </summary>
-            <remarks>
-            <para>
-            Initializes a new instance of the <see cref="T:log4net.DateFormatter.Iso8601DateFormatter"/> class.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.DateFormatter.Iso8601DateFormatter.FormatDateWithoutMillis(System.DateTime,System.Text.StringBuilder)">
-            <summary>
-            Formats the date without the milliseconds part
-            </summary>
-            <param name="dateToFormat">The date to format.</param>
-            <param name="buffer">The string builder to write to.</param>
-            <remarks>
-            <para>
-            Formats the date specified as a string: <c>"yyyy-MM-dd HH:mm:ss"</c>.
-            </para>
-            <para>
-            The base class will append the <c>",fff"</c> milliseconds section.
-            This method will only be called at most once per second.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.DateFormatter.SimpleDateFormatter">
-            <summary>
-            Formats the <see cref="T:System.DateTime"/> using the <see cref="M:System.DateTime.ToString(System.String,System.IFormatProvider)"/> method.
-            </summary>
-            <remarks>
-            <para>
-            Formats the <see cref="T:System.DateTime"/> using the <see cref="T:System.DateTime"/> <see cref="M:System.DateTime.ToString(System.String,System.IFormatProvider)"/> method.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-        </member>
-        <member name="M:log4net.DateFormatter.SimpleDateFormatter.#ctor(System.String)">
-            <summary>
-            Constructor
-            </summary>
-            <param name="format">The format string.</param>
-            <remarks>
-            <para>
-            Initializes a new instance of the <see cref="T:log4net.DateFormatter.SimpleDateFormatter"/> class 
-            with the specified format string.
-            </para>
-            <para>
-            The format string must be compatible with the options
-            that can be supplied to <see cref="M:System.DateTime.ToString(System.String,System.IFormatProvider)"/>.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.DateFormatter.SimpleDateFormatter.FormatDate(System.DateTime,System.IO.TextWriter)">
-            <summary>
-            Formats the date using <see cref="M:System.DateTime.ToString(System.String,System.IFormatProvider)"/>.
-            </summary>
-            <param name="dateToFormat">The date to convert to a string.</param>
-            <param name="writer">The writer to write to.</param>
-            <remarks>
-            <para>
-            Uses the date format string supplied to the constructor to call
-            the <see cref="M:System.DateTime.ToString(System.String,System.IFormatProvider)"/> method to format the date.
-            </para>
-            </remarks>
-        </member>
-        <member name="F:log4net.DateFormatter.SimpleDateFormatter.m_formatString">
-            <summary>
-            The format string used to format the <see cref="T:System.DateTime"/>.
-            </summary>
-            <remarks>
-            <para>
-            The format string must be compatible with the options
-            that can be supplied to <see cref="M:System.DateTime.ToString(System.String,System.IFormatProvider)"/>.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Filter.DenyAllFilter">
-            <summary>
-            This filter drops all <see cref="T:log4net.Core.LoggingEvent"/>. 
-            </summary>
-            <remarks>
-            <para>
-            You can add this filter to the end of a filter chain to
-            switch from the default "accept all unless instructed otherwise"
-            filtering behavior to a "deny all unless instructed otherwise"
-            behavior.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-        </member>
-        <member name="T:log4net.Filter.FilterSkeleton">
-            <summary>
-            Subclass this type to implement customized logging event filtering
-            </summary>
-            <remarks>
-            <para>
-            Users should extend this class to implement customized logging
-            event filtering. Note that <see cref="T:log4net.Repository.Hierarchy.Logger"/> and 
-            <see cref="T:log4net.Appender.AppenderSkeleton"/>, the parent class of all standard
-            appenders, have built-in filtering rules. It is suggested that you
-            first use and understand the built-in rules before rushing to write
-            your own custom filters.
-            </para>
-            <para>
-            This abstract class assumes and also imposes that filters be
-            organized in a linear chain. The <see cref="M:log4net.Filter.FilterSkeleton.Decide(log4net.Core.LoggingEvent)"/>
-            method of each filter is called sequentially, in the order of their 
-            addition to the chain.
-            </para>
-            <para>
-            The <see cref="M:log4net.Filter.FilterSkeleton.Decide(log4net.Core.LoggingEvent)"/> method must return one
-            of the integer constants <see cref="F:log4net.Filter.FilterDecision.Deny"/>, 
-            <see cref="F:log4net.Filter.FilterDecision.Neutral"/> or <see cref="F:log4net.Filter.FilterDecision.Accept"/>.
-            </para>
-            <para>
-            If the value <see cref="F:log4net.Filter.FilterDecision.Deny"/> is returned, then the log event is dropped 
-            immediately without consulting with the remaining filters.
-            </para>
-            <para>
-            If the value <see cref="F:log4net.Filter.FilterDecision.Neutral"/> is returned, then the next filter
-            in the chain is consulted. If there are no more filters in the
-            chain, then the log event is logged. Thus, in the presence of no
-            filters, the default behavior is to log all logging events.
-            </para>
-            <para>
-            If the value <see cref="F:log4net.Filter.FilterDecision.Accept"/> is returned, then the log
-            event is logged without consulting the remaining filters.
-            </para>
-            <para>
-            The philosophy of log4net filters is largely inspired from the
-            Linux ipchains.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-        </member>
-        <member name="T:log4net.Filter.IFilter">
-            <summary>
-            Implement this interface to provide customized logging event filtering
-            </summary>
-            <remarks>
-            <para>
-            Users should implement this interface to implement customized logging
-            event filtering. Note that <see cref="T:log4net.Repository.Hierarchy.Logger"/> and 
-            <see cref="T:log4net.Appender.AppenderSkeleton"/>, the parent class of all standard
-            appenders, have built-in filtering rules. It is suggested that you
-            first use and understand the built-in rules before rushing to write
-            your own custom filters.
-            </para>
-            <para>
-            This abstract class assumes and also imposes that filters be
-            organized in a linear chain. The <see cref="M:log4net.Filter.IFilter.Decide(log4net.Core.LoggingEvent)"/>
-            method of each filter is called sequentially, in the order of their 
-            addition to the chain.
-            </para>
-            <para>
-            The <see cref="M:log4net.Filter.IFilter.Decide(log4net.Core.LoggingEvent)"/> method must return one
-            of the integer constants <see cref="F:log4net.Filter.FilterDecision.Deny"/>, 
-            <see cref="F:log4net.Filter.FilterDecision.Neutral"/> or <see cref="F:log4net.Filter.FilterDecision.Accept"/>.
-            </para>
-            <para>
-            If the value <see cref="F:log4net.Filter.FilterDecision.Deny"/> is returned, then the log event is dropped 
-            immediately without consulting with the remaining filters.
-            </para>
-            <para>
-            If the value <see cref="F:log4net.Filter.FilterDecision.Neutral"/> is returned, then the next filter
-            in the chain is consulted. If there are no more filters in the
-            chain, then the log event is logged. Thus, in the presence of no
-            filters, the default behavior is to log all logging events.
-            </para>
-            <para>
-            If the value <see cref="F:log4net.Filter.FilterDecision.Accept"/> is returned, then the log
-            event is logged without consulting the remaining filters.
-            </para>
-            <para>
-            The philosophy of log4net filters is largely inspired from the
-            Linux ipchains.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-        </member>
-        <member name="M:log4net.Filter.IFilter.Decide(log4net.Core.LoggingEvent)">
-            <summary>
-            Decide if the logging event should be logged through an appender.
-            </summary>
-            <param name="loggingEvent">The LoggingEvent to decide upon</param>
-            <returns>The decision of the filter</returns>
-            <remarks>
-            <para>
-            If the decision is <see cref="F:log4net.Filter.FilterDecision.Deny"/>, then the event will be
-            dropped. If the decision is <see cref="F:log4net.Filter.FilterDecision.Neutral"/>, then the next
-            filter, if any, will be invoked. If the decision is <see cref="F:log4net.Filter.FilterDecision.Accept"/> then
-            the event will be logged without consulting with other filters in
-            the chain.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Filter.IFilter.Next">
-            <summary>
-            Property to get and set the next filter
-            </summary>
-            <value>
-            The next filter in the chain
-            </value>
-            <remarks>
-            <para>
-            Filters are typically composed into chains. This property allows the next filter in 
-            the chain to be accessed.
-            </para>
-            </remarks>
-        </member>
-        <member name="F:log4net.Filter.FilterSkeleton.m_next">
-            <summary>
-            Points to the next filter in the filter chain.
-            </summary>
-            <remarks>
-            <para>
-            See <see cref="P:log4net.Filter.FilterSkeleton.Next"/> for more information.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Filter.FilterSkeleton.ActivateOptions">
-            <summary>
-            Initialize the filter with the options set
-            </summary>
-            <remarks>
-            <para>
-            This is part of the <see cref="T:log4net.Core.IOptionHandler"/> delayed object
-            activation scheme. The <see cref="M:log4net.Filter.FilterSkeleton.ActivateOptions"/> method must 
-            be called on this object after the configuration properties have
-            been set. Until <see cref="M:log4net.Filter.FilterSkeleton.ActivateOptions"/> is called this
-            object is in an undefined state and must not be used. 
-            </para>
-            <para>
-            If any of the configuration properties are modified then 
-            <see cref="M:log4net.Filter.FilterSkeleton.ActivateOptions"/> must be called again.
-            </para>
-            <para>
-            Typically filter's options become active immediately on set, 
-            however this method must still be called. 
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Filter.FilterSkeleton.Decide(log4net.Core.LoggingEvent)">
-            <summary>
-            Decide if the <see cref="T:log4net.Core.LoggingEvent"/> should be logged through an appender.
-            </summary>
-            <param name="loggingEvent">The <see cref="T:log4net.Core.LoggingEvent"/> to decide upon</param>
-            <returns>The decision of the filter</returns>
-            <remarks>
-            <para>
-            If the decision is <see cref="F:log4net.Filter.FilterDecision.Deny"/>, then the event will be
-            dropped. If the decision is <see cref="F:log4net.Filter.FilterDecision.Neutral"/>, then the next
-            filter, if any, will be invoked. If the decision is <see cref="F:log4net.Filter.FilterDecision.Accept"/> then
-            the event will be logged without consulting with other filters in
-            the chain.
-            </para>
-            <para>
-            This method is marked <c>abstract</c> and must be implemented
-            in a subclass.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Filter.FilterSkeleton.Next">
-            <summary>
-            Property to get and set the next filter
-            </summary>
-            <value>
-            The next filter in the chain
-            </value>
-            <remarks>
-            <para>
-            Filters are typically composed into chains. This property allows the next filter in 
-            the chain to be accessed.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Filter.DenyAllFilter.#ctor">
-            <summary>
-            Default constructor
-            </summary>
-        </member>
-        <member name="M:log4net.Filter.DenyAllFilter.Decide(log4net.Core.LoggingEvent)">
-            <summary>
-            Always returns the integer constant <see cref="F:log4net.Filter.FilterDecision.Deny"/>
-            </summary>
-            <param name="loggingEvent">the LoggingEvent to filter</param>
-            <returns>Always returns <see cref="F:log4net.Filter.FilterDecision.Deny"/></returns>
-            <remarks>
-            <para>
-            Ignores the event being logged and just returns
-            <see cref="F:log4net.Filter.FilterDecision.Deny"/>. This can be used to change the default filter
-            chain behavior from <see cref="F:log4net.Filter.FilterDecision.Accept"/> to <see cref="F:log4net.Filter.FilterDecision.Deny"/>. This filter
-            should only be used as the last filter in the chain
-            as any further filters will be ignored!
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Filter.FilterDecision">
-            <summary>
-            The return result from <see cref="M:log4net.Filter.IFilter.Decide(log4net.Core.LoggingEvent)"/>
-            </summary>
-            <remarks>
-            <para>
-            The return result from <see cref="M:log4net.Filter.IFilter.Decide(log4net.Core.LoggingEvent)"/>
-            </para>
-            </remarks>
-        </member>
-        <member name="F:log4net.Filter.FilterDecision.Deny">
-            <summary>
-            The log event must be dropped immediately without 
-            consulting with the remaining filters, if any, in the chain.
-            </summary>
-        </member>
-        <member name="F:log4net.Filter.FilterDecision.Neutral">
-            <summary>
-            This filter is neutral with respect to the log event. 
-            The remaining filters, if any, should be consulted for a final decision.
-            </summary>
-        </member>
-        <member name="F:log4net.Filter.FilterDecision.Accept">
-            <summary>
-            The log event must be logged immediately without 
-            consulting with the remaining filters, if any, in the chain.
-            </summary>
-        </member>
-        <member name="T:log4net.Filter.LevelMatchFilter">
-            <summary>
-            This is a very simple filter based on <see cref="T:log4net.Core.Level"/> matching.
-            </summary>
-            <remarks>
-            <para>
-            The filter admits two options <see cref="P:log4net.Filter.LevelMatchFilter.LevelToMatch"/> and
-            <see cref="P:log4net.Filter.LevelMatchFilter.AcceptOnMatch"/>. If there is an exact match between the value
-            of the <see cref="P:log4net.Filter.LevelMatchFilter.LevelToMatch"/> option and the <see cref="T:log4net.Core.Level"/> of the 
-            <see cref="T:log4net.Core.LoggingEvent"/>, then the <see cref="M:log4net.Filter.LevelMatchFilter.Decide(log4net.Core.LoggingEvent)"/> method returns <see cref="F:log4net.Filter.FilterDecision.Accept"/> in 
-            case the <see cref="P:log4net.Filter.LevelMatchFilter.AcceptOnMatch"/> option value is set
-            to <c>true</c>, if it is <c>false</c> then 
-            <see cref="F:log4net.Filter.FilterDecision.Deny"/> is returned. If the <see cref="T:log4net.Core.Level"/> does not match then
-            the result will be <see cref="F:log4net.Filter.FilterDecision.Neutral"/>.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-        </member>
-        <member name="F:log4net.Filter.LevelMatchFilter.m_acceptOnMatch">
-            <summary>
-            flag to indicate if the filter should <see cref="F:log4net.Filter.FilterDecision.Accept"/> on a match
-            </summary>
-        </member>
-        <member name="F:log4net.Filter.LevelMatchFilter.m_levelToMatch">
-            <summary>
-            the <see cref="T:log4net.Core.Level"/> to match against
-            </summary>
-        </member>
-        <member name="M:log4net.Filter.LevelMatchFilter.#ctor">
-            <summary>
-            Default constructor
-            </summary>
-        </member>
-        <member name="M:log4net.Filter.LevelMatchFilter.Decide(log4net.Core.LoggingEvent)">
-            <summary>
-            Tests if the <see cref="T:log4net.Core.Level"/> of the logging event matches that of the filter
-            </summary>
-            <param name="loggingEvent">the event to filter</param>
-            <returns>see remarks</returns>
-            <remarks>
-            <para>
-            If the <see cref="T:log4net.Core.Level"/> of the event matches the level of the
-            filter then the result of the function depends on the
-            value of <see cref="P:log4net.Filter.LevelMatchFilter.AcceptOnMatch"/>. If it is true then
-            the function will return <see cref="F:log4net.Filter.FilterDecision.Accept"/>, it it is false then it
-            will return <see cref="F:log4net.Filter.FilterDecision.Deny"/>. If the <see cref="T:log4net.Core.Level"/> does not match then
-            the result will be <see cref="F:log4net.Filter.FilterDecision.Neutral"/>.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Filter.LevelMatchFilter.AcceptOnMatch">
-            <summary>
-            <see cref="F:log4net.Filter.FilterDecision.Accept"/> when matching <see cref="P:log4net.Filter.LevelMatchFilter.LevelToMatch"/>
-            </summary>
-            <remarks>
-            <para>
-            The <see cref="P:log4net.Filter.LevelMatchFilter.AcceptOnMatch"/> property is a flag that determines
-            the behavior when a matching <see cref="T:log4net.Core.Level"/> is found. If the
-            flag is set to true then the filter will <see cref="F:log4net.Filter.FilterDecision.Accept"/> the 
-            logging event, otherwise it will <see cref="F:log4net.Filter.FilterDecision.Deny"/> the event.
-            </para>
-            <para>
-            The default is <c>true</c> i.e. to <see cref="F:log4net.Filter.FilterDecision.Accept"/> the event.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Filter.LevelMatchFilter.LevelToMatch">
-            <summary>
-            The <see cref="T:log4net.Core.Level"/> that the filter will match
-            </summary>
-            <remarks>
-            <para>
-            The level that this filter will attempt to match against the 
-            <see cref="T:log4net.Core.LoggingEvent"/> level. If a match is found then
-            the result depends on the value of <see cref="P:log4net.Filter.LevelMatchFilter.AcceptOnMatch"/>.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Filter.LevelRangeFilter">
-            <summary>
-            This is a simple filter based on <see cref="T:log4net.Core.Level"/> matching.
-            </summary>
-            <remarks>
-            <para>
-            The filter admits three options <see cref="P:log4net.Filter.LevelRangeFilter.LevelMin"/> and <see cref="P:log4net.Filter.LevelRangeFilter.LevelMax"/>
-            that determine the range of priorities that are matched, and
-            <see cref="P:log4net.Filter.LevelRangeFilter.AcceptOnMatch"/>. If there is a match between the range
-            of priorities and the <see cref="T:log4net.Core.Level"/> of the <see cref="T:log4net.Core.LoggingEvent"/>, then the 
-            <see cref="M:log4net.Filter.LevelRangeFilter.Decide(log4net.Core.LoggingEvent)"/> method returns <see cref="F:log4net.Filter.FilterDecision.Accept"/> in case the <see cref="P:log4net.Filter.LevelRangeFilter.AcceptOnMatch"/> 
-            option value is set to <c>true</c>, if it is <c>false</c>
-            then <see cref="F:log4net.Filter.FilterDecision.Deny"/> is returned. If there is no match, <see cref="F:log4net.Filter.FilterDecision.Deny"/> is returned.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-        </member>
-        <member name="F:log4net.Filter.LevelRangeFilter.m_acceptOnMatch">
-            <summary>
-            Flag to indicate the behavior when matching a <see cref="T:log4net.Core.Level"/>
-            </summary>
-        </member>
-        <member name="F:log4net.Filter.LevelRangeFilter.m_levelMin">
-            <summary>
-            the minimum <see cref="T:log4net.Core.Level"/> value to match
-            </summary>
-        </member>
-        <member name="F:log4net.Filter.LevelRangeFilter.m_levelMax">
-            <summary>
-            the maximum <see cref="T:log4net.Core.Level"/> value to match
-            </summary>
-        </member>
-        <member name="M:log4net.Filter.LevelRangeFilter.#ctor">
-            <summary>
-            Default constructor
-            </summary>
-        </member>
-        <member name="M:log4net.Filter.LevelRangeFilter.Decide(log4net.Core.LoggingEvent)">
-            <summary>
-            Check if the event should be logged.
-            </summary>
-            <param name="loggingEvent">the logging event to check</param>
-            <returns>see remarks</returns>
-            <remarks>
-            <para>
-            If the <see cref="T:log4net.Core.Level"/> of the logging event is outside the range
-            matched by this filter then <see cref="F:log4net.Filter.FilterDecision.Deny"/>
-            is returned. If the <see cref="T:log4net.Core.Level"/> is matched then the value of
-            <see cref="P:log4net.Filter.LevelRangeFilter.AcceptOnMatch"/> is checked. If it is true then
-            <see cref="F:log4net.Filter.FilterDecision.Accept"/> is returned, otherwise
-            <see cref="F:log4net.Filter.FilterDecision.Neutral"/> is returned.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Filter.LevelRangeFilter.AcceptOnMatch">
-            <summary>
-            <see cref="F:log4net.Filter.FilterDecision.Accept"/> when matching <see cref="P:log4net.Filter.LevelRangeFilter.LevelMin"/> and <see cref="P:log4net.Filter.LevelRangeFilter.LevelMax"/>
-            </summary>
-            <remarks>
-            <para>
-            The <see cref="P:log4net.Filter.LevelRangeFilter.AcceptOnMatch"/> property is a flag that determines
-            the behavior when a matching <see cref="T:log4net.Core.Level"/> is found. If the
-            flag is set to true then the filter will <see cref="F:log4net.Filter.FilterDecision.Accept"/> the 
-            logging event, otherwise it will <see cref="F:log4net.Filter.FilterDecision.Neutral"/> the event.
-            </para>
-            <para>
-            The default is <c>true</c> i.e. to <see cref="F:log4net.Filter.FilterDecision.Accept"/> the event.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Filter.LevelRangeFilter.LevelMin">
-            <summary>
-            Set the minimum matched <see cref="T:log4net.Core.Level"/>
-            </summary>
-            <remarks>
-            <para>
-            The minimum level that this filter will attempt to match against the 
-            <see cref="T:log4net.Core.LoggingEvent"/> level. If a match is found then
-            the result depends on the value of <see cref="P:log4net.Filter.LevelRangeFilter.AcceptOnMatch"/>.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Filter.LevelRangeFilter.LevelMax">
-            <summary>
-            Sets the maximum matched <see cref="T:log4net.Core.Level"/>
-            </summary>
-            <remarks>
-            <para>
-            The maximum level that this filter will attempt to match against the 
-            <see cref="T:log4net.Core.LoggingEvent"/> level. If a match is found then
-            the result depends on the value of <see cref="P:log4net.Filter.LevelRangeFilter.AcceptOnMatch"/>.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Filter.LoggerMatchFilter">
-            <summary>
-            Simple filter to match a string in the event's logger name.
-            </summary>
-            <remarks>
-            <para>
-            The works very similar to the <see cref="T:log4net.Filter.LevelMatchFilter"/>. It admits two 
-            options <see cref="P:log4net.Filter.LoggerMatchFilter.LoggerToMatch"/> and <see cref="P:log4net.Filter.LoggerMatchFilter.AcceptOnMatch"/>. If the 
-            <see cref="P:log4net.Core.LoggingEvent.LoggerName"/> of the <see cref="T:log4net.Core.LoggingEvent"/> starts 
-            with the value of the <see cref="P:log4net.Filter.LoggerMatchFilter.LoggerToMatch"/> option, then the 
-            <see cref="M:log4net.Filter.LoggerMatchFilter.Decide(log4net.Core.LoggingEvent)"/> method returns <see cref="F:log4net.Filter.FilterDecision.Accept"/> in 
-            case the <see cref="P:log4net.Filter.LoggerMatchFilter.AcceptOnMatch"/> option value is set to <c>true</c>, 
-            if it is <c>false</c> then <see cref="F:log4net.Filter.FilterDecision.Deny"/> is returned.
-            </para>
-            </remarks>
-            <author>Daniel Cazzulino</author>
-        </member>
-        <member name="F:log4net.Filter.LoggerMatchFilter.m_acceptOnMatch">
-            <summary>
-            Flag to indicate the behavior when we have a match
-            </summary>
-        </member>
-        <member name="F:log4net.Filter.LoggerMatchFilter.m_loggerToMatch">
-            <summary>
-            The logger name string to substring match against the event
-            </summary>
-        </member>
-        <member name="M:log4net.Filter.LoggerMatchFilter.#ctor">
-            <summary>
-            Default constructor
-            </summary>
-        </member>
-        <member name="M:log4net.Filter.LoggerMatchFilter.Decide(log4net.Core.LoggingEvent)">
-            <summary>
-            Check if this filter should allow the event to be logged
-            </summary>
-            <param name="loggingEvent">the event being logged</param>
-            <returns>see remarks</returns>
-            <remarks>
-            <para>
-            The rendered message is matched against the <see cref="P:log4net.Filter.LoggerMatchFilter.LoggerToMatch"/>.
-            If the <see cref="P:log4net.Filter.LoggerMatchFilter.LoggerToMatch"/> equals the beginning of 
-            the incoming <see cref="P:log4net.Core.LoggingEvent.LoggerName"/> (<see cref="M:System.String.StartsWith(System.String)"/>)
-            then a match will have occurred. If no match occurs
-            this function will return <see cref="F:log4net.Filter.FilterDecision.Neutral"/>
-            allowing other filters to check the event. If a match occurs then
-            the value of <see cref="P:log4net.Filter.LoggerMatchFilter.AcceptOnMatch"/> is checked. If it is
-            true then <see cref="F:log4net.Filter.FilterDecision.Accept"/> is returned otherwise
-            <see cref="F:log4net.Filter.FilterDecision.Deny"/> is returned.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Filter.LoggerMatchFilter.AcceptOnMatch">
-            <summary>
-            <see cref="F:log4net.Filter.FilterDecision.Accept"/> when matching <see cref="P:log4net.Filter.LoggerMatchFilter.LoggerToMatch"/>
-            </summary>
-            <remarks>
-            <para>
-            The <see cref="P:log4net.Filter.LoggerMatchFilter.AcceptOnMatch"/> property is a flag that determines
-            the behavior when a matching <see cref="T:log4net.Core.Level"/> is found. If the
-            flag is set to true then the filter will <see cref="F:log4net.Filter.FilterDecision.Accept"/> the 
-            logging event, otherwise it will <see cref="F:log4net.Filter.FilterDecision.Deny"/> the event.
-            </para>
-            <para>
-            The default is <c>true</c> i.e. to <see cref="F:log4net.Filter.FilterDecision.Accept"/> the event.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Filter.LoggerMatchFilter.LoggerToMatch">
-            <summary>
-            The <see cref="P:log4net.Core.LoggingEvent.LoggerName"/> that the filter will match
-            </summary>
-            <remarks>
-            <para>
-            This filter will attempt to match this value against logger name in
-            the following way. The match will be done against the beginning of the
-            logger name (using <see cref="M:System.String.StartsWith(System.String)"/>). The match is
-            case sensitive. If a match is found then
-            the result depends on the value of <see cref="P:log4net.Filter.LoggerMatchFilter.AcceptOnMatch"/>.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Filter.MdcFilter">
-            <summary>
-            Simple filter to match a keyed string in the <see cref="T:log4net.MDC"/>
-            </summary>
-            <remarks>
-            <para>
-            Simple filter to match a keyed string in the <see cref="T:log4net.MDC"/>
-            </para>
-            <para>
-            As the MDC has been replaced with layered properties the
-            <see cref="T:log4net.Filter.PropertyFilter"/> should be used instead.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-        </member>
-        <member name="T:log4net.Filter.PropertyFilter">
-            <summary>
-            Simple filter to match a string an event property
-            </summary>
-            <remarks>
-            <para>
-            Simple filter to match a string in the value for a
-            specific event property
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-        </member>
-        <member name="T:log4net.Filter.StringMatchFilter">
-            <summary>
-            Simple filter to match a string in the rendered message
-            </summary>
-            <remarks>
-            <para>
-            Simple filter to match a string in the rendered message
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-        </member>
-        <member name="F:log4net.Filter.StringMatchFilter.m_acceptOnMatch">
-            <summary>
-            Flag to indicate the behavior when we have a match
-            </summary>
-        </member>
-        <member name="F:log4net.Filter.StringMatchFilter.m_stringToMatch">
-            <summary>
-            The string to substring match against the message
-            </summary>
-        </member>
-        <member name="F:log4net.Filter.StringMatchFilter.m_stringRegexToMatch">
-            <summary>
-            A string regex to match
-            </summary>
-        </member>
-        <member name="F:log4net.Filter.StringMatchFilter.m_regexToMatch">
-            <summary>
-            A regex object to match (generated from m_stringRegexToMatch)
-            </summary>
-        </member>
-        <member name="M:log4net.Filter.StringMatchFilter.#ctor">
-            <summary>
-            Default constructor
-            </summary>
-        </member>
-        <member name="M:log4net.Filter.StringMatchFilter.ActivateOptions">
-            <summary>
-            Initialize and precompile the Regex if required
-            </summary>
-            <remarks>
-            <para>
-            This is part of the <see cref="T:log4net.Core.IOptionHandler"/> delayed object
-            activation scheme. The <see cref="M:log4net.Filter.StringMatchFilter.ActivateOptions"/> method must 
-            be called on this object after the configuration properties have
-            been set. Until <see cref="M:log4net.Filter.StringMatchFilter.ActivateOptions"/> is called this
-            object is in an undefined state and must not be used. 
-            </para>
-            <para>
-            If any of the configuration properties are modified then 
-            <see cref="M:log4net.Filter.StringMatchFilter.ActivateOptions"/> must be called again.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Filter.StringMatchFilter.Decide(log4net.Core.LoggingEvent)">
-            <summary>
-            Check if this filter should allow the event to be logged
-            </summary>
-            <param name="loggingEvent">the event being logged</param>
-            <returns>see remarks</returns>
-            <remarks>
-            <para>
-            The rendered message is matched against the <see cref="P:log4net.Filter.StringMatchFilter.StringToMatch"/>.
-            If the <see cref="P:log4net.Filter.StringMatchFilter.StringToMatch"/> occurs as a substring within
-            the message then a match will have occurred. If no match occurs
-            this function will return <see cref="F:log4net.Filter.FilterDecision.Neutral"/>
-            allowing other filters to check the event. If a match occurs then
-            the value of <see cref="P:log4net.Filter.StringMatchFilter.AcceptOnMatch"/> is checked. If it is
-            true then <see cref="F:log4net.Filter.FilterDecision.Accept"/> is returned otherwise
-            <see cref="F:log4net.Filter.FilterDecision.Deny"/> is returned.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Filter.StringMatchFilter.AcceptOnMatch">
-            <summary>
-            <see cref="F:log4net.Filter.FilterDecision.Accept"/> when matching <see cref="P:log4net.Filter.StringMatchFilter.StringToMatch"/> or <see cref="P:log4net.Filter.StringMatchFilter.RegexToMatch"/>
-            </summary>
-            <remarks>
-            <para>
-            The <see cref="P:log4net.Filter.StringMatchFilter.AcceptOnMatch"/> property is a flag that determines
-            the behavior when a matching <see cref="T:log4net.Core.Level"/> is found. If the
-            flag is set to true then the filter will <see cref="F:log4net.Filter.FilterDecision.Accept"/> the 
-            logging event, otherwise it will <see cref="F:log4net.Filter.FilterDecision.Neutral"/> the event.
-            </para>
-            <para>
-            The default is <c>true</c> i.e. to <see cref="F:log4net.Filter.FilterDecision.Accept"/> the event.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Filter.StringMatchFilter.StringToMatch">
-            <summary>
-            Sets the static string to match
-            </summary>
-            <remarks>
-            <para>
-            The string that will be substring matched against
-            the rendered message. If the message contains this
-            string then the filter will match. If a match is found then
-            the result depends on the value of <see cref="P:log4net.Filter.StringMatchFilter.AcceptOnMatch"/>.
-            </para>
-            <para>
-            One of <see cref="P:log4net.Filter.StringMatchFilter.StringToMatch"/> or <see cref="P:log4net.Filter.StringMatchFilter.RegexToMatch"/>
-            must be specified.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Filter.StringMatchFilter.RegexToMatch">
-            <summary>
-            Sets the regular expression to match
-            </summary>
-            <remarks>
-            <para>
-            The regular expression pattern that will be matched against
-            the rendered message. If the message matches this
-            pattern then the filter will match. If a match is found then
-            the result depends on the value of <see cref="P:log4net.Filter.StringMatchFilter.AcceptOnMatch"/>.
-            </para>
-            <para>
-            One of <see cref="P:log4net.Filter.StringMatchFilter.StringToMatch"/> or <see cref="P:log4net.Filter.StringMatchFilter.RegexToMatch"/>
-            must be specified.
-            </para>
-            </remarks>
-        </member>
-        <member name="F:log4net.Filter.PropertyFilter.m_key">
-            <summary>
-            The key to use to lookup the string from the event properties
-            </summary>
-        </member>
-        <member name="M:log4net.Filter.PropertyFilter.#ctor">
-            <summary>
-            Default constructor
-            </summary>
-        </member>
-        <member name="M:log4net.Filter.PropertyFilter.Decide(log4net.Core.LoggingEvent)">
-            <summary>
-            Check if this filter should allow the event to be logged
-            </summary>
-            <param name="loggingEvent">the event being logged</param>
-            <returns>see remarks</returns>
-            <remarks>
-            <para>
-            The event property for the <see cref="P:log4net.Filter.PropertyFilter.Key"/> is matched against 
-            the <see cref="P:log4net.Filter.StringMatchFilter.StringToMatch"/>.
-            If the <see cref="P:log4net.Filter.StringMatchFilter.StringToMatch"/> occurs as a substring within
-            the property value then a match will have occurred. If no match occurs
-            this function will return <see cref="F:log4net.Filter.FilterDecision.Neutral"/>
-            allowing other filters to check the event. If a match occurs then
-            the value of <see cref="P:log4net.Filter.StringMatchFilter.AcceptOnMatch"/> is checked. If it is
-            true then <see cref="F:log4net.Filter.FilterDecision.Accept"/> is returned otherwise
-            <see cref="F:log4net.Filter.FilterDecision.Deny"/> is returned.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Filter.PropertyFilter.Key">
-            <summary>
-            The key to lookup in the event properties and then match against.
-            </summary>
-            <remarks>
-            <para>
-            The key name to use to lookup in the properties map of the
-            <see cref="T:log4net.Core.LoggingEvent"/>. The match will be performed against 
-            the value of this property if it exists.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Filter.NdcFilter">
-            <summary>
-            Simple filter to match a string in the <see cref="T:log4net.NDC"/>
-            </summary>
-            <remarks>
-            <para>
-            Simple filter to match a string in the <see cref="T:log4net.NDC"/>
-            </para>
-            <para>
-            As the MDC has been replaced with named stacks stored in the
-            properties collections the <see cref="T:log4net.Filter.PropertyFilter"/> should 
-            be used instead.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-        </member>
-        <member name="M:log4net.Filter.NdcFilter.#ctor">
-            <summary>
-            Default constructor
-            </summary>
-            <remarks>
-            <para>
-            Sets the <see cref="P:log4net.Filter.PropertyFilter.Key"/> to <c>"NDC"</c>.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Layout.Pattern.AppDomainPatternConverter">
-            <summary>
-            Write the event appdomain name to the output
-            </summary>
-            <remarks>
-            <para>
-            Writes the <see cref="P:log4net.Core.LoggingEvent.Domain"/> to the output writer.
-            </para>
-            </remarks>
-            <author>Daniel Cazzulino</author>
-            <author>Nicko Cadell</author>
-        </member>
-        <member name="T:log4net.Layout.Pattern.PatternLayoutConverter">
-            <summary>
-            Abstract class that provides the formatting functionality that 
-            derived classes need.
-            </summary>
-            <remarks>
-            Conversion specifiers in a conversion patterns are parsed to
-            individual PatternConverters. Each of which is responsible for
-            converting a logging event in a converter specific manner.
-            </remarks>
-            <author>Nicko Cadell</author>
-        </member>
-        <member name="T:log4net.Util.PatternConverter">
-            <summary>
-            Abstract class that provides the formatting functionality that 
-            derived classes need.
-            </summary>
-            <remarks>
-            <para>
-            Conversion specifiers in a conversion patterns are parsed to
-            individual PatternConverters. Each of which is responsible for
-            converting a logging event in a converter specific manner.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-        </member>
-        <member name="F:log4net.Util.PatternConverter.c_renderBufferSize">
-            <summary>
-            Initial buffer size
-            </summary>
-        </member>
-        <member name="F:log4net.Util.PatternConverter.c_renderBufferMaxCapacity">
-            <summary>
-            Maximum buffer size before it is recycled
-            </summary>
-        </member>
-        <member name="M:log4net.Util.PatternConverter.#ctor">
-            <summary>
-            Protected constructor
-            </summary>
-            <remarks>
-            <para>
-            Initializes a new instance of the <see cref="T:log4net.Util.PatternConverter"/> class.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.PatternConverter.Convert(System.IO.TextWriter,System.Object)">
-            <summary>
-            Evaluate this pattern converter and write the output to a writer.
-            </summary>
-            <param name="writer"><see cref="T:System.IO.TextWriter"/> that will receive the formatted result.</param>
-            <param name="state">The state object on which the pattern converter should be executed.</param>
-            <remarks>
-            <para>
-            Derived pattern converters must override this method in order to
-            convert conversion specifiers in the appropriate way.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.PatternConverter.SetNext(log4net.Util.PatternConverter)">
-            <summary>
-            Set the next pattern converter in the chains
-            </summary>
-            <param name="patternConverter">the pattern converter that should follow this converter in the chain</param>
-            <returns>the next converter</returns>
-            <remarks>
-            <para>
-            The PatternConverter can merge with its neighbor during this method (or a sub class).
-            Therefore the return value may or may not be the value of the argument passed in.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.PatternConverter.Format(System.IO.TextWriter,System.Object)">
-            <summary>
-            Write the pattern converter to the writer with appropriate formatting
-            </summary>
-            <param name="writer"><see cref="T:System.IO.TextWriter"/> that will receive the formatted result.</param>
-            <param name="state">The state object on which the pattern converter should be executed.</param>
-            <remarks>
-            <para>
-            This method calls <see cref="M:log4net.Util.PatternConverter.Convert(System.IO.TextWriter,System.Object)"/> to allow the subclass to perform
-            appropriate conversion of the pattern converter. If formatting options have
-            been specified via the <see cref="P:log4net.Util.PatternConverter.FormattingInfo"/> then this method will
-            apply those formattings before writing the output.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.PatternConverter.SpacePad(System.IO.TextWriter,System.Int32)">
-            <summary>
-            Fast space padding method.
-            </summary>
-            <param name="writer"><see cref="T:System.IO.TextWriter"/> to which the spaces will be appended.</param>
-            <param name="length">The number of spaces to be padded.</param>
-            <remarks>
-            <para>
-            Fast space padding method.
-            </para>
-            </remarks>
-        </member>
-        <member name="F:log4net.Util.PatternConverter.m_option">
-            <summary>
-            The option string to the converter
-            </summary>
-        </member>
-        <member name="M:log4net.Util.PatternConverter.WriteDictionary(System.IO.TextWriter,log4net.Repository.ILoggerRepository,System.Collections.IDictionary)">
-            <summary>
-            Write an dictionary to a <see cref="T:System.IO.TextWriter"/>
-            </summary>
-            <param name="writer">the writer to write to</param>
-            <param name="repository">a <see cref="T:log4net.Repository.ILoggerRepository"/> to use for object conversion</param>
-            <param name="value">the value to write to the writer</param>
-            <remarks>
-            <para>
-            Writes the <see cref="T:System.Collections.IDictionary"/> to a writer in the form:
-            </para>
-            <code>
-            {key1=value1, key2=value2, key3=value3}
-            </code>
-            <para>
-            If the <see cref="T:log4net.Repository.ILoggerRepository"/> specified
-            is not null then it is used to render the key and value to text, otherwise
-            the object's ToString method is called.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.PatternConverter.WriteObject(System.IO.TextWriter,log4net.Repository.ILoggerRepository,System.Object)">
-            <summary>
-            Write an object to a <see cref="T:System.IO.TextWriter"/>
-            </summary>
-            <param name="writer">the writer to write to</param>
-            <param name="repository">a <see cref="T:log4net.Repository.ILoggerRepository"/> to use for object conversion</param>
-            <param name="value">the value to write to the writer</param>
-            <remarks>
-            <para>
-            Writes the Object to a writer. If the <see cref="T:log4net.Repository.ILoggerRepository"/> specified
-            is not null then it is used to render the object to text, otherwise
-            the object's ToString method is called.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Util.PatternConverter.Next">
-            <summary>
-            Get the next pattern converter in the chain
-            </summary>
-            <value>
-            the next pattern converter in the chain
-            </value>
-            <remarks>
-            <para>
-            Get the next pattern converter in the chain
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Util.PatternConverter.FormattingInfo">
-            <summary>
-            Gets or sets the formatting info for this converter
-            </summary>
-            <value>
-            The formatting info for this converter
-            </value>
-            <remarks>
-            <para>
-            Gets or sets the formatting info for this converter
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Util.PatternConverter.Option">
-            <summary>
-            Gets or sets the option value for this converter
-            </summary>
-            <summary>
-            The option for this converter
-            </summary>
-            <remarks>
-            <para>
-            Gets or sets the option value for this converter
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Layout.Pattern.PatternLayoutConverter.#ctor">
-            <summary>
-            Initializes a new instance of the <see cref="T:log4net.Layout.Pattern.PatternLayoutConverter"/> class.
-            </summary>
-        </member>
-        <member name="M:log4net.Layout.Pattern.PatternLayoutConverter.Convert(System.IO.TextWriter,log4net.Core.LoggingEvent)">
-            <summary>
-            Derived pattern converters must override this method in order to
-            convert conversion specifiers in the correct way.
-            </summary>
-            <param name="writer"><see cref="T:System.IO.TextWriter"/> that will receive the formatted result.</param>
-            <param name="loggingEvent">The <see cref="T:log4net.Core.LoggingEvent"/> on which the pattern converter should be executed.</param>
-        </member>
-        <member name="M:log4net.Layout.Pattern.PatternLayoutConverter.Convert(System.IO.TextWriter,System.Object)">
-            <summary>
-            Derived pattern converters must override this method in order to
-            convert conversion specifiers in the correct way.
-            </summary>
-            <param name="writer"><see cref="T:System.IO.TextWriter"/> that will receive the formatted result.</param>
-            <param name="state">The state object on which the pattern converter should be executed.</param>
-        </member>
-        <member name="F:log4net.Layout.Pattern.PatternLayoutConverter.m_ignoresException">
-            <summary>
-            Flag indicating if this converter handles exceptions
-            </summary>
-            <remarks>
-            <c>false</c> if this converter handles exceptions
-            </remarks>
-        </member>
-        <member name="P:log4net.Layout.Pattern.PatternLayoutConverter.IgnoresException">
-            <summary>
-            Flag indicating if this converter handles the logging event exception
-            </summary>
-            <value><c>false</c> if this converter handles the logging event exception</value>
-            <remarks>
-            <para>
-            If this converter handles the exception object contained within
-            <see cref="T:log4net.Core.LoggingEvent"/>, then this property should be set to
-            <c>false</c>. Otherwise, if the layout ignores the exception
-            object, then the property should be set to <c>true</c>.
-            </para>
-            <para>
-            Set this value to override a this default setting. The default
-            value is <c>true</c>, this converter does not handle the exception.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Layout.Pattern.AppDomainPatternConverter.Convert(System.IO.TextWriter,log4net.Core.LoggingEvent)">
-            <summary>
-            Write the event appdomain name to the output
-            </summary>
-            <param name="writer"><see cref="T:System.IO.TextWriter"/> that will receive the formatted result.</param>
-            <param name="loggingEvent">the event being logged</param>
-            <remarks>
-            <para>
-            Writes the <see cref="P:log4net.Core.LoggingEvent.Domain"/> to the output <paramref name="writer"/>.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Layout.Pattern.DatePatternConverter">
-            <summary>
-            Date pattern converter, uses a <see cref="T:log4net.DateFormatter.IDateFormatter"/> to format 
-            the date of a <see cref="T:log4net.Core.LoggingEvent"/>.
-            </summary>
-            <remarks>
-            <para>
-            Render the <see cref="P:log4net.Core.LoggingEvent.TimeStamp"/> to the writer as a string.
-            </para>
-            <para>
-            The value of the <see cref="P:log4net.Util.PatternConverter.Option"/> determines 
-            the formatting of the date. The following values are allowed:
-            <list type="definition">
-            	<listheader>
-            		<term>Option value</term>
-            		<description>Output</description>
-            	</listheader>
-            	<item>
-            		<term>ISO8601</term>
-            		<description>
-            		Uses the <see cref="T:log4net.DateFormatter.Iso8601DateFormatter"/> formatter. 
-            		Formats using the <c>"yyyy-MM-dd HH:mm:ss,fff"</c> pattern.
-            		</description>
-            	</item>
-            	<item>
-            		<term>DATE</term>
-            		<description>
-            		Uses the <see cref="T:log4net.DateFormatter.DateTimeDateFormatter"/> formatter. 
-            		Formats using the <c>"dd MMM yyyy HH:mm:ss,fff"</c> for example, <c>"06 Nov 1994 15:49:37,459"</c>.
-            		</description>
-            	</item>
-            	<item>
-            		<term>ABSOLUTE</term>
-            		<description>
-            		Uses the <see cref="T:log4net.DateFormatter.AbsoluteTimeDateFormatter"/> formatter. 
-            		Formats using the <c>"HH:mm:ss,yyyy"</c> for example, <c>"15:49:37,459"</c>.
-            		</description>
-            	</item>
-            	<item>
-            		<term>other</term>
-            		<description>
-            		Any other pattern string uses the <see cref="T:log4net.DateFormatter.SimpleDateFormatter"/> formatter. 
-            		This formatter passes the pattern string to the <see cref="T:System.DateTime"/> 
-            		<see cref="M:System.DateTime.ToString(System.String)"/> method.
-            		For details on valid patterns see 
-            		<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfsystemglobalizationdatetimeformatinfoclasstopic.asp">DateTimeFormatInfo Class</a>.
-            		</description>
-            	</item>
-            </list>
-            </para>
-            <para>
-            The <see cref="P:log4net.Core.LoggingEvent.TimeStamp"/> is in the local time zone and is rendered in that zone.
-            To output the time in Universal time see <see cref="T:log4net.Layout.Pattern.UtcDatePatternConverter"/>.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-        </member>
-        <member name="F:log4net.Layout.Pattern.DatePatternConverter.m_dateFormatter">
-            <summary>
-            The <see cref="T:log4net.DateFormatter.IDateFormatter"/> used to render the date to a string
-            </summary>
-            <remarks>
-            <para>
-            The <see cref="T:log4net.DateFormatter.IDateFormatter"/> used to render the date to a string
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Layout.Pattern.DatePatternConverter.ActivateOptions">
-            <summary>
-            Initialize the converter pattern based on the <see cref="P:log4net.Util.PatternConverter.Option"/> property.
-            </summary>
-            <remarks>
-            <para>
-            This is part of the <see cref="T:log4net.Core.IOptionHandler"/> delayed object
-            activation scheme. The <see cref="M:log4net.Layout.Pattern.DatePatternConverter.ActivateOptions"/> method must 
-            be called on this object after the configuration properties have
-            been set. Until <see cref="M:log4net.Layout.Pattern.DatePatternConverter.ActivateOptions"/> is called this
-            object is in an undefined state and must not be used. 
-            </para>
-            <para>
-            If any of the configuration properties are modified then 
-            <see cref="M:log4net.Layout.Pattern.DatePatternConverter.ActivateOptions"/> must be called again.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Layout.Pattern.DatePatternConverter.Convert(System.IO.TextWriter,log4net.Core.LoggingEvent)">
-            <summary>
-            Convert the pattern into the rendered message
-            </summary>
-            <param name="writer"><see cref="T:System.IO.TextWriter"/> that will receive the formatted result.</param>
-            <param name="loggingEvent">the event being logged</param>
-            <remarks>
-            <para>
-            Pass the <see cref="P:log4net.Core.LoggingEvent.TimeStamp"/> to the <see cref="T:log4net.DateFormatter.IDateFormatter"/>
-            for it to render it to the writer.
-            </para>
-            <para>
-            The <see cref="P:log4net.Core.LoggingEvent.TimeStamp"/> passed is in the local time zone.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Layout.Pattern.ExceptionPatternConverter">
-            <summary>
-            Write the exception text to the output
-            </summary>
-            <remarks>
-            <para>
-            If an exception object is stored in the logging event
-            it will be rendered into the pattern output with a
-            trailing newline.
-            </para>
-            <para>
-            If there is no exception then nothing will be output
-            and no trailing newline will be appended.
-            It is typical to put a newline before the exception
-            and to have the exception as the last data in the pattern.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-        </member>
-        <member name="M:log4net.Layout.Pattern.ExceptionPatternConverter.#ctor">
-            <summary>
-            Default constructor
-            </summary>
-        </member>
-        <member name="M:log4net.Layout.Pattern.ExceptionPatternConverter.Convert(System.IO.TextWriter,log4net.Core.LoggingEvent)">
-            <summary>
-            Write the exception text to the output
-            </summary>
-            <param name="writer"><see cref="T:System.IO.TextWriter"/> that will receive the formatted result.</param>
-            <param name="loggingEvent">the event being logged</param>
-            <remarks>
-            <para>
-            If an exception object is stored in the logging event
-            it will be rendered into the pattern output with a
-            trailing newline.
-            </para>
-            <para>
-            If there is no exception then nothing will be output
-            and no trailing newline will be appended.
-            It is typical to put a newline before the exception
-            and to have the exception as the last data in the pattern.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Layout.Pattern.FileLocationPatternConverter">
-            <summary>
-            Writes the caller location file name to the output
-            </summary>
-            <remarks>
-            <para>
-            Writes the value of the <see cref="P:log4net.Core.LocationInfo.FileName"/> for
-            the event to the output writer.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-        </member>
-        <member name="M:log4net.Layout.Pattern.FileLocationPatternConverter.Convert(System.IO.TextWriter,log4net.Core.LoggingEvent)">
-            <summary>
-            Write the caller location file name to the output
-            </summary>
-            <param name="writer"><see cref="T:System.IO.TextWriter"/> that will receive the formatted result.</param>
-            <param name="loggingEvent">the event being logged</param>
-            <remarks>
-            <para>
-            Writes the value of the <see cref="P:log4net.Core.LocationInfo.FileName"/> for
-            the <paramref name="loggingEvent"/> to the output <paramref name="writer"/>.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Layout.Pattern.FullLocationPatternConverter">
-            <summary>
-            Write the caller location info to the output
-            </summary>
-            <remarks>
-            <para>
-            Writes the <see cref="P:log4net.Core.LocationInfo.FullInfo"/> to the output writer.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-        </member>
-        <member name="M:log4net.Layout.Pattern.FullLocationPatternConverter.Convert(System.IO.TextWriter,log4net.Core.LoggingEvent)">
-            <summary>
-            Write the caller location info to the output
-            </summary>
-            <param name="writer"><see cref="T:System.IO.TextWriter"/> that will receive the formatted result.</param>
-            <param name="loggingEvent">the event being logged</param>
-            <remarks>
-            <para>
-            Writes the <see cref="P:log4net.Core.LocationInfo.FullInfo"/> to the output writer.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Layout.Pattern.IdentityPatternConverter">
-            <summary>
-            Writes the event identity to the output
-            </summary>
-            <remarks>
-            <para>
-            Writes the value of the <see cref="P:log4net.Core.LoggingEvent.Identity"/> to
-            the output writer.
-            </para>
-            </remarks>
-            <author>Daniel Cazzulino</author>
-            <author>Nicko Cadell</author>
-        </member>
-        <member name="M:log4net.Layout.Pattern.IdentityPatternConverter.Convert(System.IO.TextWriter,log4net.Core.LoggingEvent)">
-            <summary>
-            Writes the event identity to the output
-            </summary>
-            <param name="writer"><see cref="T:System.IO.TextWriter"/> that will receive the formatted result.</param>
-            <param name="loggingEvent">the event being logged</param>
-            <remarks>
-            <para>
-            Writes the value of the <paramref name="loggingEvent"/> 
-            <see cref="P:log4net.Core.LoggingEvent.Identity"/> to
-            the output <paramref name="writer"/>.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Layout.Pattern.LevelPatternConverter">
-            <summary>
-            Write the event level to the output
-            </summary>
-            <remarks>
-            <para>
-            Writes the display name of the event <see cref="P:log4net.Core.LoggingEvent.Level"/>
-            to the writer.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-        </member>
-        <member name="M:log4net.Layout.Pattern.LevelPatternConverter.Convert(System.IO.TextWriter,log4net.Core.LoggingEvent)">
-            <summary>
-            Write the event level to the output
-            </summary>
-            <param name="writer"><see cref="T:System.IO.TextWriter"/> that will receive the formatted result.</param>
-            <param name="loggingEvent">the event being logged</param>
-            <remarks>
-            <para>
-            Writes the <see cref="P:log4net.Core.Level.DisplayName"/> of the <paramref name="loggingEvent"/> <see cref="P:log4net.Core.LoggingEvent.Level"/>
-            to the <paramref name="writer"/>.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Layout.Pattern.LineLocationPatternConverter">
-            <summary>
-            Write the caller location line number to the output
-            </summary>
-            <remarks>
-            <para>
-            Writes the value of the <see cref="P:log4net.Core.LocationInfo.LineNumber"/> for
-            the event to the output writer.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-        </member>
-        <member name="M:log4net.Layout.Pattern.LineLocationPatternConverter.Convert(System.IO.TextWriter,log4net.Core.LoggingEvent)">
-            <summary>
-            Write the caller location line number to the output
-            </summary>
-            <param name="writer"><see cref="T:System.IO.TextWriter"/> that will receive the formatted result.</param>
-            <param name="loggingEvent">the event being logged</param>
-            <remarks>
-            <para>
-            Writes the value of the <see cref="P:log4net.Core.LocationInfo.LineNumber"/> for
-            the <paramref name="loggingEvent"/> to the output <paramref name="writer"/>.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Layout.Pattern.LoggerPatternConverter">
-            <summary>
-            Converter for logger name
-            </summary>
-            <remarks>
-            <para>
-            Outputs the <see cref="P:log4net.Core.LoggingEvent.LoggerName"/> of the event.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-        </member>
-        <member name="T:log4net.Layout.Pattern.NamedPatternConverter">
-            <summary>
-            Converter to output and truncate <c>'.'</c> separated strings
-            </summary>
-            <remarks>
-            <para>
-            This abstract class supports truncating a <c>'.'</c> separated string
-            to show a specified number of elements from the right hand side.
-            This is used to truncate class names that are fully qualified.
-            </para>
-            <para>
-            Subclasses should override the <see cref="M:log4net.Layout.Pattern.NamedPatternConverter.GetFullyQualifiedName(log4net.Core.LoggingEvent)"/> method to
-            return the fully qualified string.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-        </member>
-        <member name="M:log4net.Layout.Pattern.NamedPatternConverter.ActivateOptions">
-            <summary>
-            Initialize the converter 
-            </summary>
-            <remarks>
-            <para>
-            This is part of the <see cref="T:log4net.Core.IOptionHandler"/> delayed object
-            activation scheme. The <see cref="M:log4net.Layout.Pattern.NamedPatternConverter.ActivateOptions"/> method must 
-            be called on this object after the configuration properties have
-            been set. Until <see cref="M:log4net.Layout.Pattern.NamedPatternConverter.ActivateOptions"/> is called this
-            object is in an undefined state and must not be used. 
-            </para>
-            <para>
-            If any of the configuration properties are modified then 
-            <see cref="M:log4net.Layout.Pattern.NamedPatternConverter.ActivateOptions"/> must be called again.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Layout.Pattern.NamedPatternConverter.GetFullyQualifiedName(log4net.Core.LoggingEvent)">
-            <summary>
-            Get the fully qualified string data
-            </summary>
-            <param name="loggingEvent">the event being logged</param>
-            <returns>the fully qualified name</returns>
-            <remarks>
-            <para>
-            Overridden by subclasses to get the fully qualified name before the
-            precision is applied to it.
-            </para>
-            <para>
-            Return the fully qualified <c>'.'</c> (dot/period) separated string.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Layout.Pattern.NamedPatternConverter.Convert(System.IO.TextWriter,log4net.Core.LoggingEvent)">
-            <summary>
-            Convert the pattern to the rendered message
-            </summary>
-            <param name="writer"><see cref="T:System.IO.TextWriter"/> that will receive the formatted result.</param>
-            <param name="loggingEvent">the event being logged</param>
-            <remarks>
-            Render the <see cref="M:log4net.Layout.Pattern.NamedPatternConverter.GetFullyQualifiedName(log4net.Core.LoggingEvent)"/> to the precision
-            specified by the <see cref="P:log4net.Util.PatternConverter.Option"/> property.
-            </remarks>
-        </member>
-        <member name="M:log4net.Layout.Pattern.LoggerPatternConverter.GetFullyQualifiedName(log4net.Core.LoggingEvent)">
-            <summary>
-            Gets the fully qualified name of the logger
-            </summary>
-            <param name="loggingEvent">the event being logged</param>
-            <returns>The fully qualified logger name</returns>
-            <remarks>
-            <para>
-            Returns the <see cref="P:log4net.Core.LoggingEvent.LoggerName"/> of the <paramref name="loggingEvent"/>.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Layout.Pattern.MessagePatternConverter">
-            <summary>
-            Writes the event message to the output
-            </summary>
-            <remarks>
-            <para>
-            Uses the <see cref="M:log4net.Core.LoggingEvent.WriteRenderedMessage(System.IO.TextWriter)"/> method
-            to write out the event message.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-        </member>
-        <member name="M:log4net.Layout.Pattern.MessagePatternConverter.Convert(System.IO.TextWriter,log4net.Core.LoggingEvent)">
-            <summary>
-            Writes the event message to the output
-            </summary>
-            <param name="writer"><see cref="T:System.IO.TextWriter"/> that will receive the formatted result.</param>
-            <param name="loggingEvent">the event being logged</param>
-            <remarks>
-            <para>
-            Uses the <see cref="M:log4net.Core.LoggingEvent.WriteRenderedMessage(System.IO.TextWriter)"/> method
-            to write out the event message.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Layout.Pattern.MethodLocationPatternConverter">
-            <summary>
-            Write the method name to the output
-            </summary>
-            <remarks>
-            <para>
-            Writes the caller location <see cref="P:log4net.Core.LocationInfo.MethodName"/> to
-            the output.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-        </member>
-        <member name="M:log4net.Layout.Pattern.MethodLocationPatternConverter.Convert(System.IO.TextWriter,log4net.Core.LoggingEvent)">
-            <summary>
-            Write the method name to the output
-            </summary>
-            <param name="writer"><see cref="T:System.IO.TextWriter"/> that will receive the formatted result.</param>
-            <param name="loggingEvent">the event being logged</param>
-            <remarks>
-            <para>
-            Writes the caller location <see cref="P:log4net.Core.LocationInfo.MethodName"/> to
-            the output.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Layout.Pattern.NdcPatternConverter">
-            <summary>
-            Converter to include event NDC
-            </summary>
-            <remarks>
-            <para>
-            Outputs the value of the event property named <c>NDC</c>.
-            </para>
-            <para>
-            The <see cref="T:log4net.Layout.Pattern.PropertyPatternConverter"/> should be used instead.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-        </member>
-        <member name="M:log4net.Layout.Pattern.NdcPatternConverter.Convert(System.IO.TextWriter,log4net.Core.LoggingEvent)">
-            <summary>
-            Write the event NDC to the output
-            </summary>
-            <param name="writer"><see cref="T:System.IO.TextWriter"/> that will receive the formatted result.</param>
-            <param name="loggingEvent">the event being logged</param>
-            <remarks>
-            <para>
-            As the thread context stacks are now stored in named event properties
-            this converter simply looks up the value of the <c>NDC</c> property.
-            </para>
-            <para>
-            The <see cref="T:log4net.Layout.Pattern.PropertyPatternConverter"/> should be used instead.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Layout.Pattern.PropertyPatternConverter">
-            <summary>
-            Property pattern converter
-            </summary>
-            <remarks>
-            <para>
-            Writes out the value of a named property. The property name
-            should be set in the <see cref="P:log4net.Util.PatternConverter.Option"/>
-            property.
-            </para>
-            <para>
-            If the <see cref="P:log4net.Util.PatternConverter.Option"/> is set to <c>null</c>
-            then all the properties are written as key value pairs.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-        </member>
-        <member name="M:log4net.Layout.Pattern.PropertyPatternConverter.Convert(System.IO.TextWriter,log4net.Core.LoggingEvent)">
-            <summary>
-            Write the property value to the output
-            </summary>
-            <param name="writer"><see cref="T:System.IO.TextWriter"/> that will receive the formatted result.</param>
-            <param name="loggingEvent">the event being logged</param>
-            <remarks>
-            <para>
-            Writes out the value of a named property. The property name
-            should be set in the <see cref="P:log4net.Util.PatternConverter.Option"/>
-            property.
-            </para>
-            <para>
-            If the <see cref="P:log4net.Util.PatternConverter.Option"/> is set to <c>null</c>
-            then all the properties are written as key value pairs.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Layout.Pattern.RelativeTimePatternConverter">
-            <summary>
-            Converter to output the relative time of the event
-            </summary>
-            <remarks>
-            <para>
-            Converter to output the time of the event relative to the start of the program.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-        </member>
-        <member name="M:log4net.Layout.Pattern.RelativeTimePatternConverter.Convert(System.IO.TextWriter,log4net.Core.LoggingEvent)">
-            <summary>
-            Write the relative time to the output
-            </summary>
-            <param name="writer"><see cref="T:System.IO.TextWriter"/> that will receive the formatted result.</param>
-            <param name="loggingEvent">the event being logged</param>
-            <remarks>
-            <para>
-            Writes out the relative time of the event in milliseconds.
-            That is the number of milliseconds between the event <see cref="P:log4net.Core.LoggingEvent.TimeStamp"/>
-            and the <see cref="P:log4net.Core.LoggingEvent.StartTime"/>.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Layout.Pattern.RelativeTimePatternConverter.TimeDifferenceInMillis(System.DateTime,System.DateTime)">
-            <summary>
-            Helper method to get the time difference between two DateTime objects
-            </summary>
-            <param name="start">start time (in the current local time zone)</param>
-            <param name="end">end time (in the current local time zone)</param>
-            <returns>the time difference in milliseconds</returns>
-        </member>
-        <member name="T:log4net.Layout.Pattern.ThreadPatternConverter">
-            <summary>
-            Converter to include event thread name
-            </summary>
-            <remarks>
-            <para>
-            Writes the <see cref="P:log4net.Core.LoggingEvent.ThreadName"/> to the output.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-        </member>
-        <member name="M:log4net.Layout.Pattern.ThreadPatternConverter.Convert(System.IO.TextWriter,log4net.Core.LoggingEvent)">
-            <summary>
-            Write the ThreadName to the output
-            </summary>
-            <param name="writer"><see cref="T:System.IO.TextWriter"/> that will receive the formatted result.</param>
-            <param name="loggingEvent">the event being logged</param>
-            <remarks>
-            <para>
-            Writes the <see cref="P:log4net.Core.LoggingEvent.ThreadName"/> to the <paramref name="writer"/>.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Layout.Pattern.TypeNamePatternConverter">
-            <summary>
-            Pattern converter for the class name
-            </summary>
-            <remarks>
-            <para>
-            Outputs the <see cref="P:log4net.Core.LocationInfo.ClassName"/> of the event.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-        </member>
-        <member name="M:log4net.Layout.Pattern.TypeNamePatternConverter.GetFullyQualifiedName(log4net.Core.LoggingEvent)">
-            <summary>
-            Gets the fully qualified name of the class
-            </summary>
-            <param name="loggingEvent">the event being logged</param>
-            <returns>The fully qualified type name for the caller location</returns>
-            <remarks>
-            <para>
-            Returns the <see cref="P:log4net.Core.LocationInfo.ClassName"/> of the <paramref name="loggingEvent"/>.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Layout.Pattern.UserNamePatternConverter">
-            <summary>
-            Converter to include event user name
-            </summary>
-            <author>Douglas de la Torre</author>
-            <author>Nicko Cadell</author>
-        </member>
-        <member name="M:log4net.Layout.Pattern.UserNamePatternConverter.Convert(System.IO.TextWriter,log4net.Core.LoggingEvent)">
-            <summary>
-            Convert the pattern to the rendered message
-            </summary>
-            <param name="writer"><see cref="T:System.IO.TextWriter"/> that will receive the formatted result.</param>
-            <param name="loggingEvent">the event being logged</param>
-        </member>
-        <member name="T:log4net.Layout.Pattern.UtcDatePatternConverter">
-            <summary>
-            Write the TimeStamp to the output
-            </summary>
-            <remarks>
-            <para>
-            Date pattern converter, uses a <see cref="T:log4net.DateFormatter.IDateFormatter"/> to format 
-            the date of a <see cref="T:log4net.Core.LoggingEvent"/>.
-            </para>
-            <para>
-            Uses a <see cref="T:log4net.DateFormatter.IDateFormatter"/> to format the <see cref="P:log4net.Core.LoggingEvent.TimeStamp"/> 
-            in Universal time.
-            </para>
-            <para>
-            See the <see cref="T:log4net.Layout.Pattern.DatePatternConverter"/> for details on the date pattern syntax.
-            </para>
-            </remarks>
-            <seealso cref="T:log4net.Layout.Pattern.DatePatternConverter"/>
-            <author>Nicko Cadell</author>
-        </member>
-        <member name="M:log4net.Layout.Pattern.UtcDatePatternConverter.Convert(System.IO.TextWriter,log4net.Core.LoggingEvent)">
-            <summary>
-            Write the TimeStamp to the output
-            </summary>
-            <param name="writer"><see cref="T:System.IO.TextWriter"/> that will receive the formatted result.</param>
-            <param name="loggingEvent">the event being logged</param>
-            <remarks>
-            <para>
-            Pass the <see cref="P:log4net.Core.LoggingEvent.TimeStamp"/> to the <see cref="T:log4net.DateFormatter.IDateFormatter"/>
-            for it to render it to the writer.
-            </para>
-            <para>
-            The <see cref="P:log4net.Core.LoggingEvent.TimeStamp"/> passed is in the local time zone, this is converted
-            to Universal time before it is rendered.
-            </para>
-            </remarks>
-            <seealso cref="T:log4net.Layout.Pattern.DatePatternConverter"/>
-        </member>
-        <member name="T:log4net.Layout.ExceptionLayout">
-            <summary>
-            A Layout that renders only the Exception text from the logging event
-            </summary>
-            <remarks>
-            <para>
-            A Layout that renders only the Exception text from the logging event.
-            </para>
-            <para>
-            This Layout should only be used with appenders that utilize multiple
-            layouts (e.g. <see cref="T:log4net.Appender.AdoNetAppender"/>).
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-        </member>
-        <member name="T:log4net.Layout.LayoutSkeleton">
-            <summary>
-            Extend this abstract class to create your own log layout format.
-            </summary>
-            <remarks>
-            <para>
-            This is the base implementation of the <see cref="T:log4net.Layout.ILayout"/>
-            interface. Most layout objects should extend this class.
-            </para>
-            </remarks>
-            <remarks>
-            <note type="inheritinfo">
-            <para>
-            Subclasses must implement the <see cref="M:log4net.Layout.LayoutSkeleton.Format(System.IO.TextWriter,log4net.Core.LoggingEvent)"/>
-            method.
-            </para>
-            <para>
-            Subclasses should set the <see cref="P:log4net.Layout.LayoutSkeleton.IgnoresException"/> in their default
-            constructor.
-            </para>
-            </note>
-            </remarks>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-        </member>
-        <member name="T:log4net.Layout.ILayout">
-            <summary>
-            Interface implemented by layout objects
-            </summary>
-            <remarks>
-            <para>
-            An <see cref="T:log4net.Layout.ILayout"/> object is used to format a <see cref="T:log4net.Core.LoggingEvent"/>
-            as text. The <see cref="M:log4net.Layout.ILayout.Format(System.IO.TextWriter,log4net.Core.LoggingEvent)"/> method is called by an
-            appender to transform the <see cref="T:log4net.Core.LoggingEvent"/> into a string.
-            </para>
-            <para>
-            The layout can also supply <see cref="P:log4net.Layout.ILayout.Header"/> and <see cref="P:log4net.Layout.ILayout.Footer"/>
-            text that is appender before any events and after all the events respectively.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-        </member>
-        <member name="M:log4net.Layout.ILayout.Format(System.IO.TextWriter,log4net.Core.LoggingEvent)">
-            <summary>
-            Implement this method to create your own layout format.
-            </summary>
-            <param name="writer">The TextWriter to write the formatted event to</param>
-            <param name="loggingEvent">The event to format</param>
-            <remarks>
-            <para>
-            This method is called by an appender to format
-            the <paramref name="loggingEvent"/> as text and output to a writer.
-            </para>
-            <para>
-            If the caller does not have a <see cref="T:System.IO.TextWriter"/> and prefers the
-            event to be formatted as a <see cref="T:System.String"/> then the following
-            code can be used to format the event into a <see cref="T:System.IO.StringWriter"/>.
-            </para>
-            <code lang="C#">
-            StringWriter writer = new StringWriter();
-            Layout.Format(writer, loggingEvent);
-            string formattedEvent = writer.ToString();
-            </code>
-            </remarks>
-        </member>
-        <member name="P:log4net.Layout.ILayout.ContentType">
-            <summary>
-            The content type output by this layout. 
-            </summary>
-            <value>The content type</value>
-            <remarks>
-            <para>
-            The content type output by this layout.
-            </para>
-            <para>
-            This is a MIME type e.g. <c>"text/plain"</c>.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Layout.ILayout.Header">
-            <summary>
-            The header for the layout format.
-            </summary>
-            <value>the layout header</value>
-            <remarks>
-            <para>
-            The Header text will be appended before any logging events
-            are formatted and appended.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Layout.ILayout.Footer">
-            <summary>
-            The footer for the layout format.
-            </summary>
-            <value>the layout footer</value>
-            <remarks>
-            <para>
-            The Footer text will be appended after all the logging events
-            have been formatted and appended.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Layout.ILayout.IgnoresException">
-            <summary>
-            Flag indicating if this layout handle exceptions
-            </summary>
-            <value><c>false</c> if this layout handles exceptions</value>
-            <remarks>
-            <para>
-            If this layout handles the exception object contained within
-            <see cref="T:log4net.Core.LoggingEvent"/>, then the layout should return
-            <c>false</c>. Otherwise, if the layout ignores the exception
-            object, then the layout should return <c>true</c>.
-            </para>
-            </remarks>
-        </member>
-        <member name="F:log4net.Layout.LayoutSkeleton.m_header">
-            <summary>
-            The header text
-            </summary>
-            <remarks>
-            <para>
-            See <see cref="P:log4net.Layout.LayoutSkeleton.Header"/> for more information.
-            </para>
-            </remarks>
-        </member>
-        <member name="F:log4net.Layout.LayoutSkeleton.m_footer">
-            <summary>
-            The footer text
-            </summary>
-            <remarks>
-            <para>
-            See <see cref="P:log4net.Layout.LayoutSkeleton.Footer"/> for more information.
-            </para>
-            </remarks>
-        </member>
-        <member name="F:log4net.Layout.LayoutSkeleton.m_ignoresException">
-            <summary>
-            Flag indicating if this layout handles exceptions
-            </summary>
-            <remarks>
-            <para>
-            <c>false</c> if this layout handles exceptions
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Layout.LayoutSkeleton.#ctor">
-            <summary>
-            Empty default constructor
-            </summary>
-            <remarks>
-            <para>
-            Empty default constructor
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Layout.LayoutSkeleton.ActivateOptions">
-            <summary>
-            Activate component options
-            </summary>
-            <remarks>
-            <para>
-            This is part of the <see cref="T:log4net.Core.IOptionHandler"/> delayed object
-            activation scheme. The <see cref="M:log4net.Layout.LayoutSkeleton.ActivateOptions"/> method must 
-            be called on this object after the configuration properties have
-            been set. Until <see cref="M:log4net.Layout.LayoutSkeleton.ActivateOptions"/> is called this
-            object is in an undefined state and must not be used. 
-            </para>
-            <para>
-            If any of the configuration properties are modified then 
-            <see cref="M:log4net.Layout.LayoutSkeleton.ActivateOptions"/> must be called again.
-            </para>
-            <para>
-            This method must be implemented by the subclass.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Layout.LayoutSkeleton.Format(System.IO.TextWriter,log4net.Core.LoggingEvent)">
-            <summary>
-            Implement this method to create your own layout format.
-            </summary>
-            <param name="writer">The TextWriter to write the formatted event to</param>
-            <param name="loggingEvent">The event to format</param>
-            <remarks>
-            <para>
-            This method is called by an appender to format
-            the <paramref name="loggingEvent"/> as text.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Layout.LayoutSkeleton.ContentType">
-            <summary>
-            The content type output by this layout. 
-            </summary>
-            <value>The content type is <c>"text/plain"</c></value>
-            <remarks>
-            <para>
-            The content type output by this layout.
-            </para>
-            <para>
-            This base class uses the value <c>"text/plain"</c>.
-            To change this value a subclass must override this
-            property.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Layout.LayoutSkeleton.Header">
-            <summary>
-            The header for the layout format.
-            </summary>
-            <value>the layout header</value>
-            <remarks>
-            <para>
-            The Header text will be appended before any logging events
-            are formatted and appended.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Layout.LayoutSkeleton.Footer">
-            <summary>
-            The footer for the layout format.
-            </summary>
-            <value>the layout footer</value>
-            <remarks>
-            <para>
-            The Footer text will be appended after all the logging events
-            have been formatted and appended.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Layout.LayoutSkeleton.IgnoresException">
-            <summary>
-            Flag indicating if this layout handles exceptions
-            </summary>
-            <value><c>false</c> if this layout handles exceptions</value>
-            <remarks>
-            <para>
-            If this layout handles the exception object contained within
-            <see cref="T:log4net.Core.LoggingEvent"/>, then the layout should return
-            <c>false</c>. Otherwise, if the layout ignores the exception
-            object, then the layout should return <c>true</c>.
-            </para>
-            <para>
-            Set this value to override a this default setting. The default
-            value is <c>true</c>, this layout does not handle the exception.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Layout.ExceptionLayout.#ctor">
-            <summary>
-            Default constructor
-            </summary>
-            <remarks>
-            <para>
-            Constructs a ExceptionLayout
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Layout.ExceptionLayout.ActivateOptions">
-            <summary>
-            Activate component options
-            </summary>
-            <remarks>
-            <para>
-            Part of the <see cref="T:log4net.Core.IOptionHandler"/> component activation
-            framework.
-            </para>
-            <para>
-            This method does nothing as options become effective immediately.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Layout.ExceptionLayout.Format(System.IO.TextWriter,log4net.Core.LoggingEvent)">
-            <summary>
-            Gets the exception text from the logging event
-            </summary>
-            <param name="writer">The TextWriter to write the formatted event to</param>
-            <param name="loggingEvent">the event being logged</param>
-            <remarks>
-            <para>
-            Write the exception string to the <see cref="T:System.IO.TextWriter"/>.
-            The exception string is retrieved from <see cref="M:log4net.Core.LoggingEvent.GetExceptionString"/>.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Layout.IRawLayout">
-            <summary>
-            Interface for raw layout objects
-            </summary>
-            <remarks>
-            <para>
-            Interface used to format a <see cref="T:log4net.Core.LoggingEvent"/>
-            to an object.
-            </para>
-            <para>
-            This interface should not be confused with the
-            <see cref="T:log4net.Layout.ILayout"/> interface. This interface is used in
-            only certain specialized situations where a raw object is
-            required rather than a formatted string. The <see cref="T:log4net.Layout.ILayout"/>
-            is not generally useful than this interface.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-        </member>
-        <member name="M:log4net.Layout.IRawLayout.Format(log4net.Core.LoggingEvent)">
-            <summary>
-            Implement this method to create your own layout format.
-            </summary>
-            <param name="loggingEvent">The event to format</param>
-            <returns>returns the formatted event</returns>
-            <remarks>
-            <para>
-            Implement this method to create your own layout format.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Layout.Layout2RawLayoutAdapter">
-            <summary>
-            Adapts any <see cref="T:log4net.Layout.ILayout"/> to a <see cref="T:log4net.Layout.IRawLayout"/>
-            </summary>
-            <remarks>
-            <para>
-            Where an <see cref="T:log4net.Layout.IRawLayout"/> is required this adapter
-            allows a <see cref="T:log4net.Layout.ILayout"/> to be specified.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-        </member>
-        <member name="F:log4net.Layout.Layout2RawLayoutAdapter.m_layout">
-            <summary>
-            The layout to adapt
-            </summary>
-        </member>
-        <member name="M:log4net.Layout.Layout2RawLayoutAdapter.#ctor(log4net.Layout.ILayout)">
-            <summary>
-            Construct a new adapter
-            </summary>
-            <param name="layout">the layout to adapt</param>
-            <remarks>
-            <para>
-            Create the adapter for the specified <paramref name="layout"/>.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Layout.Layout2RawLayoutAdapter.Format(log4net.Core.LoggingEvent)">
-            <summary>
-            Format the logging event as an object.
-            </summary>
-            <param name="loggingEvent">The event to format</param>
-            <returns>returns the formatted event</returns>
-            <remarks>
-            <para>
-            Format the logging event as an object.
-            </para>
-            <para>
-            Uses the <see cref="T:log4net.Layout.ILayout"/> object supplied to 
-            the constructor to perform the formatting.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Layout.PatternLayout">
-            <summary>
-            A flexible layout configurable with pattern string.
-            </summary>
-            <remarks>
-            <para>
-            The goal of this class is to <see cref="M:log4net.Layout.PatternLayout.Format(System.IO.TextWriter,log4net.Core.LoggingEvent)"/> a 
-            <see cref="T:log4net.Core.LoggingEvent"/> as a string. The results
-            depend on the <i>conversion pattern</i>.
-            </para>
-            <para>
-            The conversion pattern is closely related to the conversion
-            pattern of the printf function in C. A conversion pattern is
-            composed of literal text and format control expressions called
-            <i>conversion specifiers</i>.
-            </para>
-            <para>
-            <i>You are free to insert any literal text within the conversion
-            pattern.</i>
-            </para>
-            <para>
-            Each conversion specifier starts with a percent sign (%) and is
-            followed by optional <i>format modifiers</i> and a <i>conversion
-            pattern name</i>. The conversion pattern name specifies the type of
-            data, e.g. logger, level, date, thread name. The format
-            modifiers control such things as field width, padding, left and
-            right justification. The following is a simple example.
-            </para>
-            <para>
-            Let the conversion pattern be <b>"%-5level [%thread]: %message%newline"</b> and assume
-            that the log4net environment was set to use a PatternLayout. Then the
-            statements
-            </para>
-            <code lang="C#">
-            ILog log = LogManager.GetLogger(typeof(TestApp));
-            log.Debug("Message 1");
-            log.Warn("Message 2");   
-            </code>
-            <para>would yield the output</para>
-            <code>
-            DEBUG [main]: Message 1
-            WARN  [main]: Message 2  
-            </code>
-            <para>
-            Note that there is no explicit separator between text and
-            conversion specifiers. The pattern parser knows when it has reached
-            the end of a conversion specifier when it reads a conversion
-            character. In the example above the conversion specifier
-            <b>%-5level</b> means the level of the logging event should be left
-            justified to a width of five characters.
-            </para>
-            <para>
-            The recognized conversion pattern names are:
-            </para>
-            <list type="table">
-                <listheader>
-                    <term>Conversion Pattern Name</term>
-                    <description>Effect</description>
-                </listheader>
-                <item>
-                    <term>a</term>
-                    <description>Equivalent to <b>appdomain</b></description>
-                </item>
-                <item>
-                    <term>appdomain</term>
-                    <description>
-            			Used to output the friendly name of the AppDomain where the 
-            			logging event was generated. 
-                    </description>
-                </item>
-                <item>
-                    <term>c</term>
-                    <description>Equivalent to <b>logger</b></description>
-                </item>
-                <item>
-                    <term>C</term>
-                    <description>Equivalent to <b>type</b></description>
-                </item>
-                <item>
-                    <term>class</term>
-                    <description>Equivalent to <b>type</b></description>
-                </item>
-                <item>
-                    <term>d</term>
-                    <description>Equivalent to <b>date</b></description>
-                </item>
-                <item>
-            		<term>date</term> 
-            		<description>
-            			<para>
-            			Used to output the date of the logging event in the local time zone. 
-            			To output the date in universal time use the <c>%utcdate</c> pattern.
-            			The date conversion 
-            			specifier may be followed by a <i>date format specifier</i> enclosed 
-            			between braces. For example, <b>%date{HH:mm:ss,fff}</b> or
-            			<b>%date{dd MMM yyyy HH:mm:ss,fff}</b>.  If no date format specifier is 
-            			given then ISO8601 format is
-            			assumed (<see cref="T:log4net.DateFormatter.Iso8601DateFormatter"/>).
-            			</para>
-            			<para>
-            			The date format specifier admits the same syntax as the
-            			time pattern string of the <see cref="M:System.DateTime.ToString(System.String)"/>.
-            			</para>
-            			<para>
-            			For better results it is recommended to use the log4net date
-            			formatters. These can be specified using one of the strings
-            			"ABSOLUTE", "DATE" and "ISO8601" for specifying 
-            			<see cref="T:log4net.DateFormatter.AbsoluteTimeDateFormatter"/>, 
-            			<see cref="T:log4net.DateFormatter.DateTimeDateFormatter"/> and respectively 
-            			<see cref="T:log4net.DateFormatter.Iso8601DateFormatter"/>. For example, 
-            			<b>%date{ISO8601}</b> or <b>%date{ABSOLUTE}</b>.
-            			</para>
-            			<para>
-            			These dedicated date formatters perform significantly
-            			better than <see cref="M:System.DateTime.ToString(System.String)"/>.
-            			</para>
-            		</description>
-            	</item>
-            	<item>
-            		<term>exception</term>
-            		<description>
-            			<para>
-            			Used to output the exception passed in with the log message.
-            			</para>
-            			<para>
-            			If an exception object is stored in the logging event
-            			it will be rendered into the pattern output with a
-            			trailing newline.
-            			If there is no exception then nothing will be output
-            			and no trailing newline will be appended.
-            			It is typical to put a newline before the exception
-            			and to have the exception as the last data in the pattern.
-            			</para>
-            		</description>
-            	</item>
-                <item>
-                    <term>F</term>
-                    <description>Equivalent to <b>file</b></description>
-                </item>
-            	<item>
-            		<term>file</term>
-            		<description>
-            			<para>
-            			Used to output the file name where the logging request was
-            			issued.
-            			</para>
-            			<para>
-            			<b>WARNING</b> Generating caller location information is
-            			extremely slow. Its use should be avoided unless execution speed
-            			is not an issue.
-            			</para>
-            			<para>
-            			See the note below on the availability of caller location information.
-            			</para>
-            		</description>
-            	</item>
-            	<item>
-            		<term>identity</term>
-            		<description>
-            			<para>
-            			Used to output the user name for the currently active user
-            			(Principal.Identity.Name).
-            			</para>
-            			<para>
-            			<b>WARNING</b> Generating caller information is
-            			extremely slow. Its use should be avoided unless execution speed
-            			is not an issue.
-            			</para>
-            		</description>
-            	</item>
-                <item>
-                    <term>l</term>
-                    <description>Equivalent to <b>location</b></description>
-                </item>
-                <item>
-                    <term>L</term>
-                    <description>Equivalent to <b>line</b></description>
-                </item>
-            	<item>
-            		<term>location</term>
-            		<description>
-            			<para>
-            			Used to output location information of the caller which generated
-            			the logging event.
-            			</para>
-            			<para>
-            			The location information depends on the CLI implementation but
-            			usually consists of the fully qualified name of the calling
-            			method followed by the callers source the file name and line
-            			number between parentheses.
-            			</para>
-            			<para>
-            			The location information can be very useful. However, its
-            			generation is <b>extremely</b> slow. Its use should be avoided
-            			unless execution speed is not an issue.
-            			</para>
-            			<para>
-            			See the note below on the availability of caller location information.
-            			</para>
-            		</description>
-            	</item>
-            	<item>
-            		<term>level</term>
-            		<description>
-            			<para>
-            			Used to output the level of the logging event.
-            			</para>
-            		</description>
-            	</item>
-            	<item>
-            		<term>line</term>
-            		<description>
-            			<para>
-            			Used to output the line number from where the logging request
-            			was issued.
-            			</para>
-            			<para>
-            			<b>WARNING</b> Generating caller location information is
-            			extremely slow. Its use should be avoided unless execution speed
-            			is not an issue.
-            			</para>
-            			<para>
-            			See the note below on the availability of caller location information.
-            			</para>
-            		</description>
-            	</item>
-                <item>
-                    <term>logger</term>
-                    <description>
-                        <para>
-            			Used to output the logger of the logging event. The
-            			logger conversion specifier can be optionally followed by
-            			<i>precision specifier</i>, that is a decimal constant in
-            			brackets.
-                        </para>
-            			<para>
-            			If a precision specifier is given, then only the corresponding
-            			number of right most components of the logger name will be
-            			printed. By default the logger name is printed in full.
-            			</para>
-            			<para>
-            			For example, for the logger name "a.b.c" the pattern
-            			<b>%logger{2}</b> will output "b.c".
-            			</para>
-                    </description>
-                </item>
-                <item>
-                    <term>m</term>
-                    <description>Equivalent to <b>message</b></description>
-                </item>
-                <item>
-                    <term>M</term>
-                    <description>Equivalent to <b>method</b></description>
-                </item>
-            	<item>
-            		<term>message</term>
-            		<description>
-            			<para>
-            			Used to output the application supplied message associated with 
-            			the logging event.
-            			</para>
-            		</description>
-            	</item>
-            	<item>
-            		<term>mdc</term>
-            		<description>
-            			<para>
-            			The MDC (old name for the ThreadContext.Properties) is now part of the
-            			combined event properties. This pattern is supported for compatibility
-            			but is equivalent to <b>property</b>.
-            			</para>
-            		</description>
-            	</item>
-            	<item>
-            		<term>method</term>
-            		<description>
-            			<para>
-            			Used to output the method name where the logging request was
-            			issued.
-            			</para>
-            			<para>
-            			<b>WARNING</b> Generating caller location information is
-            			extremely slow. Its use should be avoided unless execution speed
-            			is not an issue.
-            			</para>
-            			<para>
-            			See the note below on the availability of caller location information.
-            			</para>
-            		</description>
-            	</item>
-                <item>
-                    <term>n</term>
-                    <description>Equivalent to <b>newline</b></description>
-                </item>
-            	<item>
-            		<term>newline</term>
-            		<description>
-            			<para>
-            			Outputs the platform dependent line separator character or
-            			characters.
-            			</para>
-            			<para>
-            			This conversion pattern offers the same performance as using 
-            			non-portable line separator strings such as	"\n", or "\r\n". 
-            			Thus, it is the preferred way of specifying a line separator.
-            			</para> 
-            		</description>
-            	</item>
-            	<item>
-            		<term>ndc</term>
-            		<description>
-            			<para>
-            			Used to output the NDC (nested diagnostic context) associated
-            			with the thread that generated the logging event.
-            			</para>
-            		</description>
-            	</item>
-                <item>
-                    <term>p</term>
-                    <description>Equivalent to <b>level</b></description>
-                </item>
-                <item>
-                    <term>P</term>
-                    <description>Equivalent to <b>property</b></description>
-                </item>
-                <item>
-                    <term>properties</term>
-                    <description>Equivalent to <b>property</b></description>
-                </item>
-            	<item>
-            		<term>property</term>
-            		<description>
-            			<para>
-            			Used to output the an event specific property. The key to 
-            			lookup must be specified within braces and directly following the
-            			pattern specifier, e.g. <b>%property{user}</b> would include the value
-            			from the property that is keyed by the string 'user'. Each property value
-            			that is to be included in the log must be specified separately.
-            			Properties are added to events by loggers or appenders. By default 
-            			the <c>log4net:HostName</c> property is set to the name of machine on 
-            			which the event was originally logged.
-            			</para>
-            			<para>
-            			If no key is specified, e.g. <b>%property</b> then all the keys and their
-            			values are printed in a comma separated list.
-            			</para>
-            			<para>
-            			The properties of an event are combined from a number of different
-            			contexts. These are listed below in the order in which they are searched.
-            			</para>
-            			<list type="definition">
-            				<item>
-            					<term>the event properties</term>
-            					<description>
-            					The event has <see cref="P:log4net.Core.LoggingEvent.Properties"/> that can be set. These 
-            					properties are specific to this event only.
-            					</description>
-            				</item>
-            				<item>
-            					<term>the thread properties</term>
-            					<description>
-            					The <see cref="P:log4net.ThreadContext.Properties"/> that are set on the current
-            					thread. These properties are shared by all events logged on this thread.
-            					</description>
-            				</item>
-            				<item>
-            					<term>the global properties</term>
-            					<description>
-            					The <see cref="P:log4net.GlobalContext.Properties"/> that are set globally. These 
-            					properties are shared by all the threads in the AppDomain.
-            					</description>
-            				</item>
-            			</list>
-            			
-            		</description>
-            	</item>
-                <item>
-                    <term>r</term>
-                    <description>Equivalent to <b>timestamp</b></description>
-                </item>
-                <item>
-                    <term>t</term>
-                    <description>Equivalent to <b>thread</b></description>
-                </item>
-            	<item>
-            		<term>timestamp</term>
-            		<description>
-            			<para>
-            			Used to output the number of milliseconds elapsed since the start
-            			of the application until the creation of the logging event.
-            			</para>
-            		</description>
-            	</item>
-            	<item>
-            		<term>thread</term>
-            		<description>
-            			<para>
-            			Used to output the name of the thread that generated the
-            			logging event. Uses the thread number if no name is available.
-            			</para>
-            		</description>
-            	</item>
-                <item>
-            		<term>type</term> 
-            		<description>
-            			<para>
-            			Used to output the fully qualified type name of the caller
-            			issuing the logging request. This conversion specifier
-            			can be optionally followed by <i>precision specifier</i>, that
-            			is a decimal constant in brackets.
-            			</para>
-            			<para>
-            			If a precision specifier is given, then only the corresponding
-            			number of right most components of the class name will be
-            			printed. By default the class name is output in fully qualified form.
-            			</para>
-            			<para>
-            			For example, for the class name "log4net.Layout.PatternLayout", the
-            			pattern <b>%type{1}</b> will output "PatternLayout".
-            			</para>
-            			<para>
-            			<b>WARNING</b> Generating the caller class information is
-            			slow. Thus, its use should be avoided unless execution speed is
-            			not an issue.
-            			</para>
-            			<para>
-            			See the note below on the availability of caller location information.
-            			</para>
-            		</description>
-                </item>
-                <item>
-                    <term>u</term>
-                    <description>Equivalent to <b>identity</b></description>
-                </item>
-            	<item>
-            		<term>username</term>
-            		<description>
-            			<para>
-            			Used to output the WindowsIdentity for the currently
-            			active user.
-            			</para>
-            			<para>
-            			<b>WARNING</b> Generating caller WindowsIdentity information is
-            			extremely slow. Its use should be avoided unless execution speed
-            			is not an issue.
-            			</para>
-            		</description>
-            	</item>
-                <item>
-            		<term>utcdate</term> 
-            		<description>
-            			<para>
-            			Used to output the date of the logging event in universal time. 
-            			The date conversion 
-            			specifier may be followed by a <i>date format specifier</i> enclosed 
-            			between braces. For example, <b>%utcdate{HH:mm:ss,fff}</b> or
-            			<b>%utcdate{dd MMM yyyy HH:mm:ss,fff}</b>.  If no date format specifier is 
-            			given then ISO8601 format is
-            			assumed (<see cref="T:log4net.DateFormatter.Iso8601DateFormatter"/>).
-            			</para>
-            			<para>
-            			The date format specifier admits the same syntax as the
-            			time pattern string of the <see cref="M:System.DateTime.ToString(System.String)"/>.
-            			</para>
-            			<para>
-            			For better results it is recommended to use the log4net date
-            			formatters. These can be specified using one of the strings
-            			"ABSOLUTE", "DATE" and "ISO8601" for specifying 
-            			<see cref="T:log4net.DateFormatter.AbsoluteTimeDateFormatter"/>, 
-            			<see cref="T:log4net.DateFormatter.DateTimeDateFormatter"/> and respectively 
-            			<see cref="T:log4net.DateFormatter.Iso8601DateFormatter"/>. For example, 
-            			<b>%utcdate{ISO8601}</b> or <b>%utcdate{ABSOLUTE}</b>.
-            			</para>
-            			<para>
-            			These dedicated date formatters perform significantly
-            			better than <see cref="M:System.DateTime.ToString(System.String)"/>.
-            			</para>
-            		</description>
-            	</item>
-                <item>
-                    <term>w</term>
-                    <description>Equivalent to <b>username</b></description>
-                </item>
-                <item>
-                    <term>x</term>
-                    <description>Equivalent to <b>ndc</b></description>
-                </item>
-                <item>
-                    <term>X</term>
-                    <description>Equivalent to <b>mdc</b></description>
-                </item>
-            	<item>
-            		<term>%</term>
-            		<description>
-            			<para>
-            			The sequence %% outputs a single percent sign.
-            			</para>
-            		</description>
-            	</item>
-            </list>
-            <para>
-            The single letter patterns are deprecated in favor of the 
-            longer more descriptive pattern names.
-            </para>
-            <para>
-            By default the relevant information is output as is. However,
-            with the aid of format modifiers it is possible to change the
-            minimum field width, the maximum field width and justification.
-            </para>
-            <para>
-            The optional format modifier is placed between the percent sign
-            and the conversion pattern name.
-            </para>
-            <para>
-            The first optional format modifier is the <i>left justification
-            flag</i> which is just the minus (-) character. Then comes the
-            optional <i>minimum field width</i> modifier. This is a decimal
-            constant that represents the minimum number of characters to
-            output. If the data item requires fewer characters, it is padded on
-            either the left or the right until the minimum width is
-            reached. The default is to pad on the left (right justify) but you
-            can specify right padding with the left justification flag. The
-            padding character is space. If the data item is larger than the
-            minimum field width, the field is expanded to accommodate the
-            data. The value is never truncated.
-            </para>
-            <para>
-            This behavior can be changed using the <i>maximum field
-            width</i> modifier which is designated by a period followed by a
-            decimal constant. If the data item is longer than the maximum
-            field, then the extra characters are removed from the
-            <i>beginning</i> of the data item and not from the end. For
-            example, it the maximum field width is eight and the data item is
-            ten characters long, then the first two characters of the data item
-            are dropped. This behavior deviates from the printf function in C
-            where truncation is done from the end.
-            </para>
-            <para>
-            Below are various format modifier examples for the logger
-            conversion specifier.
-            </para>
-            <div class="tablediv">
-            	<table class="dtTABLE" cellspacing="0">
-            		<tr>
-            			<th>Format modifier</th>
-            			<th>left justify</th>
-            			<th>minimum width</th>
-            			<th>maximum width</th>
-            			<th>comment</th>
-            		</tr>
-            		<tr>
-            			<td align="center">%20logger</td>
-            			<td align="center">false</td>
-            			<td align="center">20</td>
-            			<td align="center">none</td>
-            			<td>
-            				<para>
-            				Left pad with spaces if the logger name is less than 20
-            				characters long.
-            				</para>
-            			</td>
-            		</tr>
-            		<tr>
-            			<td align="center">%-20logger</td>
-            			<td align="center">true</td>
-            			<td align="center">20</td>
-            			<td align="center">none</td>
-            			<td>
-            				<para>
-            				Right pad with spaces if the logger 
-            				name is less than 20 characters long.
-            				</para>
-            			</td>
-            		</tr>
-            		<tr>
-            			<td align="center">%.30logger</td>
-            			<td align="center">NA</td>
-            			<td align="center">none</td>
-            			<td align="center">30</td>
-            			<td>
-            				<para>
-            				Truncate from the beginning if the logger 
-            				name is longer than 30 characters.
-            				</para>
-            			</td>
-            		</tr>
-            		<tr>
-            			<td align="center"><nobr>%20.30logger</nobr></td>
-            			<td align="center">false</td>
-            			<td align="center">20</td>
-            			<td align="center">30</td>
-            			<td>
-            				<para>
-            				Left pad with spaces if the logger name is shorter than 20
-            				characters. However, if logger name is longer than 30 characters,
-            				then truncate from the beginning.
-            				</para>
-            			</td>
-            		</tr>
-            		<tr>
-            			<td align="center">%-20.30logger</td>
-            			<td align="center">true</td>
-            			<td align="center">20</td>
-            			<td align="center">30</td>
-            			<td>
-            				<para>
-            				Right pad with spaces if the logger name is shorter than 20
-            				characters. However, if logger name is longer than 30 characters,
-            				then truncate from the beginning.
-            				</para>
-            			</td>
-            		</tr>
-            	</table>
-            </div>
-            <para>
-            <b>Note about caller location information.</b><br/>
-            The following patterns <c>%type %file %line %method %location %class %C %F %L %l %M</c> 
-            all generate caller location information.
-            Location information uses the <c>System.Diagnostics.StackTrace</c> class to generate
-            a call stack. The caller's information is then extracted from this stack.
-            </para>
-            <note type="caution">
-            <para>
-            The <c>System.Diagnostics.StackTrace</c> class is not supported on the 
-            .NET Compact Framework 1.0 therefore caller location information is not
-            available on that framework.
-            </para>
-            </note>
-            <note type="caution">
-            <para>
-            The <c>System.Diagnostics.StackTrace</c> class has this to say about Release builds:
-            </para>
-            <para>
-            "StackTrace information will be most informative with Debug build configurations. 
-            By default, Debug builds include debug symbols, while Release builds do not. The 
-            debug symbols contain most of the file, method name, line number, and column 
-            information used in constructing StackFrame and StackTrace objects. StackTrace 
-            might not report as many method calls as expected, due to code transformations 
-            that occur during optimization."
-            </para>
-            <para>
-            This means that in a Release build the caller information may be incomplete or may 
-            not exist at all! Therefore caller location information cannot be relied upon in a Release build.
-            </para>
-            </note>
-            <para>
-            Additional pattern converters may be registered with a specific <see cref="T:log4net.Layout.PatternLayout"/>
-            instance using the <see cref="M:log4net.Layout.PatternLayout.AddConverter(System.String,System.Type)"/> method.
-            </para>
-            </remarks>
-            <example>
-            This is a more detailed pattern.
-            <code><b>%timestamp [%thread] %level %logger %ndc - %message%newline</b></code>
-            </example>
-            <example>
-            A similar pattern except that the relative time is
-            right padded if less than 6 digits, thread name is right padded if
-            less than 15 characters and truncated if longer and the logger
-            name is left padded if shorter than 30 characters and truncated if
-            longer.
-            <code><b>%-6timestamp [%15.15thread] %-5level %30.30logger %ndc - %message%newline</b></code>
-            </example>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-            <author>Douglas de la Torre</author>
-            <author>Daniel Cazzulino</author>
-        </member>
-        <member name="F:log4net.Layout.PatternLayout.DefaultConversionPattern">
-            <summary>
-            Default pattern string for log output. 
-            </summary>
-            <remarks>
-            <para>
-            Default pattern string for log output. 
-            Currently set to the string <b>"%message%newline"</b> 
-            which just prints the application supplied message. 
-            </para>
-            </remarks>
-        </member>
-        <member name="F:log4net.Layout.PatternLayout.DetailConversionPattern">
-            <summary>
-            A detailed conversion pattern
-            </summary>
-            <remarks>
-            <para>
-            A conversion pattern which includes Time, Thread, Logger, and Nested Context.
-            Current value is <b>%timestamp [%thread] %level %logger %ndc - %message%newline</b>.
-            </para>
-            </remarks>
-        </member>
-        <member name="F:log4net.Layout.PatternLayout.s_globalRulesRegistry">
-            <summary>
-            Internal map of converter identifiers to converter types.
-            </summary>
-            <remarks>
-            <para>
-            This static map is overridden by the m_converterRegistry instance map
-            </para>
-            </remarks>
-        </member>
-        <member name="F:log4net.Layout.PatternLayout.m_pattern">
-            <summary>
-            the pattern
-            </summary>
-        </member>
-        <member name="F:log4net.Layout.PatternLayout.m_head">
-            <summary>
-            the head of the pattern converter chain
-            </summary>
-        </member>
-        <member name="F:log4net.Layout.PatternLayout.m_instanceRulesRegistry">
-            <summary>
-            patterns defined on this PatternLayout only
-            </summary>
-        </member>
-        <member name="M:log4net.Layout.PatternLayout.#cctor">
-            <summary>
-            Initialize the global registry
-            </summary>
-            <remarks>
-            <para>
-            Defines the builtin global rules.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Layout.PatternLayout.#ctor">
-            <summary>
-            Constructs a PatternLayout using the DefaultConversionPattern
-            </summary>
-            <remarks>
-            <para>
-            The default pattern just produces the application supplied message.
-            </para>
-            <para>
-            Note to Inheritors: This constructor calls the virtual method
-            <see cref="M:log4net.Layout.PatternLayout.CreatePatternParser(System.String)"/>. If you override this method be
-            aware that it will be called before your is called constructor.
-            </para>
-            <para>
-            As per the <see cref="T:log4net.Core.IOptionHandler"/> contract the <see cref="M:log4net.Layout.PatternLayout.ActivateOptions"/>
-            method must be called after the properties on this object have been
-            configured.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Layout.PatternLayout.#ctor(System.String)">
-            <summary>
-            Constructs a PatternLayout using the supplied conversion pattern
-            </summary>
-            <param name="pattern">the pattern to use</param>
-            <remarks>
-            <para>
-            Note to Inheritors: This constructor calls the virtual method
-            <see cref="M:log4net.Layout.PatternLayout.CreatePatternParser(System.String)"/>. If you override this method be
-            aware that it will be called before your is called constructor.
-            </para>
-            <para>
-            When using this constructor the <see cref="M:log4net.Layout.PatternLayout.ActivateOptions"/> method 
-            need not be called. This may not be the case when using a subclass.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Layout.PatternLayout.CreatePatternParser(System.String)">
-            <summary>
-            Create the pattern parser instance
-            </summary>
-            <param name="pattern">the pattern to parse</param>
-            <returns>The <see cref="T:log4net.Util.PatternParser"/> that will format the event</returns>
-            <remarks>
-            <para>
-            Creates the <see cref="T:log4net.Util.PatternParser"/> used to parse the conversion string. Sets the
-            global and instance rules on the <see cref="T:log4net.Util.PatternParser"/>.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Layout.PatternLayout.ActivateOptions">
-            <summary>
-            Initialize layout options
-            </summary>
-            <remarks>
-            <para>
-            This is part of the <see cref="T:log4net.Core.IOptionHandler"/> delayed object
-            activation scheme. The <see cref="M:log4net.Layout.PatternLayout.ActivateOptions"/> method must 
-            be called on this object after the configuration properties have
-            been set. Until <see cref="M:log4net.Layout.PatternLayout.ActivateOptions"/> is called this
-            object is in an undefined state and must not be used. 
-            </para>
-            <para>
-            If any of the configuration properties are modified then 
-            <see cref="M:log4net.Layout.PatternLayout.ActivateOptions"/> must be called again.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Layout.PatternLayout.Format(System.IO.TextWriter,log4net.Core.LoggingEvent)">
-            <summary>
-            Produces a formatted string as specified by the conversion pattern.
-            </summary>
-            <param name="loggingEvent">the event being logged</param>
-            <param name="writer">The TextWriter to write the formatted event to</param>
-            <remarks>
-            <para>
-            Parse the <see cref="T:log4net.Core.LoggingEvent"/> using the patter format
-            specified in the <see cref="P:log4net.Layout.PatternLayout.ConversionPattern"/> property.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Layout.PatternLayout.AddConverter(log4net.Layout.PatternLayout.ConverterInfo)">
-            <summary>
-            Add a converter to this PatternLayout
-            </summary>
-            <param name="converterInfo">the converter info</param>
-            <remarks>
-            <para>
-            This version of the method is used by the configurator.
-            Programmatic users should use the alternative <see cref="M:log4net.Layout.PatternLayout.AddConverter(System.String,System.Type)"/> method.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Layout.PatternLayout.AddConverter(System.String,System.Type)">
-            <summary>
-            Add a converter to this PatternLayout
-            </summary>
-            <param name="name">the name of the conversion pattern for this converter</param>
-            <param name="type">the type of the converter</param>
-            <remarks>
-            <para>
-            Add a named pattern converter to this instance. This
-            converter will be used in the formatting of the event.
-            This method must be called before <see cref="M:log4net.Layout.PatternLayout.ActivateOptions"/>.
-            </para>
-            <para>
-            The <paramref name="type"/> specified must extend the 
-            <see cref="T:log4net.Util.PatternConverter"/> type.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Layout.PatternLayout.ConversionPattern">
-            <summary>
-            The pattern formatting string
-            </summary>
-            <remarks>
-            <para>
-            The <b>ConversionPattern</b> option. This is the string which
-            controls formatting and consists of a mix of literal content and
-            conversion specifiers.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Layout.PatternLayout.ConverterInfo">
-            <summary>
-            Wrapper class used to map converter names to converter types
-            </summary>
-            <remarks>
-            <para>
-            Pattern converter info class used during configuration to
-            pass to the <see cref="M:log4net.Layout.PatternLayout.AddConverter(log4net.Layout.PatternLayout.ConverterInfo)"/>
-            method.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Layout.PatternLayout.ConverterInfo.#ctor">
-            <summary>
-            default constructor
-            </summary>
-        </member>
-        <member name="P:log4net.Layout.PatternLayout.ConverterInfo.Name">
-            <summary>
-            Gets or sets the name of the conversion pattern
-            </summary>
-            <remarks>
-            <para>
-            The name of the pattern in the format string
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Layout.PatternLayout.ConverterInfo.Type">
-            <summary>
-            Gets or sets the type of the converter
-            </summary>
-            <remarks>
-            <para>
-            The value specified must extend the 
-            <see cref="T:log4net.Util.PatternConverter"/> type.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Layout.RawLayoutConverter">
-            <summary>
-            Type converter for the <see cref="T:log4net.Layout.IRawLayout"/> interface
-            </summary>
-            <remarks>
-            <para>
-            Used to convert objects to the <see cref="T:log4net.Layout.IRawLayout"/> interface.
-            Supports converting from the <see cref="T:log4net.Layout.ILayout"/> interface to
-            the <see cref="T:log4net.Layout.IRawLayout"/> interface using the <see cref="T:log4net.Layout.Layout2RawLayoutAdapter"/>.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-        </member>
-        <member name="T:log4net.Util.TypeConverters.IConvertFrom">
-            <summary>
-            Interface supported by type converters
-            </summary>
-            <remarks>
-            <para>
-            This interface supports conversion from arbitrary types
-            to a single target type. See <see cref="T:log4net.Util.TypeConverters.TypeConverterAttribute"/>.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-        </member>
-        <member name="M:log4net.Util.TypeConverters.IConvertFrom.CanConvertFrom(System.Type)">
-            <summary>
-            Can the source type be converted to the type supported by this object
-            </summary>
-            <param name="sourceType">the type to convert</param>
-            <returns>true if the conversion is possible</returns>
-            <remarks>
-            <para>
-            Test if the <paramref name="sourceType"/> can be converted to the
-            type supported by this converter.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.TypeConverters.IConvertFrom.ConvertFrom(System.Object)">
-            <summary>
-            Convert the source object to the type supported by this object
-            </summary>
-            <param name="source">the object to convert</param>
-            <returns>the converted object</returns>
-            <remarks>
-            <para>
-            Converts the <paramref name="source"/> to the type supported
-            by this converter.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Layout.RawLayoutConverter.CanConvertFrom(System.Type)">
-            <summary>
-            Can the sourceType be converted to an <see cref="T:log4net.Layout.IRawLayout"/>
-            </summary>
-            <param name="sourceType">the source to be to be converted</param>
-            <returns><c>true</c> if the source type can be converted to <see cref="T:log4net.Layout.IRawLayout"/></returns>
-            <remarks>
-            <para>
-            Test if the <paramref name="sourceType"/> can be converted to a
-            <see cref="T:log4net.Layout.IRawLayout"/>. Only <see cref="T:log4net.Layout.ILayout"/> is supported
-            as the <paramref name="sourceType"/>.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Layout.RawLayoutConverter.ConvertFrom(System.Object)">
-            <summary>
-            Convert the value to a <see cref="T:log4net.Layout.IRawLayout"/> object
-            </summary>
-            <param name="source">the value to convert</param>
-            <returns>the <see cref="T:log4net.Layout.IRawLayout"/> object</returns>
-            <remarks>
-            <para>
-            Convert the <paramref name="source"/> object to a 
-            <see cref="T:log4net.Layout.IRawLayout"/> object. If the <paramref name="source"/> object
-            is a <see cref="T:log4net.Layout.ILayout"/> then the <see cref="T:log4net.Layout.Layout2RawLayoutAdapter"/>
-            is used to adapt between the two interfaces, otherwise an
-            exception is thrown.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Layout.RawPropertyLayout">
-            <summary>
-            Extract the value of a property from the <see cref="T:log4net.Core.LoggingEvent"/>
-            </summary>
-            <remarks>
-            <para>
-            Extract the value of a property from the <see cref="T:log4net.Core.LoggingEvent"/>
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-        </member>
-        <member name="M:log4net.Layout.RawPropertyLayout.#ctor">
-            <summary>
-            Constructs a RawPropertyLayout
-            </summary>
-        </member>
-        <member name="M:log4net.Layout.RawPropertyLayout.Format(log4net.Core.LoggingEvent)">
-            <summary>
-            Lookup the property for <see cref="P:log4net.Layout.RawPropertyLayout.Key"/>
-            </summary>
-            <param name="loggingEvent">The event to format</param>
-            <returns>returns property value</returns>
-            <remarks>
-            <para>
-            Looks up and returns the object value of the property
-            named <see cref="P:log4net.Layout.RawPropertyLayout.Key"/>. If there is no property defined
-            with than name then <c>null</c> will be returned.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Layout.RawPropertyLayout.Key">
-            <summary>
-            The name of the value to lookup in the LoggingEvent Properties collection.
-            </summary>
-            <value>
-            Value to lookup in the LoggingEvent Properties collection
-            </value>
-            <remarks>
-            <para>
-            String name of the property to lookup in the <see cref="T:log4net.Core.LoggingEvent"/>.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Layout.RawTimeStampLayout">
-            <summary>
-            Extract the date from the <see cref="T:log4net.Core.LoggingEvent"/>
-            </summary>
-            <remarks>
-            <para>
-            Extract the date from the <see cref="T:log4net.Core.LoggingEvent"/>
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-        </member>
-        <member name="M:log4net.Layout.RawTimeStampLayout.#ctor">
-            <summary>
-            Constructs a RawTimeStampLayout
-            </summary>
-        </member>
-        <member name="M:log4net.Layout.RawTimeStampLayout.Format(log4net.Core.LoggingEvent)">
-            <summary>
-            Gets the <see cref="P:log4net.Core.LoggingEvent.TimeStamp"/> as a <see cref="T:System.DateTime"/>.
-            </summary>
-            <param name="loggingEvent">The event to format</param>
-            <returns>returns the time stamp</returns>
-            <remarks>
-            <para>
-            Gets the <see cref="P:log4net.Core.LoggingEvent.TimeStamp"/> as a <see cref="T:System.DateTime"/>.
-            </para>
-            <para>
-            The time stamp is in local time. To format the time stamp
-            in universal time use <see cref="T:log4net.Layout.RawUtcTimeStampLayout"/>.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Layout.RawUtcTimeStampLayout">
-            <summary>
-            Extract the date from the <see cref="T:log4net.Core.LoggingEvent"/>
-            </summary>
-            <remarks>
-            <para>
-            Extract the date from the <see cref="T:log4net.Core.LoggingEvent"/>
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-        </member>
-        <member name="M:log4net.Layout.RawUtcTimeStampLayout.#ctor">
-            <summary>
-            Constructs a RawUtcTimeStampLayout
-            </summary>
-        </member>
-        <member name="M:log4net.Layout.RawUtcTimeStampLayout.Format(log4net.Core.LoggingEvent)">
-            <summary>
-            Gets the <see cref="P:log4net.Core.LoggingEvent.TimeStamp"/> as a <see cref="T:System.DateTime"/>.
-            </summary>
-            <param name="loggingEvent">The event to format</param>
-            <returns>returns the time stamp</returns>
-            <remarks>
-            <para>
-            Gets the <see cref="P:log4net.Core.LoggingEvent.TimeStamp"/> as a <see cref="T:System.DateTime"/>.
-            </para>
-            <para>
-            The time stamp is in universal time. To format the time stamp
-            in local time use <see cref="T:log4net.Layout.RawTimeStampLayout"/>.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Layout.SimpleLayout">
-            <summary>
-            A very simple layout
-            </summary>
-            <remarks>
-            <para>
-            SimpleLayout consists of the level of the log statement,
-            followed by " - " and then the log message itself. For example,
-            <code>
-            DEBUG - Hello world
-            </code>
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-        </member>
-        <member name="M:log4net.Layout.SimpleLayout.#ctor">
-            <summary>
-            Constructs a SimpleLayout
-            </summary>
-        </member>
-        <member name="M:log4net.Layout.SimpleLayout.ActivateOptions">
-            <summary>
-            Initialize layout options
-            </summary>
-            <remarks>
-            <para>
-            This is part of the <see cref="T:log4net.Core.IOptionHandler"/> delayed object
-            activation scheme. The <see cref="M:log4net.Layout.SimpleLayout.ActivateOptions"/> method must 
-            be called on this object after the configuration properties have
-            been set. Until <see cref="M:log4net.Layout.SimpleLayout.ActivateOptions"/> is called this
-            object is in an undefined state and must not be used. 
-            </para>
-            <para>
-            If any of the configuration properties are modified then 
-            <see cref="M:log4net.Layout.SimpleLayout.ActivateOptions"/> must be called again.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Layout.SimpleLayout.Format(System.IO.TextWriter,log4net.Core.LoggingEvent)">
-            <summary>
-            Produces a simple formatted output.
-            </summary>
-            <param name="loggingEvent">the event being logged</param>
-            <param name="writer">The TextWriter to write the formatted event to</param>
-            <remarks>
-            <para>
-            Formats the event as the level of the even,
-            followed by " - " and then the log message itself. The
-            output is terminated by a newline.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Layout.XmlLayout">
-            <summary>
-            Layout that formats the log events as XML elements.
-            </summary>
-            <remarks>
-            <para>
-            The output of the <see cref="T:log4net.Layout.XmlLayout"/> consists of a series of 
-            log4net:event elements. It does not output a complete well-formed XML 
-            file. The output is designed to be included as an <em>external entity</em>
-            in a separate file to form a correct XML file.
-            </para>
-            <para>
-            For example, if <c>abc</c> is the name of the file where
-            the <see cref="T:log4net.Layout.XmlLayout"/> output goes, then a well-formed XML file would 
-            be:
-            </para>
-            <code lang="XML">
-            &lt;?xml version="1.0" ?&gt;
-            
-            &lt;!DOCTYPE log4net:events SYSTEM "log4net-events.dtd" [&lt;!ENTITY data SYSTEM "abc"&gt;]&gt;
-            
-            &lt;log4net:events version="1.2" xmlns:log4net="http://logging.apache.org/log4net/schemas/log4net-events-1.2&gt;
-                &amp;data;
-            &lt;/log4net:events&gt;
-            </code>
-            <para>
-            This approach enforces the independence of the <see cref="T:log4net.Layout.XmlLayout"/> 
-            and the appender where it is embedded.
-            </para>
-            <para>
-            The <c>version</c> attribute helps components to correctly
-            interpret output generated by <see cref="T:log4net.Layout.XmlLayout"/>. The value of 
-            this attribute should be "1.2" for release 1.2 and later.
-            </para>
-            <para>
-            Alternatively the <c>Header</c> and <c>Footer</c> properties can be
-            configured to output the correct XML header, open tag and close tag.
-            When setting the <c>Header</c> and <c>Footer</c> properties it is essential
-            that the underlying data store not be appendable otherwise the data
-            will become invalid XML.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-        </member>
-        <member name="T:log4net.Layout.XmlLayoutBase">
-            <summary>
-            Layout that formats the log events as XML elements.
-            </summary>
-            <remarks>
-            <para>
-            This is an abstract class that must be subclassed by an implementation 
-            to conform to a specific schema.
-            </para>
-            <para>
-            Deriving classes must implement the <see cref="M:log4net.Layout.XmlLayoutBase.FormatXml(System.Xml.XmlWriter,log4net.Core.LoggingEvent)"/> method.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-        </member>
-        <member name="M:log4net.Layout.XmlLayoutBase.#ctor">
-            <summary>
-            Protected constructor to support subclasses
-            </summary>
-            <remarks>
-            <para>
-            Initializes a new instance of the <see cref="T:log4net.Layout.XmlLayoutBase"/> class
-            with no location info.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Layout.XmlLayoutBase.#ctor(System.Boolean)">
-            <summary>
-            Protected constructor to support subclasses
-            </summary>
-            <remarks>
-            <para>
-            The <paramref name="locationInfo" /> parameter determines whether 
-            location information will be output by the layout. If 
-            <paramref name="locationInfo" /> is set to <c>true</c>, then the 
-            file name and line number of the statement at the origin of the log 
-            statement will be output. 
-            </para>
-            <para>
-            If you are embedding this layout within an SMTPAppender
-            then make sure to set the <b>LocationInfo</b> option of that 
-            appender as well.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Layout.XmlLayoutBase.ActivateOptions">
-            <summary>
-            Initialize layout options
-            </summary>
-            <remarks>
-            <para>
-            This is part of the <see cref="T:log4net.Core.IOptionHandler"/> delayed object
-            activation scheme. The <see cref="M:log4net.Layout.XmlLayoutBase.ActivateOptions"/> method must 
-            be called on this object after the configuration properties have
-            been set. Until <see cref="M:log4net.Layout.XmlLayoutBase.ActivateOptions"/> is called this
-            object is in an undefined state and must not be used. 
-            </para>
-            <para>
-            If any of the configuration properties are modified then 
-            <see cref="M:log4net.Layout.XmlLayoutBase.ActivateOptions"/> must be called again.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Layout.XmlLayoutBase.Format(System.IO.TextWriter,log4net.Core.LoggingEvent)">
-            <summary>
-            Produces a formatted string.
-            </summary>
-            <param name="loggingEvent">The event being logged.</param>
-            <param name="writer">The TextWriter to write the formatted event to</param>
-            <remarks>
-            <para>
-            Format the <see cref="T:log4net.Core.LoggingEvent"/> and write it to the <see cref="T:System.IO.TextWriter"/>.
-            </para>
-            <para>
-            This method creates an <see cref="T:System.Xml.XmlTextWriter"/> that writes to the
-            <paramref name="writer"/>. The <see cref="T:System.Xml.XmlTextWriter"/> is passed 
-            to the <see cref="M:log4net.Layout.XmlLayoutBase.FormatXml(System.Xml.XmlWriter,log4net.Core.LoggingEvent)"/> method. Subclasses should override the
-            <see cref="M:log4net.Layout.XmlLayoutBase.FormatXml(System.Xml.XmlWriter,log4net.Core.LoggingEvent)"/> method rather than this method.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Layout.XmlLayoutBase.FormatXml(System.Xml.XmlWriter,log4net.Core.LoggingEvent)">
-            <summary>
-            Does the actual writing of the XML.
-            </summary>
-            <param name="writer">The writer to use to output the event to.</param>
-            <param name="loggingEvent">The event to write.</param>
-            <remarks>
-            <para>
-            Subclasses should override this method to format
-            the <see cref="T:log4net.Core.LoggingEvent"/> as XML.
-            </para>
-            </remarks>
-        </member>
-        <member name="F:log4net.Layout.XmlLayoutBase.m_locationInfo">
-            <summary>
-            Flag to indicate if location information should be included in
-            the XML events.
-            </summary>
-        </member>
-        <member name="F:log4net.Layout.XmlLayoutBase.m_protectCloseTextWriter">
-            <summary>
-            Writer adapter that ignores Close
-            </summary>
-        </member>
-        <member name="F:log4net.Layout.XmlLayoutBase.m_invalidCharReplacement">
-            <summary>
-            The string to replace invalid chars with
-            </summary>
-        </member>
-        <member name="P:log4net.Layout.XmlLayoutBase.LocationInfo">
-            <summary>
-            Gets a value indicating whether to include location information in 
-            the XML events.
-            </summary>
-            <value>
-            <c>true</c> if location information should be included in the XML 
-            events; otherwise, <c>false</c>.
-            </value>
-            <remarks>
-            <para>
-            If <see cref="P:log4net.Layout.XmlLayoutBase.LocationInfo"/> is set to <c>true</c>, then the file 
-            name and line number of the statement at the origin of the log 
-            statement will be output. 
-            </para>
-            <para>
-            If you are embedding this layout within an <c>SMTPAppender</c>
-            then make sure to set the <b>LocationInfo</b> option of that 
-            appender as well.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Layout.XmlLayoutBase.InvalidCharReplacement">
-            <summary>
-            The string to replace characters that can not be expressed in XML with.
-            <remarks>
-            <para>
-            Not all characters may be expressed in XML. This property contains the
-            string to replace those that can not with. This defaults to a ?. Set it
-            to the empty string to simply remove offending characters. For more
-            details on the allowed character ranges see http://www.w3.org/TR/REC-xml/#charsets
-            Character replacement will occur in  the log message, the property names 
-            and the property values.
-            </para>
-            </remarks>
-            </summary>
-        </member>
-        <member name="P:log4net.Layout.XmlLayoutBase.ContentType">
-            <summary>
-            Gets the content type output by this layout. 
-            </summary>
-            <value>
-            As this is the XML layout, the value is always <c>"text/xml"</c>.
-            </value>
-            <remarks>
-            <para>
-            As this is the XML layout, the value is always <c>"text/xml"</c>.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Layout.XmlLayout.#ctor">
-            <summary>
-            Constructs an XmlLayout
-            </summary>
-        </member>
-        <member name="M:log4net.Layout.XmlLayout.#ctor(System.Boolean)">
-            <summary>
-            Constructs an XmlLayout.
-            </summary>
-            <remarks>
-            <para>
-            The <b>LocationInfo</b> option takes a boolean value. By
-            default, it is set to false which means there will be no location
-            information output by this layout. If the the option is set to
-            true, then the file name and line number of the statement
-            at the origin of the log statement will be output. 
-            </para>
-            <para>
-            If you are embedding this layout within an SmtpAppender
-            then make sure to set the <b>LocationInfo</b> option of that 
-            appender as well.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Layout.XmlLayout.ActivateOptions">
-            <summary>
-            Initialize layout options
-            </summary>
-            <remarks>
-            <para>
-            This is part of the <see cref="T:log4net.Core.IOptionHandler"/> delayed object
-            activation scheme. The <see cref="M:log4net.Layout.XmlLayout.ActivateOptions"/> method must 
-            be called on this object after the configuration properties have
-            been set. Until <see cref="M:log4net.Layout.XmlLayout.ActivateOptions"/> is called this
-            object is in an undefined state and must not be used. 
-            </para>
-            <para>
-            If any of the configuration properties are modified then 
-            <see cref="M:log4net.Layout.XmlLayout.ActivateOptions"/> must be called again.
-            </para>
-            <para>
-            Builds a cache of the element names
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Layout.XmlLayout.FormatXml(System.Xml.XmlWriter,log4net.Core.LoggingEvent)">
-            <summary>
-            Does the actual writing of the XML.
-            </summary>
-            <param name="writer">The writer to use to output the event to.</param>
-            <param name="loggingEvent">The event to write.</param>
-            <remarks>
-            <para>
-            Override the base class <see cref="M:log4net.Layout.XmlLayoutBase.FormatXml(System.Xml.XmlWriter,log4net.Core.LoggingEvent)"/> method
-            to write the <see cref="T:log4net.Core.LoggingEvent"/> to the <see cref="T:System.Xml.XmlWriter"/>.
-            </para>
-            </remarks>
-        </member>
-        <member name="F:log4net.Layout.XmlLayout.m_prefix">
-            <summary>
-            The prefix to use for all generated element names
-            </summary>
-        </member>
-        <member name="P:log4net.Layout.XmlLayout.Prefix">
-            <summary>
-            The prefix to use for all element names
-            </summary>
-            <remarks>
-            <para>
-            The default prefix is <b>log4net</b>. Set this property
-            to change the prefix. If the prefix is set to an empty string
-            then no prefix will be written.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Layout.XmlLayout.Base64EncodeMessage">
-            <summary>
-            Set whether or not to base64 encode the message.
-            </summary>
-            <remarks>
-            <para>
-            By default the log message will be written as text to the xml
-            output. This can cause problems when the message contains binary
-            data. By setting this to true the contents of the message will be
-            base64 encoded. If this is set then invalid character replacement
-            (see <see cref="P:log4net.Layout.XmlLayoutBase.InvalidCharReplacement"/>) will not be performed
-            on the log message.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Layout.XmlLayout.Base64EncodeProperties">
-            <summary>
-            Set whether or not to base64 encode the property values.
-            </summary>
-            <remarks>
-            <para>
-            By default the properties will be written as text to the xml
-            output. This can cause problems when one or more properties contain
-            binary data. By setting this to true the values of the properties
-            will be base64 encoded. If this is set then invalid character replacement
-            (see <see cref="P:log4net.Layout.XmlLayoutBase.InvalidCharReplacement"/>) will not be performed
-            on the property values.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Layout.XmlLayoutSchemaLog4j">
-            <summary>
-            Layout that formats the log events as XML elements compatible with the log4j schema
-            </summary>
-            <remarks>
-            <para>
-            Formats the log events according to the http://logging.apache.org/log4j schema.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-        </member>
-        <member name="F:log4net.Layout.XmlLayoutSchemaLog4j.s_date1970">
-            <summary>
-            The 1st of January 1970 in UTC
-            </summary>
-        </member>
-        <member name="M:log4net.Layout.XmlLayoutSchemaLog4j.#ctor">
-            <summary>
-            Constructs an XMLLayoutSchemaLog4j
-            </summary>
-        </member>
-        <member name="M:log4net.Layout.XmlLayoutSchemaLog4j.#ctor(System.Boolean)">
-            <summary>
-            Constructs an XMLLayoutSchemaLog4j.
-            </summary>
-            <remarks>
-            <para>
-            The <b>LocationInfo</b> option takes a boolean value. By
-            default, it is set to false which means there will be no location
-            information output by this layout. If the the option is set to
-            true, then the file name and line number of the statement
-            at the origin of the log statement will be output. 
-            </para>
-            <para>
-            If you are embedding this layout within an SMTPAppender
-            then make sure to set the <b>LocationInfo</b> option of that 
-            appender as well.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Layout.XmlLayoutSchemaLog4j.FormatXml(System.Xml.XmlWriter,log4net.Core.LoggingEvent)">
-            <summary>
-            Actually do the writing of the xml
-            </summary>
-            <param name="writer">the writer to use</param>
-            <param name="loggingEvent">the event to write</param>
-            <remarks>
-            <para>
-            Generate XML that is compatible with the log4j schema.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Layout.XmlLayoutSchemaLog4j.Version">
-            <summary>
-            The version of the log4j schema to use.
-            </summary>
-            <remarks>
-            <para>
-            Only version 1.2 of the log4j schema is supported.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.ObjectRenderer.DefaultRenderer">
-            <summary>
-            The default object Renderer.
-            </summary>
-            <remarks>
-            <para>
-            The default renderer supports rendering objects and collections to strings.
-            </para>
-            <para>
-            See the <see cref="M:log4net.ObjectRenderer.DefaultRenderer.RenderObject(log4net.ObjectRenderer.RendererMap,System.Object,System.IO.TextWriter)"/> method for details of the output.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-        </member>
-        <member name="T:log4net.ObjectRenderer.IObjectRenderer">
-            <summary>
-            Implement this interface in order to render objects as strings
-            </summary>
-            <remarks>
-            <para>
-            Certain types require special case conversion to
-            string form. This conversion is done by an object renderer.
-            Object renderers implement the <see cref="T:log4net.ObjectRenderer.IObjectRenderer"/>
-            interface.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-        </member>
-        <member name="M:log4net.ObjectRenderer.IObjectRenderer.RenderObject(log4net.ObjectRenderer.RendererMap,System.Object,System.IO.TextWriter)">
-            <summary>
-            Render the object <paramref name="obj"/> to a string
-            </summary>
-            <param name="rendererMap">The map used to lookup renderers</param>
-            <param name="obj">The object to render</param>
-            <param name="writer">The writer to render to</param>
-            <remarks>
-            <para>
-            Render the object <paramref name="obj"/> to a 
-            string.
-            </para>
-            <para>
-            The <paramref name="rendererMap"/> parameter is
-            provided to lookup and render other objects. This is
-            very useful where <paramref name="obj"/> contains
-            nested objects of unknown type. The <see cref="M:log4net.ObjectRenderer.RendererMap.FindAndRender(System.Object,System.IO.TextWriter)"/>
-            method can be used to render these objects.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.ObjectRenderer.DefaultRenderer.#ctor">
-            <summary>
-            Default constructor
-            </summary>
-            <remarks>
-            <para>
-            Default constructor
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.ObjectRenderer.DefaultRenderer.RenderObject(log4net.ObjectRenderer.RendererMap,System.Object,System.IO.TextWriter)">
-            <summary>
-            Render the object <paramref name="obj"/> to a string
-            </summary>
-            <param name="rendererMap">The map used to lookup renderers</param>
-            <param name="obj">The object to render</param>
-            <param name="writer">The writer to render to</param>
-            <remarks>
-            <para>
-            Render the object <paramref name="obj"/> to a string.
-            </para>
-            <para>
-            The <paramref name="rendererMap"/> parameter is
-            provided to lookup and render other objects. This is
-            very useful where <paramref name="obj"/> contains
-            nested objects of unknown type. The <see cref="M:log4net.ObjectRenderer.RendererMap.FindAndRender(System.Object)"/>
-            method can be used to render these objects.
-            </para>
-            <para>
-            The default renderer supports rendering objects to strings as follows:
-            </para>
-            <list type="table">
-            	<listheader>
-            		<term>Value</term>
-            		<description>Rendered String</description>
-            	</listheader>
-            	<item>
-            		<term><c>null</c></term>
-            		<description>
-            		<para>"(null)"</para>
-            		</description>
-            	</item>
-            	<item>
-            		<term><see cref="T:System.Array"/></term>
-            		<description>
-            		<para>
-            		For a one dimensional array this is the
-            		array type name, an open brace, followed by a comma
-            		separated list of the elements (using the appropriate
-            		renderer), followed by a close brace. 
-            		</para>
-            		<para>
-            		For example: <c>int[] {1, 2, 3}</c>.
-            		</para>
-            		<para>
-            		If the array is not one dimensional the 
-            		<c>Array.ToString()</c> is returned.
-            		</para>
-            		</description>
-            	</item>
-            	<item>
-            		<term><see cref="T:System.Collections.IEnumerable"/>, <see cref="T:System.Collections.ICollection"/> &amp; <see cref="T:System.Collections.IEnumerator"/></term>
-            		<description>
-            		<para>
-            		Rendered as an open brace, followed by a comma
-            		separated list of the elements (using the appropriate
-            		renderer), followed by a close brace.
-            		</para>
-            		<para>
-            		For example: <c>{a, b, c}</c>.
-            		</para>
-            		<para>
-            		All collection classes that implement <see cref="T:System.Collections.ICollection"/> its subclasses, 
-            		or generic equivalents all implement the <see cref="T:System.Collections.IEnumerable"/> interface.
-            		</para>
-            		</description>
-            	</item>		
-            	<item>
-            		<term><see cref="T:System.Collections.DictionaryEntry"/></term>
-            		<description>
-            		<para>
-            		Rendered as the key, an equals sign ('='), and the value (using the appropriate
-            		renderer). 
-            		</para>
-            		<para>
-            		For example: <c>key=value</c>.
-            		</para>
-            		</description>
-            	</item>		
-            	<item>
-            		<term>other</term>
-            		<description>
-            		<para><c>Object.ToString()</c></para>
-            		</description>
-            	</item>
-            </list>
-            </remarks>
-        </member>
-        <member name="M:log4net.ObjectRenderer.DefaultRenderer.RenderArray(log4net.ObjectRenderer.RendererMap,System.Array,System.IO.TextWriter)">
-            <summary>
-            Render the array argument into a string
-            </summary>
-            <param name="rendererMap">The map used to lookup renderers</param>
-            <param name="array">the array to render</param>
-            <param name="writer">The writer to render to</param>
-            <remarks>
-            <para>
-            For a one dimensional array this is the
-            array type name, an open brace, followed by a comma
-            separated list of the elements (using the appropriate
-            renderer), followed by a close brace. For example:
-            <c>int[] {1, 2, 3}</c>.
-            </para>
-            <para>
-            If the array is not one dimensional the 
-            <c>Array.ToString()</c> is returned.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.ObjectRenderer.DefaultRenderer.RenderEnumerator(log4net.ObjectRenderer.RendererMap,System.Collections.IEnumerator,System.IO.TextWriter)">
-            <summary>
-            Render the enumerator argument into a string
-            </summary>
-            <param name="rendererMap">The map used to lookup renderers</param>
-            <param name="enumerator">the enumerator to render</param>
-            <param name="writer">The writer to render to</param>
-            <remarks>
-            <para>
-            Rendered as an open brace, followed by a comma
-            separated list of the elements (using the appropriate
-            renderer), followed by a close brace. For example:
-            <c>{a, b, c}</c>.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.ObjectRenderer.DefaultRenderer.RenderDictionaryEntry(log4net.ObjectRenderer.RendererMap,System.Collections.DictionaryEntry,System.IO.TextWriter)">
-            <summary>
-            Render the DictionaryEntry argument into a string
-            </summary>
-            <param name="rendererMap">The map used to lookup renderers</param>
-            <param name="entry">the DictionaryEntry to render</param>
-            <param name="writer">The writer to render to</param>
-            <remarks>
-            <para>
-            Render the key, an equals sign ('='), and the value (using the appropriate
-            renderer). For example: <c>key=value</c>.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.ObjectRenderer.RendererMap">
-            <summary>
-            Map class objects to an <see cref="T:log4net.ObjectRenderer.IObjectRenderer"/>.
-            </summary>
-            <remarks>
-            <para>
-            Maintains a mapping between types that require special
-            rendering and the <see cref="T:log4net.ObjectRenderer.IObjectRenderer"/> that
-            is used to render them.
-            </para>
-            <para>
-            The <see cref="M:log4net.ObjectRenderer.RendererMap.FindAndRender(System.Object)"/> method is used to render an
-            <c>object</c> using the appropriate renderers defined in this map.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-        </member>
-        <member name="M:log4net.ObjectRenderer.RendererMap.#ctor">
-            <summary>
-            Default Constructor
-            </summary>
-            <remarks>
-            <para>
-            Default constructor.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.ObjectRenderer.RendererMap.FindAndRender(System.Object)">
-            <summary>
-            Render <paramref name="obj"/> using the appropriate renderer.
-            </summary>
-            <param name="obj">the object to render to a string</param>
-            <returns>the object rendered as a string</returns>
-            <remarks>
-            <para>
-            This is a convenience method used to render an object to a string.
-            The alternative method <see cref="M:log4net.ObjectRenderer.RendererMap.FindAndRender(System.Object,System.IO.TextWriter)"/>
-            should be used when streaming output to a <see cref="T:System.IO.TextWriter"/>.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.ObjectRenderer.RendererMap.FindAndRender(System.Object,System.IO.TextWriter)">
-            <summary>
-            Render <paramref name="obj"/> using the appropriate renderer.
-            </summary>
-            <param name="obj">the object to render to a string</param>
-            <param name="writer">The writer to render to</param>
-            <remarks>
-            <para>
-            Find the appropriate renderer for the type of the
-            <paramref name="obj"/> parameter. This is accomplished by calling the
-            <see cref="M:log4net.ObjectRenderer.RendererMap.Get(System.Type)"/> method. Once a renderer is found, it is
-            applied on the object <paramref name="obj"/> and the result is returned
-            as a <see cref="T:System.String"/>.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.ObjectRenderer.RendererMap.Get(System.Object)">
-            <summary>
-            Gets the renderer for the specified object type
-            </summary>
-            <param name="obj">the object to lookup the renderer for</param>
-            <returns>the renderer for <paramref name="obj"/></returns>
-            <remarks>
-            <param>
-            Gets the renderer for the specified object type.
-            </param>
-            <param>
-            Syntactic sugar method that calls <see cref="M:log4net.ObjectRenderer.RendererMap.Get(System.Type)"/> 
-            with the type of the object parameter.
-            </param>
-            </remarks>
-        </member>
-        <member name="M:log4net.ObjectRenderer.RendererMap.Get(System.Type)">
-            <summary>
-            Gets the renderer for the specified type
-            </summary>
-            <param name="type">the type to lookup the renderer for</param>
-            <returns>the renderer for the specified type</returns>
-            <remarks>
-            <para>
-            Returns the renderer for the specified type.
-            If no specific renderer has been defined the
-            <see cref="P:log4net.ObjectRenderer.RendererMap.DefaultRenderer"/> will be returned.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.ObjectRenderer.RendererMap.SearchTypeAndInterfaces(System.Type)">
-            <summary>
-            Internal function to recursively search interfaces
-            </summary>
-            <param name="type">the type to lookup the renderer for</param>
-            <returns>the renderer for the specified type</returns>
-        </member>
-        <member name="M:log4net.ObjectRenderer.RendererMap.Clear">
-            <summary>
-            Clear the map of renderers
-            </summary>
-            <remarks>
-            <para>
-            Clear the custom renderers defined by using
-            <see cref="M:log4net.ObjectRenderer.RendererMap.Put(System.Type,log4net.ObjectRenderer.IObjectRenderer)"/>. The <see cref="P:log4net.ObjectRenderer.RendererMap.DefaultRenderer"/>
-            cannot be removed.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.ObjectRenderer.RendererMap.Put(System.Type,log4net.ObjectRenderer.IObjectRenderer)">
-            <summary>
-            Register an <see cref="T:log4net.ObjectRenderer.IObjectRenderer"/> for <paramref name="typeToRender"/>. 
-            </summary>
-            <param name="typeToRender">the type that will be rendered by <paramref name="renderer"/></param>
-            <param name="renderer">the renderer for <paramref name="typeToRender"/></param>
-            <remarks>
-            <para>
-            Register an object renderer for a specific source type.
-            This renderer will be returned from a call to <see cref="M:log4net.ObjectRenderer.RendererMap.Get(System.Type)"/>
-            specifying the same <paramref name="typeToRender"/> as an argument.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.ObjectRenderer.RendererMap.DefaultRenderer">
-            <summary>
-            Get the default renderer instance
-            </summary>
-            <value>the default renderer</value>
-            <remarks>
-            <para>
-            Get the default renderer
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Plugin.IPlugin">
-            <summary>
-            Interface implemented by logger repository plugins.
-            </summary>
-            <remarks>
-            <para>
-            Plugins define additional behavior that can be associated
-            with a <see cref="T:log4net.Repository.ILoggerRepository"/>.
-            The <see cref="T:log4net.Plugin.PluginMap"/> held by the <see cref="P:log4net.Repository.ILoggerRepository.PluginMap"/>
-            property is used to store the plugins for a repository.
-            </para>
-            <para>
-            The <c>log4net.Config.PluginAttribute</c> can be used to
-            attach plugins to repositories created using configuration
-            attributes.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-        </member>
-        <member name="M:log4net.Plugin.IPlugin.Attach(log4net.Repository.ILoggerRepository)">
-            <summary>
-            Attaches the plugin to the specified <see cref="T:log4net.Repository.ILoggerRepository"/>.
-            </summary>
-            <param name="repository">The <see cref="T:log4net.Repository.ILoggerRepository"/> that this plugin should be attached to.</param>
-            <remarks>
-            <para>
-            A plugin may only be attached to a single repository.
-            </para>
-            <para>
-            This method is called when the plugin is attached to the repository.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Plugin.IPlugin.Shutdown">
-            <summary>
-            Is called when the plugin is to shutdown.
-            </summary>
-            <remarks>
-            <para>
-            This method is called to notify the plugin that 
-            it should stop operating and should detach from
-            the repository.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Plugin.IPlugin.Name">
-            <summary>
-            Gets the name of the plugin.
-            </summary>
-            <value>
-            The name of the plugin.
-            </value>
-            <remarks>
-            <para>
-            Plugins are stored in the <see cref="T:log4net.Plugin.PluginMap"/>
-            keyed by name. Each plugin instance attached to a
-            repository must be a unique name.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Plugin.PluginCollection">
-            <summary>
-            A strongly-typed collection of <see cref="T:log4net.Plugin.IPlugin"/> objects.
-            </summary>
-            <author>Nicko Cadell</author>
-        </member>
-        <member name="M:log4net.Plugin.PluginCollection.ReadOnly(log4net.Plugin.PluginCollection)">
-            <summary>
-            Creates a read-only wrapper for a <c>PluginCollection</c> instance.
-            </summary>
-            <param name="list">list to create a readonly wrapper arround</param>
-            <returns>
-            A <c>PluginCollection</c> wrapper that is read-only.
-            </returns>
-        </member>
-        <member name="M:log4net.Plugin.PluginCollection.#ctor">
-            <summary>
-            Initializes a new instance of the <c>PluginCollection</c> class
-            that is empty and has the default initial capacity.
-            </summary>
-        </member>
-        <member name="M:log4net.Plugin.PluginCollection.#ctor(System.Int32)">
-            <summary>
-            Initializes a new instance of the <c>PluginCollection</c> class
-            that has the specified initial capacity.
-            </summary>
-            <param name="capacity">
-            The number of elements that the new <c>PluginCollection</c> is initially capable of storing.
-            </param>
-        </member>
-        <member name="M:log4net.Plugin.PluginCollection.#ctor(log4net.Plugin.PluginCollection)">
-            <summary>
-            Initializes a new instance of the <c>PluginCollection</c> class
-            that contains elements copied from the specified <c>PluginCollection</c>.
-            </summary>
-            <param name="c">The <c>PluginCollection</c> whose elements are copied to the new collection.</param>
-        </member>
-        <member name="M:log4net.Plugin.PluginCollection.#ctor(log4net.Plugin.IPlugin[])">
-            <summary>
-            Initializes a new instance of the <c>PluginCollection</c> class
-            that contains elements copied from the specified <see cref="T:log4net.Plugin.IPlugin"/> array.
-            </summary>
-            <param name="a">The <see cref="T:log4net.Plugin.IPlugin"/> array whose elements are copied to the new list.</param>
-        </member>
-        <member name="M:log4net.Plugin.PluginCollection.#ctor(System.Collections.ICollection)">
-            <summary>
-            Initializes a new instance of the <c>PluginCollection</c> class
-            that contains elements copied from the specified <see cref="T:log4net.Plugin.IPlugin"/> collection.
-            </summary>
-            <param name="col">The <see cref="T:log4net.Plugin.IPlugin"/> collection whose elements are copied to the new list.</param>
-        </member>
-        <member name="M:log4net.Plugin.PluginCollection.#ctor(log4net.Plugin.PluginCollection.Tag)">
-            <summary>
-            Allow subclasses to avoid our default constructors
-            </summary>
-            <param name="tag"></param>
-            <exclude/>
-        </member>
-        <member name="M:log4net.Plugin.PluginCollection.CopyTo(log4net.Plugin.IPlugin[])">
-            <summary>
-            Copies the entire <c>PluginCollection</c> to a one-dimensional
-            <see cref="T:log4net.Plugin.IPlugin"/> array.
-            </summary>
-            <param name="array">The one-dimensional <see cref="T:log4net.Plugin.IPlugin"/> array to copy to.</param>
-        </member>
-        <member name="M:log4net.Plugin.PluginCollection.CopyTo(log4net.Plugin.IPlugin[],System.Int32)">
-            <summary>
-            Copies the entire <c>PluginCollection</c> to a one-dimensional
-            <see cref="T:log4net.Plugin.IPlugin"/> array, starting at the specified index of the target array.
-            </summary>
-            <param name="array">The one-dimensional <see cref="T:log4net.Plugin.IPlugin"/> array to copy to.</param>
-            <param name="start">The zero-based index in <paramref name="array"/> at which copying begins.</param>
-        </member>
-        <member name="M:log4net.Plugin.PluginCollection.Add(log4net.Plugin.IPlugin)">
-            <summary>
-            Adds a <see cref="T:log4net.Plugin.IPlugin"/> to the end of the <c>PluginCollection</c>.
-            </summary>
-            <param name="item">The <see cref="T:log4net.Plugin.IPlugin"/> to be added to the end of the <c>PluginCollection</c>.</param>
-            <returns>The index at which the value has been added.</returns>
-        </member>
-        <member name="M:log4net.Plugin.PluginCollection.Clear">
-            <summary>
-            Removes all elements from the <c>PluginCollection</c>.
-            </summary>
-        </member>
-        <member name="M:log4net.Plugin.PluginCollection.Clone">
-            <summary>
-            Creates a shallow copy of the <see cref="T:log4net.Plugin.PluginCollection"/>.
-            </summary>
-            <returns>A new <see cref="T:log4net.Plugin.PluginCollection"/> with a shallow copy of the collection data.</returns>
-        </member>
-        <member name="M:log4net.Plugin.PluginCollection.Contains(log4net.Plugin.IPlugin)">
-            <summary>
-            Determines whether a given <see cref="T:log4net.Plugin.IPlugin"/> is in the <c>PluginCollection</c>.
-            </summary>
-            <param name="item">The <see cref="T:log4net.Plugin.IPlugin"/> to check for.</param>
-            <returns><c>true</c> if <paramref name="item"/> is found in the <c>PluginCollection</c>; otherwise, <c>false</c>.</returns>
-        </member>
-        <member name="M:log4net.Plugin.PluginCollection.IndexOf(log4net.Plugin.IPlugin)">
-            <summary>
-            Returns the zero-based index of the first occurrence of a <see cref="T:log4net.Plugin.IPlugin"/>
-            in the <c>PluginCollection</c>.
-            </summary>
-            <param name="item">The <see cref="T:log4net.Plugin.IPlugin"/> to locate in the <c>PluginCollection</c>.</param>
-            <returns>
-            The zero-based index of the first occurrence of <paramref name="item"/> 
-            in the entire <c>PluginCollection</c>, if found; otherwise, -1.
-            </returns>
-        </member>
-        <member name="M:log4net.Plugin.PluginCollection.Insert(System.Int32,log4net.Plugin.IPlugin)">
-            <summary>
-            Inserts an element into the <c>PluginCollection</c> at the specified index.
-            </summary>
-            <param name="index">The zero-based index at which <paramref name="item"/> should be inserted.</param>
-            <param name="item">The <see cref="T:log4net.Plugin.IPlugin"/> to insert.</param>
-            <exception cref="T:System.ArgumentOutOfRangeException">
-            <para><paramref name="index"/> is less than zero</para>
-            <para>-or-</para>
-            <para><paramref name="index"/> is equal to or greater than <see cref="P:log4net.Plugin.PluginCollection.Count"/>.</para>
-            </exception>
-        </member>
-        <member name="M:log4net.Plugin.PluginCollection.Remove(log4net.Plugin.IPlugin)">
-            <summary>
-            Removes the first occurrence of a specific <see cref="T:log4net.Plugin.IPlugin"/> from the <c>PluginCollection</c>.
-            </summary>
-            <param name="item">The <see cref="T:log4net.Plugin.IPlugin"/> to remove from the <c>PluginCollection</c>.</param>
-            <exception cref="T:System.ArgumentException">
-            The specified <see cref="T:log4net.Plugin.IPlugin"/> was not found in the <c>PluginCollection</c>.
-            </exception>
-        </member>
-        <member name="M:log4net.Plugin.PluginCollection.RemoveAt(System.Int32)">
-            <summary>
-            Removes the element at the specified index of the <c>PluginCollection</c>.
-            </summary>
-            <param name="index">The zero-based index of the element to remove.</param>
-            <exception cref="T:System.ArgumentOutOfRangeException">
-            <para><paramref name="index"/> is less than zero.</para>
-            <para>-or-</para>
-            <para><paramref name="index"/> is equal to or greater than <see cref="P:log4net.Plugin.PluginCollection.Count"/>.</para>
-            </exception>
-        </member>
-        <member name="M:log4net.Plugin.PluginCollection.GetEnumerator">
-            <summary>
-            Returns an enumerator that can iterate through the <c>PluginCollection</c>.
-            </summary>
-            <returns>An <see cref="T:log4net.Plugin.PluginCollection.Enumerator"/> for the entire <c>PluginCollection</c>.</returns>
-        </member>
-        <member name="M:log4net.Plugin.PluginCollection.AddRange(log4net.Plugin.PluginCollection)">
-            <summary>
-            Adds the elements of another <c>PluginCollection</c> to the current <c>PluginCollection</c>.
-            </summary>
-            <param name="x">The <c>PluginCollection</c> whose elements should be added to the end of the current <c>PluginCollection</c>.</param>
-            <returns>The new <see cref="P:log4net.Plugin.PluginCollection.Count"/> of the <c>PluginCollection</c>.</returns>
-        </member>
-        <member name="M:log4net.Plugin.PluginCollection.AddRange(log4net.Plugin.IPlugin[])">
-            <summary>
-            Adds the elements of a <see cref="T:log4net.Plugin.IPlugin"/> array to the current <c>PluginCollection</c>.
-            </summary>
-            <param name="x">The <see cref="T:log4net.Plugin.IPlugin"/> array whose elements should be added to the end of the <c>PluginCollection</c>.</param>
-            <returns>The new <see cref="P:log4net.Plugin.PluginCollection.Count"/> of the <c>PluginCollection</c>.</returns>
-        </member>
-        <member name="M:log4net.Plugin.PluginCollection.AddRange(System.Collections.ICollection)">
-            <summary>
-            Adds the elements of a <see cref="T:log4net.Plugin.IPlugin"/> collection to the current <c>PluginCollection</c>.
-            </summary>
-            <param name="col">The <see cref="T:log4net.Plugin.IPlugin"/> collection whose elements should be added to the end of the <c>PluginCollection</c>.</param>
-            <returns>The new <see cref="P:log4net.Plugin.PluginCollection.Count"/> of the <c>PluginCollection</c>.</returns>
-        </member>
-        <member name="M:log4net.Plugin.PluginCollection.TrimToSize">
-            <summary>
-            Sets the capacity to the actual number of elements.
-            </summary>
-        </member>
-        <member name="M:log4net.Plugin.PluginCollection.ValidateIndex(System.Int32)">
-            <exception cref="T:System.ArgumentOutOfRangeException">
-            <para><paramref name="index"/> is less than zero.</para>
-            <para>-or-</para>
-            <para><paramref name="index"/> is equal to or greater than <see cref="P:log4net.Plugin.PluginCollection.Count"/>.</para>
-            </exception>
-        </member>
-        <member name="M:log4net.Plugin.PluginCollection.ValidateIndex(System.Int32,System.Boolean)">
-            <exception cref="T:System.ArgumentOutOfRangeException">
-            <para><paramref name="index"/> is less than zero.</para>
-            <para>-or-</para>
-            <para><paramref name="index"/> is equal to or greater than <see cref="P:log4net.Plugin.PluginCollection.Count"/>.</para>
-            </exception>
-        </member>
-        <member name="P:log4net.Plugin.PluginCollection.Count">
-            <summary>
-            Gets the number of elements actually contained in the <c>PluginCollection</c>.
-            </summary>
-        </member>
-        <member name="P:log4net.Plugin.PluginCollection.IsSynchronized">
-            <summary>
-            Gets a value indicating whether access to the collection is synchronized (thread-safe).
-            </summary>
-            <returns>true if access to the ICollection is synchronized (thread-safe); otherwise, false.</returns>
-        </member>
-        <member name="P:log4net.Plugin.PluginCollection.SyncRoot">
-            <summary>
-            Gets an object that can be used to synchronize access to the collection.
-            </summary>
-            <value>
-            An object that can be used to synchronize access to the collection.
-            </value>
-        </member>
-        <member name="P:log4net.Plugin.PluginCollection.Item(System.Int32)">
-            <summary>
-            Gets or sets the <see cref="T:log4net.Plugin.IPlugin"/> at the specified index.
-            </summary>
-            <value>
-            The <see cref="T:log4net.Plugin.IPlugin"/> at the specified index.
-            </value>
-            <param name="index">The zero-based index of the element to get or set.</param>
-            <exception cref="T:System.ArgumentOutOfRangeException">
-            <para><paramref name="index"/> is less than zero.</para>
-            <para>-or-</para>
-            <para><paramref name="index"/> is equal to or greater than <see cref="P:log4net.Plugin.PluginCollection.Count"/>.</para>
-            </exception>
-        </member>
-        <member name="P:log4net.Plugin.PluginCollection.IsFixedSize">
-            <summary>
-            Gets a value indicating whether the collection has a fixed size.
-            </summary>
-            <value><c>true</c> if the collection has a fixed size; otherwise, <c>false</c>. The default is <c>false</c>.</value>
-        </member>
-        <member name="P:log4net.Plugin.PluginCollection.IsReadOnly">
-            <summary>
-            Gets a value indicating whether the IList is read-only.
-            </summary>
-            <value><c>true</c> if the collection is read-only; otherwise, <c>false</c>. The default is <c>false</c>.</value>
-        </member>
-        <member name="P:log4net.Plugin.PluginCollection.Capacity">
-            <summary>
-            Gets or sets the number of elements the <c>PluginCollection</c> can contain.
-            </summary>
-            <value>
-            The number of elements the <c>PluginCollection</c> can contain.
-            </value>
-        </member>
-        <member name="T:log4net.Plugin.PluginCollection.IPluginCollectionEnumerator">
-            <summary>
-            Supports type-safe iteration over a <see cref="T:log4net.Plugin.PluginCollection"/>.
-            </summary>
-            <exclude/>
-        </member>
-        <member name="M:log4net.Plugin.PluginCollection.IPluginCollectionEnumerator.MoveNext">
-            <summary>
-            Advances the enumerator to the next element in the collection.
-            </summary>
-            <returns>
-            <c>true</c> if the enumerator was successfully advanced to the next element; 
-            <c>false</c> if the enumerator has passed the end of the collection.
-            </returns>
-            <exception cref="T:System.InvalidOperationException">
-            The collection was modified after the enumerator was created.
-            </exception>
-        </member>
-        <member name="M:log4net.Plugin.PluginCollection.IPluginCollectionEnumerator.Reset">
-            <summary>
-            Sets the enumerator to its initial position, before the first element in the collection.
-            </summary>
-        </member>
-        <member name="P:log4net.Plugin.PluginCollection.IPluginCollectionEnumerator.Current">
-            <summary>
-            Gets the current element in the collection.
-            </summary>
-        </member>
-        <member name="T:log4net.Plugin.PluginCollection.Tag">
-            <summary>
-            Type visible only to our subclasses
-            Used to access protected constructor
-            </summary>
-            <exclude/>
-        </member>
-        <member name="F:log4net.Plugin.PluginCollection.Tag.Default">
-            <summary>
-            A value
-            </summary>
-        </member>
-        <member name="T:log4net.Plugin.PluginCollection.Enumerator">
-            <summary>
-            Supports simple iteration over a <see cref="T:log4net.Plugin.PluginCollection"/>.
-            </summary>
-            <exclude/>
-        </member>
-        <member name="M:log4net.Plugin.PluginCollection.Enumerator.#ctor(log4net.Plugin.PluginCollection)">
-            <summary>
-            Initializes a new instance of the <c>Enumerator</c> class.
-            </summary>
-            <param name="tc"></param>
-        </member>
-        <member name="M:log4net.Plugin.PluginCollection.Enumerator.MoveNext">
-            <summary>
-            Advances the enumerator to the next element in the collection.
-            </summary>
-            <returns>
-            <c>true</c> if the enumerator was successfully advanced to the next element; 
-            <c>false</c> if the enumerator has passed the end of the collection.
-            </returns>
-            <exception cref="T:System.InvalidOperationException">
-            The collection was modified after the enumerator was created.
-            </exception>
-        </member>
-        <member name="M:log4net.Plugin.PluginCollection.Enumerator.Reset">
-            <summary>
-            Sets the enumerator to its initial position, before the first element in the collection.
-            </summary>
-        </member>
-        <member name="P:log4net.Plugin.PluginCollection.Enumerator.Current">
-            <summary>
-            Gets the current element in the collection.
-            </summary>
-            <value>
-            The current element in the collection.
-            </value>
-        </member>
-        <member name="T:log4net.Plugin.PluginCollection.ReadOnlyPluginCollection">
-            <exclude/>
-        </member>
-        <member name="T:log4net.Plugin.PluginMap">
-            <summary>
-            Map of repository plugins.
-            </summary>
-            <remarks>
-            <para>
-            This class is a name keyed map of the plugins that are
-            attached to a repository.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-        </member>
-        <member name="M:log4net.Plugin.PluginMap.#ctor(log4net.Repository.ILoggerRepository)">
-            <summary>
-            Constructor
-            </summary>
-            <param name="repository">The repository that the plugins should be attached to.</param>
-            <remarks>
-            <para>
-            Initialize a new instance of the <see cref="T:log4net.Plugin.PluginMap"/> class with a 
-            repository that the plugins should be attached to.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Plugin.PluginMap.Add(log4net.Plugin.IPlugin)">
-            <summary>
-            Adds a <see cref="T:log4net.Plugin.IPlugin"/> to the map.
-            </summary>
-            <param name="plugin">The <see cref="T:log4net.Plugin.IPlugin"/> to add to the map.</param>
-            <remarks>
-            <para>
-            The <see cref="T:log4net.Plugin.IPlugin"/> will be attached to the repository when added.
-            </para>
-            <para>
-            If there already exists a plugin with the same name 
-            attached to the repository then the old plugin will
-            be <see cref="M:log4net.Plugin.IPlugin.Shutdown"/> and replaced with
-            the new plugin.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Plugin.PluginMap.Remove(log4net.Plugin.IPlugin)">
-            <summary>
-            Removes a <see cref="T:log4net.Plugin.IPlugin"/> from the map.
-            </summary>
-            <param name="plugin">The <see cref="T:log4net.Plugin.IPlugin"/> to remove from the map.</param>
-            <remarks>
-            <para>
-            Remove a specific plugin from this map.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Plugin.PluginMap.Item(System.String)">
-            <summary>
-            Gets a <see cref="T:log4net.Plugin.IPlugin"/> by name.
-            </summary>
-            <param name="name">The name of the <see cref="T:log4net.Plugin.IPlugin"/> to lookup.</param>
-            <returns>
-            The <see cref="T:log4net.Plugin.IPlugin"/> from the map with the name specified, or 
-            <c>null</c> if no plugin is found.
-            </returns>
-            <remarks>
-            <para>
-            Lookup a plugin by name. If the plugin is not found <c>null</c>
-            will be returned.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Plugin.PluginMap.AllPlugins">
-            <summary>
-            Gets all possible plugins as a list of <see cref="T:log4net.Plugin.IPlugin"/> objects.
-            </summary>
-            <value>All possible plugins as a list of <see cref="T:log4net.Plugin.IPlugin"/> objects.</value>
-            <remarks>
-            <para>
-            Get a collection of all the plugins defined in this map.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Plugin.PluginSkeleton">
-            <summary>
-            Base implementation of <see cref="T:log4net.Plugin.IPlugin"/>
-            </summary>
-            <remarks>
-            <para>
-            Default abstract implementation of the <see cref="T:log4net.Plugin.IPlugin"/>
-            interface. This base class can be used by implementors
-            of the <see cref="T:log4net.Plugin.IPlugin"/> interface.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-        </member>
-        <member name="M:log4net.Plugin.PluginSkeleton.#ctor(System.String)">
-            <summary>
-            Constructor
-            </summary>
-            <param name="name">the name of the plugin</param>
-            <remarks>
-            Initializes a new Plugin with the specified name.
-            </remarks>
-        </member>
-        <member name="M:log4net.Plugin.PluginSkeleton.Attach(log4net.Repository.ILoggerRepository)">
-            <summary>
-            Attaches this plugin to a <see cref="T:log4net.Repository.ILoggerRepository"/>.
-            </summary>
-            <param name="repository">The <see cref="T:log4net.Repository.ILoggerRepository"/> that this plugin should be attached to.</param>
-            <remarks>
-            <para>
-            A plugin may only be attached to a single repository.
-            </para>
-            <para>
-            This method is called when the plugin is attached to the repository.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Plugin.PluginSkeleton.Shutdown">
-            <summary>
-            Is called when the plugin is to shutdown.
-            </summary>
-            <remarks>
-            <para>
-            This method is called to notify the plugin that 
-            it should stop operating and should detach from
-            the repository.
-            </para>
-            </remarks>
-        </member>
-        <member name="F:log4net.Plugin.PluginSkeleton.m_name">
-            <summary>
-            The name of this plugin.
-            </summary>
-        </member>
-        <member name="F:log4net.Plugin.PluginSkeleton.m_repository">
-            <summary>
-            The repository this plugin is attached to.
-            </summary>
-        </member>
-        <member name="P:log4net.Plugin.PluginSkeleton.Name">
-            <summary>
-            Gets or sets the name of the plugin.
-            </summary>
-            <value>
-            The name of the plugin.
-            </value>
-            <remarks>
-            <para>
-            Plugins are stored in the <see cref="T:log4net.Plugin.PluginMap"/>
-            keyed by name. Each plugin instance attached to a
-            repository must be a unique name.
-            </para>
-            <para>
-            The name of the plugin must not change one the 
-            plugin has been attached to a repository.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Plugin.PluginSkeleton.LoggerRepository">
-            <summary>
-            The repository for this plugin
-            </summary>
-            <value>
-            The <see cref="T:log4net.Repository.ILoggerRepository"/> that this plugin is attached to.
-            </value>
-            <remarks>
-            <para>
-            Gets or sets the <see cref="T:log4net.Repository.ILoggerRepository"/> that this plugin is 
-            attached to.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Plugin.RemoteLoggingServerPlugin">
-            <summary>
-            Plugin that listens for events from the <see cref="T:log4net.Appender.RemotingAppender"/>
-            </summary>
-            <remarks>
-            <para>
-            This plugin publishes an instance of <see cref="T:log4net.Appender.RemotingAppender.IRemoteLoggingSink"/> 
-            on a specified <see cref="P:log4net.Plugin.RemoteLoggingServerPlugin.SinkUri"/>. This listens for logging events delivered from
-            a remote <see cref="T:log4net.Appender.RemotingAppender"/>.
-            </para>
-            <para>
-            When an event is received it is relogged within the attached repository
-            as if it had been raised locally.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-        </member>
-        <member name="M:log4net.Plugin.RemoteLoggingServerPlugin.#ctor">
-            <summary>
-            Default constructor
-            </summary>
-            <remarks>
-            <para>
-            Initializes a new instance of the <see cref="T:log4net.Plugin.RemoteLoggingServerPlugin"/> class.
-            </para>
-            <para>
-            The <see cref="P:log4net.Plugin.RemoteLoggingServerPlugin.SinkUri"/> property must be set.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Plugin.RemoteLoggingServerPlugin.#ctor(System.String)">
-            <summary>
-            Construct with sink Uri.
-            </summary>
-            <param name="sinkUri">The name to publish the sink under in the remoting infrastructure. 
-            See <see cref="P:log4net.Plugin.RemoteLoggingServerPlugin.SinkUri"/> for more details.</param>
-            <remarks>
-            <para>
-            Initializes a new instance of the <see cref="T:log4net.Plugin.RemoteLoggingServerPlugin"/> class
-            with specified name.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Plugin.RemoteLoggingServerPlugin.Attach(log4net.Repository.ILoggerRepository)">
-            <summary>
-            Attaches this plugin to a <see cref="T:log4net.Repository.ILoggerRepository"/>.
-            </summary>
-            <param name="repository">The <see cref="T:log4net.Repository.ILoggerRepository"/> that this plugin should be attached to.</param>
-            <remarks>
-            <para>
-            A plugin may only be attached to a single repository.
-            </para>
-            <para>
-            This method is called when the plugin is attached to the repository.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Plugin.RemoteLoggingServerPlugin.Shutdown">
-            <summary>
-            Is called when the plugin is to shutdown.
-            </summary>
-            <remarks>
-            <para>
-            When the plugin is shutdown the remote logging
-            sink is disconnected.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Plugin.RemoteLoggingServerPlugin.SinkUri">
-            <summary>
-            Gets or sets the URI of this sink.
-            </summary>
-            <value>
-            The URI of this sink.
-            </value>
-            <remarks>
-            <para>
-            This is the name under which the object is marshaled.
-            <see cref="M:System.Runtime.Remoting.RemotingServices.Marshal(System.MarshalByRefObject,System.String,System.Type)"/>
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Plugin.RemoteLoggingServerPlugin.RemoteLoggingSinkImpl">
-            <summary>
-            Delivers <see cref="T:log4net.Core.LoggingEvent"/> objects to a remote sink.
-            </summary>
-            <remarks>
-            <para>
-            Internal class used to listen for logging events
-            and deliver them to the local repository.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Plugin.RemoteLoggingServerPlugin.RemoteLoggingSinkImpl.#ctor(log4net.Repository.ILoggerRepository)">
-            <summary>
-            Constructor
-            </summary>
-            <param name="repository">The repository to log to.</param>
-            <remarks>
-            <para>
-            Initializes a new instance of the <see cref="T:log4net.Plugin.RemoteLoggingServerPlugin.RemoteLoggingSinkImpl"/> for the
-            specified <see cref="T:log4net.Repository.ILoggerRepository"/>.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Plugin.RemoteLoggingServerPlugin.RemoteLoggingSinkImpl.LogEvents(log4net.Core.LoggingEvent[])">
-            <summary>
-            Logs the events to the repository.
-            </summary>
-            <param name="events">The events to log.</param>
-            <remarks>
-            <para>
-            The events passed are logged to the <see cref="T:log4net.Repository.ILoggerRepository"/>
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Plugin.RemoteLoggingServerPlugin.RemoteLoggingSinkImpl.InitializeLifetimeService">
-            <summary>
-            Obtains a lifetime service object to control the lifetime 
-            policy for this instance.
-            </summary>
-            <returns><c>null</c> to indicate that this instance should live forever.</returns>
-            <remarks>
-            <para>
-            Obtains a lifetime service object to control the lifetime 
-            policy for this instance. This object should live forever
-            therefore this implementation returns <c>null</c>.
-            </para>
-            </remarks>
-        </member>
-        <member name="F:log4net.Plugin.RemoteLoggingServerPlugin.RemoteLoggingSinkImpl.m_repository">
-            <summary>
-            The underlying <see cref="T:log4net.Repository.ILoggerRepository"/> that events should
-            be logged to.
-            </summary>
-        </member>
-        <member name="T:log4net.Repository.Hierarchy.DefaultLoggerFactory">
-            <summary>
-            Default implementation of <see cref="T:log4net.Repository.Hierarchy.ILoggerFactory"/>
-            </summary>
-            <remarks>
-            <para>
-            This default implementation of the <see cref="T:log4net.Repository.Hierarchy.ILoggerFactory"/>
-            interface is used to create the default subclass
-            of the <see cref="T:log4net.Repository.Hierarchy.Logger"/> object.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-        </member>
-        <member name="T:log4net.Repository.Hierarchy.ILoggerFactory">
-            <summary>
-            Interface abstracts creation of <see cref="T:log4net.Repository.Hierarchy.Logger"/> instances
-            </summary>
-            <remarks>
-            <para>
-            This interface is used by the <see cref="T:log4net.Repository.Hierarchy.Hierarchy"/> to 
-            create new <see cref="T:log4net.Repository.Hierarchy.Logger"/> objects.
-            </para>
-            <para>
-            The <see cref="M:log4net.Repository.Hierarchy.ILoggerFactory.CreateLogger(System.String)"/> method is called
-            to create a named <see cref="T:log4net.Repository.Hierarchy.Logger"/>.
-            </para>
-            <para>
-            Implement this interface to create new subclasses of <see cref="T:log4net.Repository.Hierarchy.Logger"/>.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-        </member>
-        <member name="M:log4net.Repository.Hierarchy.ILoggerFactory.CreateLogger(System.String)">
-            <summary>
-            Create a new <see cref="T:log4net.Repository.Hierarchy.Logger"/> instance
-            </summary>
-            <param name="name">The name of the <see cref="T:log4net.Repository.Hierarchy.Logger"/>.</param>
-            <returns>The <see cref="T:log4net.Repository.Hierarchy.Logger"/> instance for the specified name.</returns>
-            <remarks>
-            <para>
-            Create a new <see cref="T:log4net.Repository.Hierarchy.Logger"/> instance with the 
-            specified name.
-            </para>
-            <para>
-            Called by the <see cref="T:log4net.Repository.Hierarchy.Hierarchy"/> to create
-            new named <see cref="T:log4net.Repository.Hierarchy.Logger"/> instances.
-            </para>
-            <para>
-            If the <paramref name="name"/> is <c>null</c> then the root logger
-            must be returned.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Repository.Hierarchy.DefaultLoggerFactory.#ctor">
-            <summary>
-            Default constructor
-            </summary>
-            <remarks>
-            <para>
-            Initializes a new instance of the <see cref="T:log4net.Repository.Hierarchy.DefaultLoggerFactory"/> class. 
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Repository.Hierarchy.DefaultLoggerFactory.CreateLogger(System.String)">
-            <summary>
-            Create a new <see cref="T:log4net.Repository.Hierarchy.Logger"/> instance
-            </summary>
-            <param name="name">The name of the <see cref="T:log4net.Repository.Hierarchy.Logger"/>.</param>
-            <returns>The <see cref="T:log4net.Repository.Hierarchy.Logger"/> instance for the specified name.</returns>
-            <remarks>
-            <para>
-            Create a new <see cref="T:log4net.Repository.Hierarchy.Logger"/> instance with the 
-            specified name.
-            </para>
-            <para>
-            Called by the <see cref="T:log4net.Repository.Hierarchy.Hierarchy"/> to create
-            new named <see cref="T:log4net.Repository.Hierarchy.Logger"/> instances.
-            </para>
-            <para>
-            If the <paramref name="name"/> is <c>null</c> then the root logger
-            must be returned.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Repository.Hierarchy.DefaultLoggerFactory.LoggerImpl">
-            <summary>
-            Default internal subclass of <see cref="T:log4net.Repository.Hierarchy.Logger"/>
-            </summary>
-            <remarks>
-            <para>
-            This subclass has no additional behavior over the
-            <see cref="T:log4net.Repository.Hierarchy.Logger"/> class but does allow instances
-            to be created.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Repository.Hierarchy.Logger">
-            <summary>
-            Implementation of <see cref="T:log4net.Core.ILogger"/> used by <see cref="P:log4net.Repository.Hierarchy.Logger.Hierarchy"/>
-            </summary>
-            <remarks>
-            <para>
-            Internal class used to provide implementation of <see cref="T:log4net.Core.ILogger"/>
-            interface. Applications should use <see cref="T:log4net.LogManager"/> to get
-            logger instances.
-            </para>
-            <para>
-            This is one of the central classes in the log4net implementation. One of the
-            distinctive features of log4net are hierarchical loggers and their
-            evaluation. The <see cref="P:log4net.Repository.Hierarchy.Logger.Hierarchy"/> organizes the <see cref="T:log4net.Repository.Hierarchy.Logger"/>
-            instances into a rooted tree hierarchy.
-            </para>
-            <para>
-            The <see cref="T:log4net.Repository.Hierarchy.Logger"/> class is abstract. Only concrete subclasses of
-            <see cref="T:log4net.Repository.Hierarchy.Logger"/> can be created. The <see cref="T:log4net.Repository.Hierarchy.ILoggerFactory"/>
-            is used to create instances of this type for the <see cref="P:log4net.Repository.Hierarchy.Logger.Hierarchy"/>.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-            <author>Aspi Havewala</author>
-            <author>Douglas de la Torre</author>
-        </member>
-        <member name="M:log4net.Repository.Hierarchy.Logger.#ctor(System.String)">
-            <summary>
-            This constructor created a new <see cref="T:log4net.Repository.Hierarchy.Logger"/> instance and
-            sets its name.
-            </summary>
-            <param name="name">The name of the <see cref="T:log4net.Repository.Hierarchy.Logger"/>.</param>
-            <remarks>
-            <para>
-            This constructor is protected and designed to be used by
-            a subclass that is not abstract.
-            </para>
-            <para>
-            Loggers are constructed by <see cref="T:log4net.Repository.Hierarchy.ILoggerFactory"/> 
-            objects. See <see cref="T:log4net.Repository.Hierarchy.DefaultLoggerFactory"/> for the default
-            logger creator.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Repository.Hierarchy.Logger.AddAppender(log4net.Appender.IAppender)">
-            <summary>
-            Add <paramref name="newAppender"/> to the list of appenders of this
-            Logger instance.
-            </summary>
-            <param name="newAppender">An appender to add to this logger</param>
-            <remarks>
-            <para>
-            Add <paramref name="newAppender"/> to the list of appenders of this
-            Logger instance.
-            </para>
-            <para>
-            If <paramref name="newAppender"/> is already in the list of
-            appenders, then it won't be added again.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Repository.Hierarchy.Logger.GetAppender(System.String)">
-            <summary>
-            Look for the appender named as <c>name</c>
-            </summary>
-            <param name="name">The name of the appender to lookup</param>
-            <returns>The appender with the name specified, or <c>null</c>.</returns>
-            <remarks>
-            <para>
-            Returns the named appender, or null if the appender is not found.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Repository.Hierarchy.Logger.RemoveAllAppenders">
-            <summary>
-            Remove all previously added appenders from this Logger instance.
-            </summary>
-            <remarks>
-            <para>
-            Remove all previously added appenders from this Logger instance.
-            </para>
-            <para>
-            This is useful when re-reading configuration information.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Repository.Hierarchy.Logger.RemoveAppender(log4net.Appender.IAppender)">
-            <summary>
-            Remove the appender passed as parameter form the list of appenders.
-            </summary>
-            <param name="appender">The appender to remove</param>
-            <returns>The appender removed from the list</returns>
-            <remarks>
-            <para>
-            Remove the appender passed as parameter form the list of appenders.
-            The appender removed is not closed.
-            If you are discarding the appender you must call
-            <see cref="M:log4net.Appender.IAppender.Close"/> on the appender removed.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Repository.Hierarchy.Logger.RemoveAppender(System.String)">
-            <summary>
-            Remove the appender passed as parameter form the list of appenders.
-            </summary>
-            <param name="name">The name of the appender to remove</param>
-            <returns>The appender removed from the list</returns>
-            <remarks>
-            <para>
-            Remove the named appender passed as parameter form the list of appenders.
-            The appender removed is not closed.
-            If you are discarding the appender you must call
-            <see cref="M:log4net.Appender.IAppender.Close"/> on the appender removed.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Repository.Hierarchy.Logger.Log(System.Type,log4net.Core.Level,System.Object,System.Exception)">
-            <summary>
-            This generic form is intended to be used by wrappers.
-            </summary>
-            <param name="callerStackBoundaryDeclaringType">The declaring type of the method that is
-            the stack boundary into the logging system for this call.</param>
-            <param name="level">The level of the message to be logged.</param>
-            <param name="message">The message object to log.</param>
-            <param name="exception">The exception to log, including its stack trace.</param>
-            <remarks>
-            <para>
-            Generate a logging event for the specified <paramref name="level"/> using
-            the <paramref name="message"/> and <paramref name="exception"/>.
-            </para>
-            <para>
-            This method must not throw any exception to the caller.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Repository.Hierarchy.Logger.Log(log4net.Core.LoggingEvent)">
-            <summary>
-            This is the most generic printing method that is intended to be used 
-            by wrappers.
-            </summary>
-            <param name="logEvent">The event being logged.</param>
-            <remarks>
-            <para>
-            Logs the specified logging event through this logger.
-            </para>
-            <para>
-            This method must not throw any exception to the caller.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Repository.Hierarchy.Logger.IsEnabledFor(log4net.Core.Level)">
-            <summary>
-            Checks if this logger is enabled for a given <see cref="P:log4net.Repository.Hierarchy.Logger.Level"/> passed as parameter.
-            </summary>
-            <param name="level">The level to check.</param>
-            <returns>
-            <c>true</c> if this logger is enabled for <c>level</c>, otherwise <c>false</c>.
-            </returns>
-            <remarks>
-            <para>
-            Test if this logger is going to log events of the specified <paramref name="level"/>.
-            </para>
-            <para>
-            This method must not throw any exception to the caller.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Repository.Hierarchy.Logger.CallAppenders(log4net.Core.LoggingEvent)">
-            <summary>
-            Deliver the <see cref="T:log4net.Core.LoggingEvent"/> to the attached appenders.
-            </summary>
-            <param name="loggingEvent">The event to log.</param>
-            <remarks>
-            <para>
-            Call the appenders in the hierarchy starting at
-            <c>this</c>. If no appenders could be found, emit a
-            warning.
-            </para>
-            <para>
-            This method calls all the appenders inherited from the
-            hierarchy circumventing any evaluation of whether to log or not
-            to log the particular log request.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Repository.Hierarchy.Logger.CloseNestedAppenders">
-            <summary>
-            Closes all attached appenders implementing the <see cref="T:log4net.Core.IAppenderAttachable"/> interface.
-            </summary>
-            <remarks>
-            <para>
-            Used to ensure that the appenders are correctly shutdown.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Repository.Hierarchy.Logger.Log(log4net.Core.Level,System.Object,System.Exception)">
-            <summary>
-            This is the most generic printing method. This generic form is intended to be used by wrappers
-            </summary>
-            <param name="level">The level of the message to be logged.</param>
-            <param name="message">The message object to log.</param>
-            <param name="exception">The exception to log, including its stack trace.</param>
-            <remarks>
-            <para>
-            Generate a logging event for the specified <paramref name="level"/> using
-            the <paramref name="message"/>.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Repository.Hierarchy.Logger.ForcedLog(System.Type,log4net.Core.Level,System.Object,System.Exception)">
-            <summary>
-            Creates a new logging event and logs the event without further checks.
-            </summary>
-            <param name="callerStackBoundaryDeclaringType">The declaring type of the method that is
-            the stack boundary into the logging system for this call.</param>
-            <param name="level">The level of the message to be logged.</param>
-            <param name="message">The message object to log.</param>
-            <param name="exception">The exception to log, including its stack trace.</param>
-            <remarks>
-            <para>
-            Generates a logging event and delivers it to the attached
-            appenders.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Repository.Hierarchy.Logger.ForcedLog(log4net.Core.LoggingEvent)">
-            <summary>
-            Creates a new logging event and logs the event without further checks.
-            </summary>
-            <param name="logEvent">The event being logged.</param>
-            <remarks>
-            <para>
-            Delivers the logging event to the attached appenders.
-            </para>
-            </remarks>
-        </member>
-        <member name="F:log4net.Repository.Hierarchy.Logger.ThisDeclaringType">
-            <summary>
-            The fully qualified type of the Logger class.
-            </summary>
-        </member>
-        <member name="F:log4net.Repository.Hierarchy.Logger.m_name">
-            <summary>
-            The name of this logger.
-            </summary>
-        </member>
-        <member name="F:log4net.Repository.Hierarchy.Logger.m_level">
-            <summary>
-            The assigned level of this logger. 
-            </summary>
-            <remarks>
-            <para>
-            The <c>level</c> variable need not be 
-            assigned a value in which case it is inherited 
-            form the hierarchy.
-            </para>
-            </remarks>
-        </member>
-        <member name="F:log4net.Repository.Hierarchy.Logger.m_parent">
-            <summary>
-            The parent of this logger.
-            </summary>
-            <remarks>
-            <para>
-            The parent of this logger. 
-            All loggers have at least one ancestor which is the root logger.
-            </para>
-            </remarks>
-        </member>
-        <member name="F:log4net.Repository.Hierarchy.Logger.m_hierarchy">
-            <summary>
-            Loggers need to know what Hierarchy they are in.
-            </summary>
-            <remarks>
-            <para>
-            Loggers need to know what Hierarchy they are in.
-            The hierarchy that this logger is a member of is stored
-            here.
-            </para>
-            </remarks>
-        </member>
-        <member name="F:log4net.Repository.Hierarchy.Logger.m_appenderAttachedImpl">
-            <summary>
-            Helper implementation of the <see cref="T:log4net.Core.IAppenderAttachable"/> interface
-            </summary>
-        </member>
-        <member name="F:log4net.Repository.Hierarchy.Logger.m_additive">
-            <summary>
-            Flag indicating if child loggers inherit their parents appenders
-            </summary>
-            <remarks>
-            <para>
-            Additivity is set to true by default, that is children inherit
-            the appenders of their ancestors by default. If this variable is
-            set to <c>false</c> then the appenders found in the
-            ancestors of this logger are not used. However, the children
-            of this logger will inherit its appenders, unless the children
-            have their additivity flag set to <c>false</c> too. See
-            the user manual for more details.
-            </para>
-            </remarks>
-        </member>
-        <member name="F:log4net.Repository.Hierarchy.Logger.m_appenderLock">
-            <summary>
-            Lock to protect AppenderAttachedImpl variable m_appenderAttachedImpl
-            </summary>
-        </member>
-        <member name="P:log4net.Repository.Hierarchy.Logger.Parent">
-            <summary>
-            Gets or sets the parent logger in the hierarchy.
-            </summary>
-            <value>
-            The parent logger in the hierarchy.
-            </value>
-            <remarks>
-            <para>
-            Part of the Composite pattern that makes the hierarchy.
-            The hierarchy is parent linked rather than child linked.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Repository.Hierarchy.Logger.Additivity">
-            <summary>
-            Gets or sets a value indicating if child loggers inherit their parent's appenders.
-            </summary>
-            <value>
-            <c>true</c> if child loggers inherit their parent's appenders.
-            </value>
-            <remarks>
-            <para>
-            Additivity is set to <c>true</c> by default, that is children inherit
-            the appenders of their ancestors by default. If this variable is
-            set to <c>false</c> then the appenders found in the
-            ancestors of this logger are not used. However, the children
-            of this logger will inherit its appenders, unless the children
-            have their additivity flag set to <c>false</c> too. See
-            the user manual for more details.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Repository.Hierarchy.Logger.EffectiveLevel">
-            <summary>
-            Gets the effective level for this logger.
-            </summary>
-            <returns>The nearest level in the logger hierarchy.</returns>
-            <remarks>
-            <para>
-            Starting from this logger, searches the logger hierarchy for a
-            non-null level and returns it. Otherwise, returns the level of the
-            root logger.
-            </para>
-            <para>The Logger class is designed so that this method executes as
-            quickly as possible.</para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Repository.Hierarchy.Logger.Hierarchy">
-            <summary>
-            Gets or sets the <see cref="P:log4net.Repository.Hierarchy.Logger.Hierarchy"/> where this 
-            <c>Logger</c> instance is attached to.
-            </summary>
-            <value>The hierarchy that this logger belongs to.</value>
-            <remarks>
-            <para>
-            This logger must be attached to a single <see cref="P:log4net.Repository.Hierarchy.Logger.Hierarchy"/>.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Repository.Hierarchy.Logger.Level">
-            <summary>
-            Gets or sets the assigned <see cref="P:log4net.Repository.Hierarchy.Logger.Level"/>, if any, for this Logger.  
-            </summary>
-            <value>
-            The <see cref="P:log4net.Repository.Hierarchy.Logger.Level"/> of this logger.
-            </value>
-            <remarks>
-            <para>
-            The assigned <see cref="P:log4net.Repository.Hierarchy.Logger.Level"/> can be <c>null</c>.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Repository.Hierarchy.Logger.Appenders">
-            <summary>
-            Get the appenders contained in this logger as an 
-            <see cref="T:System.Collections.ICollection"/>.
-            </summary>
-            <returns>A collection of the appenders in this logger</returns>
-            <remarks>
-            <para>
-            Get the appenders contained in this logger as an 
-            <see cref="T:System.Collections.ICollection"/>. If no appenders 
-            can be found, then a <see cref="T:log4net.Util.EmptyCollection"/> is returned.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Repository.Hierarchy.Logger.Name">
-            <summary>
-            Gets the logger name.
-            </summary>
-            <value>
-            The name of the logger.
-            </value>
-            <remarks>
-            <para>
-            The name of this logger
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Repository.Hierarchy.Logger.Repository">
-            <summary>
-            Gets the <see cref="T:log4net.Repository.ILoggerRepository"/> where this 
-            <c>Logger</c> instance is attached to.
-            </summary>
-            <value>
-            The <see cref="T:log4net.Repository.ILoggerRepository"/> that this logger belongs to.
-            </value>
-            <remarks>
-            <para>
-            Gets the <see cref="T:log4net.Repository.ILoggerRepository"/> where this 
-            <c>Logger</c> instance is attached to.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Repository.Hierarchy.DefaultLoggerFactory.LoggerImpl.#ctor(System.String)">
-            <summary>
-            Construct a new Logger
-            </summary>
-            <param name="name">the name of the logger</param>
-            <remarks>
-            <para>
-            Initializes a new instance of the <see cref="T:log4net.Repository.Hierarchy.DefaultLoggerFactory.LoggerImpl"/> class
-            with the specified name. 
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Repository.Hierarchy.LoggerCreationEventHandler">
-            <summary>
-            Delegate used to handle logger creation event notifications.
-            </summary>
-            <param name="sender">The <see cref="T:log4net.Repository.Hierarchy.Hierarchy"/> in which the <see cref="T:log4net.Repository.Hierarchy.Logger"/> has been created.</param>
-            <param name="e">The <see cref="T:log4net.Repository.Hierarchy.LoggerCreationEventArgs"/> event args that hold the <see cref="T:log4net.Repository.Hierarchy.Logger"/> instance that has been created.</param>
-            <remarks>
-            <para>
-            Delegate used to handle logger creation event notifications.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Repository.Hierarchy.LoggerCreationEventArgs">
-            <summary>
-            Provides data for the <see cref="E:log4net.Repository.Hierarchy.Hierarchy.LoggerCreatedEvent"/> event.
-            </summary>
-            <remarks>
-            <para>
-            A <see cref="E:log4net.Repository.Hierarchy.Hierarchy.LoggerCreatedEvent"/> event is raised every time a
-            <see cref="P:log4net.Repository.Hierarchy.LoggerCreationEventArgs.Logger"/> is created.
-            </para>
-            </remarks>
-        </member>
-        <member name="F:log4net.Repository.Hierarchy.LoggerCreationEventArgs.m_log">
-            <summary>
-            The <see cref="P:log4net.Repository.Hierarchy.LoggerCreationEventArgs.Logger"/> created
-            </summary>
-        </member>
-        <member name="M:log4net.Repository.Hierarchy.LoggerCreationEventArgs.#ctor(log4net.Repository.Hierarchy.Logger)">
-            <summary>
-            Constructor
-            </summary>
-            <param name="log">The <see cref="P:log4net.Repository.Hierarchy.LoggerCreationEventArgs.Logger"/> that has been created.</param>
-            <remarks>
-            <para>
-            Initializes a new instance of the <see cref="T:log4net.Repository.Hierarchy.LoggerCreationEventArgs"/> event argument 
-            class,with the specified <see cref="P:log4net.Repository.Hierarchy.LoggerCreationEventArgs.Logger"/>.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Repository.Hierarchy.LoggerCreationEventArgs.Logger">
-            <summary>
-            Gets the <see cref="P:log4net.Repository.Hierarchy.LoggerCreationEventArgs.Logger"/> that has been created.
-            </summary>
-            <value>
-            The <see cref="P:log4net.Repository.Hierarchy.LoggerCreationEventArgs.Logger"/> that has been created.
-            </value>
-            <remarks>
-            <para>
-            The <see cref="P:log4net.Repository.Hierarchy.LoggerCreationEventArgs.Logger"/> that has been created.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Repository.Hierarchy.Hierarchy">
-            <summary>
-            Hierarchical organization of loggers
-            </summary>
-            <remarks>
-            <para>
-            <i>The casual user should not have to deal with this class
-            directly.</i>
-            </para>
-            <para>
-            This class is specialized in retrieving loggers by name and
-            also maintaining the logger hierarchy. Implements the 
-            <see cref="T:log4net.Repository.ILoggerRepository"/> interface.
-            </para>
-            <para>
-            The structure of the logger hierarchy is maintained by the
-            <see cref="M:log4net.Repository.Hierarchy.Hierarchy.GetLogger(System.String)"/> method. The hierarchy is such that children
-            link to their parent but parents do not have any references to their
-            children. Moreover, loggers can be instantiated in any order, in
-            particular descendant before ancestor.
-            </para>
-            <para>
-            In case a descendant is created before a particular ancestor,
-            then it creates a provision node for the ancestor and adds itself
-            to the provision node. Other descendants of the same ancestor add
-            themselves to the previously created provision node.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-        </member>
-        <member name="T:log4net.Repository.LoggerRepositorySkeleton">
-            <summary>
-            Base implementation of <see cref="T:log4net.Repository.ILoggerRepository"/>
-            </summary>
-            <remarks>
-            <para>
-            Default abstract implementation of the <see cref="T:log4net.Repository.ILoggerRepository"/> interface.
-            </para>
-            <para>
-            Skeleton implementation of the <see cref="T:log4net.Repository.ILoggerRepository"/> interface.
-            All <see cref="T:log4net.Repository.ILoggerRepository"/> types can extend this type.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-        </member>
-        <member name="T:log4net.Repository.ILoggerRepository">
-            <summary>
-            Interface implemented by logger repositories.
-            </summary>
-            <remarks>
-            <para>
-            This interface is implemented by logger repositories. e.g. 
-            <see cref="T:log4net.Repository.Hierarchy.Hierarchy"/>.
-            </para>
-            <para>
-            This interface is used by the <see cref="T:log4net.LogManager"/>
-            to obtain <see cref="T:log4net.ILog"/> interfaces.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-        </member>
-        <member name="M:log4net.Repository.ILoggerRepository.Exists(System.String)">
-            <summary>
-            Check if the named logger exists in the repository. If so return
-            its reference, otherwise returns <c>null</c>.
-            </summary>
-            <param name="name">The name of the logger to lookup</param>
-            <returns>The Logger object with the name specified</returns>
-            <remarks>
-            <para>
-            If the names logger exists it is returned, otherwise
-            <c>null</c> is returned.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Repository.ILoggerRepository.GetCurrentLoggers">
-            <summary>
-            Returns all the currently defined loggers as an Array.
-            </summary>
-            <returns>All the defined loggers</returns>
-            <remarks>
-            <para>
-            Returns all the currently defined loggers as an Array.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Repository.ILoggerRepository.GetLogger(System.String)">
-            <summary>
-            Returns a named logger instance
-            </summary>
-            <param name="name">The name of the logger to retrieve</param>
-            <returns>The logger object with the name specified</returns>
-            <remarks>
-            <para>
-            Returns a named logger instance.
-            </para>
-            <para>
-            If a logger of that name already exists, then it will be
-            returned.  Otherwise, a new logger will be instantiated and
-            then linked with its existing ancestors as well as children.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Repository.ILoggerRepository.Shutdown">
-            <summary>Shutdown the repository</summary>
-            <remarks>
-            <para>
-            Shutting down a repository will <i>safely</i> close and remove
-            all appenders in all loggers including the root logger.
-            </para>
-            <para>
-            Some appenders need to be closed before the
-            application exists. Otherwise, pending logging events might be
-            lost.
-            </para>
-            <para>
-            The <see cref="M:log4net.Repository.ILoggerRepository.Shutdown"/> method is careful to close nested
-            appenders before closing regular appenders. This is allows
-            configurations where a regular appender is attached to a logger
-            and again to a nested appender.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Repository.ILoggerRepository.ResetConfiguration">
-            <summary>
-            Reset the repositories configuration to a default state
-            </summary>
-            <remarks>
-            <para>
-            Reset all values contained in this instance to their
-            default state.
-            </para>
-            <para>
-            Existing loggers are not removed. They are just reset.
-            </para>
-            <para>
-            This method should be used sparingly and with care as it will
-            block all logging until it is completed.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Repository.ILoggerRepository.Log(log4net.Core.LoggingEvent)">
-            <summary>
-            Log the <see cref="T:log4net.Core.LoggingEvent"/> through this repository.
-            </summary>
-            <param name="logEvent">the event to log</param>
-            <remarks>
-            <para>
-            This method should not normally be used to log.
-            The <see cref="T:log4net.ILog"/> interface should be used 
-            for routine logging. This interface can be obtained
-            using the <see cref="M:log4net.LogManager.GetLogger(System.String)"/> method.
-            </para>
-            <para>
-            The <c>logEvent</c> is delivered to the appropriate logger and
-            that logger is then responsible for logging the event.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Repository.ILoggerRepository.GetAppenders">
-            <summary>
-            Returns all the Appenders that are configured as an Array.
-            </summary>
-            <returns>All the Appenders</returns>
-            <remarks>
-            <para>
-            Returns all the Appenders that are configured as an Array.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Repository.ILoggerRepository.Name">
-            <summary>
-            The name of the repository
-            </summary>
-            <value>
-            The name of the repository
-            </value>
-            <remarks>
-            <para>
-            The name of the repository.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Repository.ILoggerRepository.RendererMap">
-            <summary>
-            RendererMap accesses the object renderer map for this repository.
-            </summary>
-            <value>
-            RendererMap accesses the object renderer map for this repository.
-            </value>
-            <remarks>
-            <para>
-            RendererMap accesses the object renderer map for this repository.
-            </para>
-            <para>
-            The RendererMap holds a mapping between types and
-            <see cref="T:log4net.ObjectRenderer.IObjectRenderer"/> objects.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Repository.ILoggerRepository.PluginMap">
-            <summary>
-            The plugin map for this repository.
-            </summary>
-            <value>
-            The plugin map for this repository.
-            </value>
-            <remarks>
-            <para>
-            The plugin map holds the <see cref="T:log4net.Plugin.IPlugin"/> instances
-            that have been attached to this repository.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Repository.ILoggerRepository.LevelMap">
-            <summary>
-            Get the level map for the Repository.
-            </summary>
-            <remarks>
-            <para>
-            Get the level map for the Repository.
-            </para>
-            <para>
-            The level map defines the mappings between
-            level names and <see cref="T:log4net.Core.Level"/> objects in
-            this repository.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Repository.ILoggerRepository.Threshold">
-            <summary>
-            The threshold for all events in this repository
-            </summary>
-            <value>
-            The threshold for all events in this repository
-            </value>
-            <remarks>
-            <para>
-            The threshold for all events in this repository.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Repository.ILoggerRepository.Configured">
-            <summary>
-            Flag indicates if this repository has been configured.
-            </summary>
-            <value>
-            Flag indicates if this repository has been configured.
-            </value>
-            <remarks>
-            <para>
-            Flag indicates if this repository has been configured.
-            </para>
-            </remarks>
-        </member>
-        <member name="E:log4net.Repository.ILoggerRepository.ShutdownEvent">
-            <summary>
-            Event to notify that the repository has been shutdown.
-            </summary>
-            <value>
-            Event to notify that the repository has been shutdown.
-            </value>
-            <remarks>
-            <para>
-            Event raised when the repository has been shutdown.
-            </para>
-            </remarks>
-        </member>
-        <member name="E:log4net.Repository.ILoggerRepository.ConfigurationReset">
-            <summary>
-            Event to notify that the repository has had its configuration reset.
-            </summary>
-            <value>
-            Event to notify that the repository has had its configuration reset.
-            </value>
-            <remarks>
-            <para>
-            Event raised when the repository's configuration has been
-            reset to default.
-            </para>
-            </remarks>
-        </member>
-        <member name="E:log4net.Repository.ILoggerRepository.ConfigurationChanged">
-            <summary>
-            Event to notify that the repository has had its configuration changed.
-            </summary>
-            <value>
-            Event to notify that the repository has had its configuration changed.
-            </value>
-            <remarks>
-            <para>
-            Event raised when the repository's configuration has been changed.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Repository.ILoggerRepository.Properties">
-            <summary>
-            Repository specific properties
-            </summary>
-            <value>
-            Repository specific properties
-            </value>
-            <remarks>
-            <para>
-            These properties can be specified on a repository specific basis.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Repository.LoggerRepositorySkeleton.#ctor">
-            <summary>
-            Default Constructor
-            </summary>
-            <remarks>
-            <para>
-            Initializes the repository with default (empty) properties.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Repository.LoggerRepositorySkeleton.#ctor(log4net.Util.PropertiesDictionary)">
-            <summary>
-            Construct the repository using specific properties
-            </summary>
-            <param name="properties">the properties to set for this repository</param>
-            <remarks>
-            <para>
-            Initializes the repository with specified properties.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Repository.LoggerRepositorySkeleton.Exists(System.String)">
-            <summary>
-            Test if logger exists
-            </summary>
-            <param name="name">The name of the logger to lookup</param>
-            <returns>The Logger object with the name specified</returns>
-            <remarks>
-            <para>
-            Check if the named logger exists in the repository. If so return
-            its reference, otherwise returns <c>null</c>.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Repository.LoggerRepositorySkeleton.GetCurrentLoggers">
-            <summary>
-            Returns all the currently defined loggers in the repository
-            </summary>
-            <returns>All the defined loggers</returns>
-            <remarks>
-            <para>
-            Returns all the currently defined loggers in the repository as an Array.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Repository.LoggerRepositorySkeleton.GetLogger(System.String)">
-            <summary>
-            Return a new logger instance
-            </summary>
-            <param name="name">The name of the logger to retrieve</param>
-            <returns>The logger object with the name specified</returns>
-            <remarks>
-            <para>
-            Return a new logger instance.
-            </para>
-            <para>
-            If a logger of that name already exists, then it will be
-            returned. Otherwise, a new logger will be instantiated and
-            then linked with its existing ancestors as well as children.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Repository.LoggerRepositorySkeleton.Shutdown">
-            <summary>
-            Shutdown the repository
-            </summary>
-            <remarks>
-            <para>
-            Shutdown the repository. Can be overridden in a subclass.
-            This base class implementation notifies the <see cref="E:log4net.Repository.LoggerRepositorySkeleton.ShutdownEvent"/>
-            listeners and all attached plugins of the shutdown event.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Repository.LoggerRepositorySkeleton.ResetConfiguration">
-            <summary>
-            Reset the repositories configuration to a default state
-            </summary>
-            <remarks>
-            <para>
-            Reset all values contained in this instance to their
-            default state.
-            </para>
-            <para>
-            Existing loggers are not removed. They are just reset.
-            </para>
-            <para>
-            This method should be used sparingly and with care as it will
-            block all logging until it is completed.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Repository.LoggerRepositorySkeleton.Log(log4net.Core.LoggingEvent)">
-            <summary>
-            Log the logEvent through this repository.
-            </summary>
-            <param name="logEvent">the event to log</param>
-            <remarks>
-            <para>
-            This method should not normally be used to log.
-            The <see cref="T:log4net.ILog"/> interface should be used 
-            for routine logging. This interface can be obtained
-            using the <see cref="M:log4net.LogManager.GetLogger(System.String)"/> method.
-            </para>
-            <para>
-            The <c>logEvent</c> is delivered to the appropriate logger and
-            that logger is then responsible for logging the event.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Repository.LoggerRepositorySkeleton.GetAppenders">
-            <summary>
-            Returns all the Appenders that are configured as an Array.
-            </summary>
-            <returns>All the Appenders</returns>
-            <remarks>
-            <para>
-            Returns all the Appenders that are configured as an Array.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Repository.LoggerRepositorySkeleton.AddRenderer(System.Type,log4net.ObjectRenderer.IObjectRenderer)">
-            <summary>
-            Adds an object renderer for a specific class. 
-            </summary>
-            <param name="typeToRender">The type that will be rendered by the renderer supplied.</param>
-            <param name="rendererInstance">The object renderer used to render the object.</param>
-            <remarks>
-            <para>
-            Adds an object renderer for a specific class. 
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Repository.LoggerRepositorySkeleton.OnShutdown(System.EventArgs)">
-            <summary>
-            Notify the registered listeners that the repository is shutting down
-            </summary>
-            <param name="e">Empty EventArgs</param>
-            <remarks>
-            <para>
-            Notify any listeners that this repository is shutting down.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Repository.LoggerRepositorySkeleton.OnConfigurationReset(System.EventArgs)">
-            <summary>
-            Notify the registered listeners that the repository has had its configuration reset
-            </summary>
-            <param name="e">Empty EventArgs</param>
-            <remarks>
-            <para>
-            Notify any listeners that this repository's configuration has been reset.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Repository.LoggerRepositorySkeleton.OnConfigurationChanged(System.EventArgs)">
-            <summary>
-            Notify the registered listeners that the repository has had its configuration changed
-            </summary>
-            <param name="e">Empty EventArgs</param>
-            <remarks>
-            <para>
-            Notify any listeners that this repository's configuration has changed.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Repository.LoggerRepositorySkeleton.RaiseConfigurationChanged(System.EventArgs)">
-            <summary>
-            Raise a configuration changed event on this repository
-            </summary>
-            <param name="e">EventArgs.Empty</param>
-            <remarks>
-            <para>
-            Applications that programmatically change the configuration of the repository should
-            raise this event notification to notify listeners.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Repository.LoggerRepositorySkeleton.Name">
-            <summary>
-            The name of the repository
-            </summary>
-            <value>
-            The string name of the repository
-            </value>
-            <remarks>
-            <para>
-            The name of this repository. The name is
-            used to store and lookup the repositories 
-            stored by the <see cref="T:log4net.Core.IRepositorySelector"/>.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Repository.LoggerRepositorySkeleton.Threshold">
-            <summary>
-            The threshold for all events in this repository
-            </summary>
-            <value>
-            The threshold for all events in this repository
-            </value>
-            <remarks>
-            <para>
-            The threshold for all events in this repository
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Repository.LoggerRepositorySkeleton.RendererMap">
-            <summary>
-            RendererMap accesses the object renderer map for this repository.
-            </summary>
-            <value>
-            RendererMap accesses the object renderer map for this repository.
-            </value>
-            <remarks>
-            <para>
-            RendererMap accesses the object renderer map for this repository.
-            </para>
-            <para>
-            The RendererMap holds a mapping between types and
-            <see cref="T:log4net.ObjectRenderer.IObjectRenderer"/> objects.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Repository.LoggerRepositorySkeleton.PluginMap">
-            <summary>
-            The plugin map for this repository.
-            </summary>
-            <value>
-            The plugin map for this repository.
-            </value>
-            <remarks>
-            <para>
-            The plugin map holds the <see cref="T:log4net.Plugin.IPlugin"/> instances
-            that have been attached to this repository.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Repository.LoggerRepositorySkeleton.LevelMap">
-            <summary>
-            Get the level map for the Repository.
-            </summary>
-            <remarks>
-            <para>
-            Get the level map for the Repository.
-            </para>
-            <para>
-            The level map defines the mappings between
-            level names and <see cref="T:log4net.Core.Level"/> objects in
-            this repository.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Repository.LoggerRepositorySkeleton.Configured">
-            <summary>
-            Flag indicates if this repository has been configured.
-            </summary>
-            <value>
-            Flag indicates if this repository has been configured.
-            </value>
-            <remarks>
-            <para>
-            Flag indicates if this repository has been configured.
-            </para>
-            </remarks>
-        </member>
-        <member name="E:log4net.Repository.LoggerRepositorySkeleton.ShutdownEvent">
-            <summary>
-            Event to notify that the repository has been shutdown.
-            </summary>
-            <value>
-            Event to notify that the repository has been shutdown.
-            </value>
-            <remarks>
-            <para>
-            Event raised when the repository has been shutdown.
-            </para>
-            </remarks>
-        </member>
-        <member name="E:log4net.Repository.LoggerRepositorySkeleton.ConfigurationReset">
-            <summary>
-            Event to notify that the repository has had its configuration reset.
-            </summary>
-            <value>
-            Event to notify that the repository has had its configuration reset.
-            </value>
-            <remarks>
-            <para>
-            Event raised when the repository's configuration has been
-            reset to default.
-            </para>
-            </remarks>
-        </member>
-        <member name="E:log4net.Repository.LoggerRepositorySkeleton.ConfigurationChanged">
-            <summary>
-            Event to notify that the repository has had its configuration changed.
-            </summary>
-            <value>
-            Event to notify that the repository has had its configuration changed.
-            </value>
-            <remarks>
-            <para>
-            Event raised when the repository's configuration has been changed.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Repository.LoggerRepositorySkeleton.Properties">
-            <summary>
-            Repository specific properties
-            </summary>
-            <value>
-            Repository specific properties
-            </value>
-            <remarks>
-            These properties can be specified on a repository specific basis
-            </remarks>
-        </member>
-        <member name="T:log4net.Repository.IBasicRepositoryConfigurator">
-            <summary>
-            Basic Configurator interface for repositories
-            </summary>
-            <remarks>
-            <para>
-            Interface used by basic configurator to configure a <see cref="T:log4net.Repository.ILoggerRepository"/>
-            with a default <see cref="T:log4net.Appender.IAppender"/>.
-            </para>
-            <para>
-            A <see cref="T:log4net.Repository.ILoggerRepository"/> should implement this interface to support
-            configuration by the <see cref="T:log4net.Config.BasicConfigurator"/>.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-        </member>
-        <member name="M:log4net.Repository.IBasicRepositoryConfigurator.Configure(log4net.Appender.IAppender)">
-            <summary>
-            Initialize the repository using the specified appender
-            </summary>
-            <param name="appender">the appender to use to log all logging events</param>
-            <remarks>
-            <para>
-            Configure the repository to route all logging events to the
-            specified appender.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Repository.IXmlRepositoryConfigurator">
-            <summary>
-            Configure repository using XML
-            </summary>
-            <remarks>
-            <para>
-            Interface used by Xml configurator to configure a <see cref="T:log4net.Repository.ILoggerRepository"/>.
-            </para>
-            <para>
-            A <see cref="T:log4net.Repository.ILoggerRepository"/> should implement this interface to support
-            configuration by the <see cref="T:log4net.Config.XmlConfigurator"/>.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-        </member>
-        <member name="M:log4net.Repository.IXmlRepositoryConfigurator.Configure(System.Xml.XmlElement)">
-            <summary>
-            Initialize the repository using the specified config
-            </summary>
-            <param name="element">the element containing the root of the config</param>
-            <remarks>
-            <para>
-            The schema for the XML configuration data is defined by
-            the implementation.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Repository.Hierarchy.Hierarchy.#ctor">
-            <summary>
-            Default constructor
-            </summary>
-            <remarks>
-            <para>
-            Initializes a new instance of the <see cref="T:log4net.Repository.Hierarchy.Hierarchy"/> class.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Repository.Hierarchy.Hierarchy.#ctor(log4net.Util.PropertiesDictionary)">
-            <summary>
-            Construct with properties
-            </summary>
-            <param name="properties">The properties to pass to this repository.</param>
-            <remarks>
-            <para>
-            Initializes a new instance of the <see cref="T:log4net.Repository.Hierarchy.Hierarchy"/> class.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Repository.Hierarchy.Hierarchy.#ctor(log4net.Repository.Hierarchy.ILoggerFactory)">
-            <summary>
-            Construct with a logger factory
-            </summary>
-            <param name="loggerFactory">The factory to use to create new logger instances.</param>
-            <remarks>
-            <para>
-            Initializes a new instance of the <see cref="T:log4net.Repository.Hierarchy.Hierarchy"/> class with 
-            the specified <see cref="T:log4net.Repository.Hierarchy.ILoggerFactory"/>.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Repository.Hierarchy.Hierarchy.#ctor(log4net.Util.PropertiesDictionary,log4net.Repository.Hierarchy.ILoggerFactory)">
-            <summary>
-            Construct with properties and a logger factory
-            </summary>
-            <param name="properties">The properties to pass to this repository.</param>
-            <param name="loggerFactory">The factory to use to create new logger instances.</param>
-            <remarks>
-            <para>
-            Initializes a new instance of the <see cref="T:log4net.Repository.Hierarchy.Hierarchy"/> class with 
-            the specified <see cref="T:log4net.Repository.Hierarchy.ILoggerFactory"/>.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Repository.Hierarchy.Hierarchy.Exists(System.String)">
-            <summary>
-            Test if a logger exists
-            </summary>
-            <param name="name">The name of the logger to lookup</param>
-            <returns>The Logger object with the name specified</returns>
-            <remarks>
-            <para>
-            Check if the named logger exists in the hierarchy. If so return
-            its reference, otherwise returns <c>null</c>.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Repository.Hierarchy.Hierarchy.GetCurrentLoggers">
-            <summary>
-            Returns all the currently defined loggers in the hierarchy as an Array
-            </summary>
-            <returns>All the defined loggers</returns>
-            <remarks>
-            <para>
-            Returns all the currently defined loggers in the hierarchy as an Array.
-            The root logger is <b>not</b> included in the returned
-            enumeration.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Repository.Hierarchy.Hierarchy.GetLogger(System.String)">
-            <summary>
-            Return a new logger instance named as the first parameter using
-            the default factory.
-            </summary>
-            <remarks>
-            <para>
-            Return a new logger instance named as the first parameter using
-            the default factory.
-            </para>
-            <para>
-            If a logger of that name already exists, then it will be
-            returned.  Otherwise, a new logger will be instantiated and
-            then linked with its existing ancestors as well as children.
-            </para>
-            </remarks>
-            <param name="name">The name of the logger to retrieve</param>
-            <returns>The logger object with the name specified</returns>
-        </member>
-        <member name="M:log4net.Repository.Hierarchy.Hierarchy.Shutdown">
-            <summary>
-            Shutting down a hierarchy will <i>safely</i> close and remove
-            all appenders in all loggers including the root logger.
-            </summary>
-            <remarks>
-            <para>
-            Shutting down a hierarchy will <i>safely</i> close and remove
-            all appenders in all loggers including the root logger.
-            </para>
-            <para>
-            Some appenders need to be closed before the
-            application exists. Otherwise, pending logging events might be
-            lost.
-            </para>
-            <para>
-            The <c>Shutdown</c> method is careful to close nested
-            appenders before closing regular appenders. This is allows
-            configurations where a regular appender is attached to a logger
-            and again to a nested appender.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Repository.Hierarchy.Hierarchy.ResetConfiguration">
-            <summary>
-            Reset all values contained in this hierarchy instance to their default.
-            </summary>
-            <remarks>
-            <para>
-            Reset all values contained in this hierarchy instance to their
-            default.  This removes all appenders from all loggers, sets
-            the level of all non-root loggers to <c>null</c>,
-            sets their additivity flag to <c>true</c> and sets the level
-            of the root logger to <see cref="F:log4net.Core.Level.Debug"/>. Moreover,
-            message disabling is set its default "off" value.
-            </para>
-            <para>
-            Existing loggers are not removed. They are just reset.
-            </para>
-            <para>
-            This method should be used sparingly and with care as it will
-            block all logging until it is completed.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Repository.Hierarchy.Hierarchy.Log(log4net.Core.LoggingEvent)">
-            <summary>
-            Log the logEvent through this hierarchy.
-            </summary>
-            <param name="logEvent">the event to log</param>
-            <remarks>
-            <para>
-            This method should not normally be used to log.
-            The <see cref="T:log4net.ILog"/> interface should be used 
-            for routine logging. This interface can be obtained
-            using the <see cref="M:log4net.LogManager.GetLogger(System.String)"/> method.
-            </para>
-            <para>
-            The <c>logEvent</c> is delivered to the appropriate logger and
-            that logger is then responsible for logging the event.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Repository.Hierarchy.Hierarchy.GetAppenders">
-            <summary>
-            Returns all the Appenders that are currently configured
-            </summary>
-            <returns>An array containing all the currently configured appenders</returns>
-            <remarks>
-            <para>
-            Returns all the <see cref="T:log4net.Appender.IAppender"/> instances that are currently configured.
-            All the loggers are searched for appenders. The appenders may also be containers
-            for appenders and these are also searched for additional loggers.
-            </para>
-            <para>
-            The list returned is unordered but does not contain duplicates.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Repository.Hierarchy.Hierarchy.CollectAppender(System.Collections.ArrayList,log4net.Appender.IAppender)">
-            <summary>
-            Collect the appenders from an <see cref="T:log4net.Core.IAppenderAttachable"/>.
-            The appender may also be a container.
-            </summary>
-            <param name="appenderList"></param>
-            <param name="appender"></param>
-        </member>
-        <member name="M:log4net.Repository.Hierarchy.Hierarchy.CollectAppenders(System.Collections.ArrayList,log4net.Core.IAppenderAttachable)">
-            <summary>
-            Collect the appenders from an <see cref="T:log4net.Core.IAppenderAttachable"/> container
-            </summary>
-            <param name="appenderList"></param>
-            <param name="container"></param>
-        </member>
-        <member name="M:log4net.Repository.Hierarchy.Hierarchy.log4net#Repository#IBasicRepositoryConfigurator#Configure(log4net.Appender.IAppender)">
-            <summary>
-            Initialize the log4net system using the specified appender
-            </summary>
-            <param name="appender">the appender to use to log all logging events</param>
-        </member>
-        <member name="M:log4net.Repository.Hierarchy.Hierarchy.BasicRepositoryConfigure(log4net.Appender.IAppender)">
-            <summary>
-            Initialize the log4net system using the specified appender
-            </summary>
-            <param name="appender">the appender to use to log all logging events</param>
-            <remarks>
-            <para>
-            This method provides the same functionality as the 
-            <see cref="M:log4net.Repository.IBasicRepositoryConfigurator.Configure(log4net.Appender.IAppender)"/> method implemented
-            on this object, but it is protected and therefore can be called by subclasses.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Repository.Hierarchy.Hierarchy.log4net#Repository#IXmlRepositoryConfigurator#Configure(System.Xml.XmlElement)">
-            <summary>
-            Initialize the log4net system using the specified config
-            </summary>
-            <param name="element">the element containing the root of the config</param>
-        </member>
-        <member name="M:log4net.Repository.Hierarchy.Hierarchy.XmlRepositoryConfigure(System.Xml.XmlElement)">
-            <summary>
-            Initialize the log4net system using the specified config
-            </summary>
-            <param name="element">the element containing the root of the config</param>
-            <remarks>
-            <para>
-            This method provides the same functionality as the 
-            <see cref="M:log4net.Repository.IBasicRepositoryConfigurator.Configure(log4net.Appender.IAppender)"/> method implemented
-            on this object, but it is protected and therefore can be called by subclasses.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Repository.Hierarchy.Hierarchy.IsDisabled(log4net.Core.Level)">
-            <summary>
-            Test if this hierarchy is disabled for the specified <see cref="T:log4net.Core.Level"/>.
-            </summary>
-            <param name="level">The level to check against.</param>
-            <returns>
-            <c>true</c> if the repository is disabled for the level argument, <c>false</c> otherwise.
-            </returns>
-            <remarks>
-            <para>
-            If this hierarchy has not been configured then this method will
-            always return <c>true</c>.
-            </para>
-            <para>
-            This method will return <c>true</c> if this repository is
-            disabled for <c>level</c> object passed as parameter and
-            <c>false</c> otherwise.
-            </para>
-            <para>
-            See also the <see cref="P:log4net.Repository.ILoggerRepository.Threshold"/> property.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Repository.Hierarchy.Hierarchy.Clear">
-            <summary>
-            Clear all logger definitions from the internal hashtable
-            </summary>
-            <remarks>
-            <para>
-            This call will clear all logger definitions from the internal
-            hashtable. Invoking this method will irrevocably mess up the
-            logger hierarchy.
-            </para>
-            <para>
-            You should <b>really</b> know what you are doing before
-            invoking this method.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Repository.Hierarchy.Hierarchy.GetLogger(System.String,log4net.Repository.Hierarchy.ILoggerFactory)">
-            <summary>
-            Return a new logger instance named as the first parameter using
-            <paramref name="factory"/>.
-            </summary>
-            <param name="name">The name of the logger to retrieve</param>
-            <param name="factory">The factory that will make the new logger instance</param>
-            <returns>The logger object with the name specified</returns>
-            <remarks>
-            <para>
-            If a logger of that name already exists, then it will be
-            returned. Otherwise, a new logger will be instantiated by the
-            <paramref name="factory"/> parameter and linked with its existing
-            ancestors as well as children.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Repository.Hierarchy.Hierarchy.OnLoggerCreationEvent(log4net.Repository.Hierarchy.Logger)">
-            <summary>
-            Sends a logger creation event to all registered listeners
-            </summary>
-            <param name="logger">The newly created logger</param>
-            <remarks>
-            Raises the logger creation event.
-            </remarks>
-        </member>
-        <member name="M:log4net.Repository.Hierarchy.Hierarchy.UpdateParents(log4net.Repository.Hierarchy.Logger)">
-            <summary>
-            Updates all the parents of the specified logger
-            </summary>
-            <param name="log">The logger to update the parents for</param>
-            <remarks>
-            <para>
-            This method loops through all the <i>potential</i> parents of
-            <paramref name="log"/>. There 3 possible cases:
-            </para>
-            <list type="number">
-            	<item>
-            		<term>No entry for the potential parent of <paramref name="log"/> exists</term>
-            		<description>
-            		We create a ProvisionNode for this potential 
-            		parent and insert <paramref name="log"/> in that provision node.
-            		</description>
-            	</item>
-            	<item>
-            		<term>The entry is of type Logger for the potential parent.</term>
-            		<description>
-            		The entry is <paramref name="log"/>'s nearest existing parent. We 
-            		update <paramref name="log"/>'s parent field with this entry. We also break from 
-            		he loop because updating our parent's parent is our parent's 
-            		responsibility.
-            		</description>
-            	</item>
-            	<item>
-            		<term>The entry is of type ProvisionNode for this potential parent.</term>
-            		<description>
-            		We add <paramref name="log"/> to the list of children for this 
-            		potential parent.
-            		</description>
-            	</item>
-            </list>
-            </remarks>
-        </member>
-        <member name="M:log4net.Repository.Hierarchy.Hierarchy.UpdateChildren(log4net.Repository.Hierarchy.ProvisionNode,log4net.Repository.Hierarchy.Logger)">
-            <summary>
-            Replace a <see cref="T:log4net.Repository.Hierarchy.ProvisionNode"/> with a <see cref="T:log4net.Repository.Hierarchy.Logger"/> in the hierarchy.
-            </summary>
-            <param name="pn"></param>
-            <param name="log"></param>
-            <remarks>
-            <para>
-            We update the links for all the children that placed themselves
-            in the provision node 'pn'. The second argument 'log' is a
-            reference for the newly created Logger, parent of all the
-            children in 'pn'.
-            </para>
-            <para>
-            We loop on all the children 'c' in 'pn'.
-            </para>
-            <para>
-            If the child 'c' has been already linked to a child of
-            'log' then there is no need to update 'c'.
-            </para>
-            <para>
-            Otherwise, we set log's parent field to c's parent and set
-            c's parent field to log.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Repository.Hierarchy.Hierarchy.AddLevel(log4net.Repository.Hierarchy.Hierarchy.LevelEntry)">
-            <summary>
-            Define or redefine a Level using the values in the <see cref="T:log4net.Repository.Hierarchy.Hierarchy.LevelEntry"/> argument
-            </summary>
-            <param name="levelEntry">the level values</param>
-            <remarks>
-            <para>
-            Define or redefine a Level using the values in the <see cref="T:log4net.Repository.Hierarchy.Hierarchy.LevelEntry"/> argument
-            </para>
-            <para>
-            Supports setting levels via the configuration file.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Repository.Hierarchy.Hierarchy.AddProperty(log4net.Repository.Hierarchy.Hierarchy.PropertyEntry)">
-            <summary>
-            Set a Property using the values in the <see cref="T:log4net.Repository.Hierarchy.Hierarchy.LevelEntry"/> argument
-            </summary>
-            <param name="propertyEntry">the property value</param>
-            <remarks>
-            <para>
-            Set a Property using the values in the <see cref="T:log4net.Repository.Hierarchy.Hierarchy.LevelEntry"/> argument.
-            </para>
-            <para>
-            Supports setting property values via the configuration file.
-            </para>
-            </remarks>
-        </member>
-        <member name="E:log4net.Repository.Hierarchy.Hierarchy.LoggerCreatedEvent">
-            <summary>
-            Event used to notify that a logger has been created.
-            </summary>
-            <remarks>
-            <para>
-            Event raised when a logger is created.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Repository.Hierarchy.Hierarchy.EmittedNoAppenderWarning">
-            <summary>
-            Has no appender warning been emitted
-            </summary>
-            <remarks>
-            <para>
-            Flag to indicate if we have already issued a warning
-            about not having an appender warning.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Repository.Hierarchy.Hierarchy.Root">
-            <summary>
-            Get the root of this hierarchy
-            </summary>
-            <remarks>
-            <para>
-            Get the root of this hierarchy.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Repository.Hierarchy.Hierarchy.LoggerFactory">
-            <summary>
-            Gets or sets the default <see cref="T:log4net.Repository.Hierarchy.ILoggerFactory"/> instance.
-            </summary>
-            <value>The default <see cref="T:log4net.Repository.Hierarchy.ILoggerFactory"/></value>
-            <remarks>
-            <para>
-            The logger factory is used to create logger instances.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Repository.Hierarchy.Hierarchy.LevelEntry">
-            <summary>
-            A class to hold the value, name and display name for a level
-            </summary>
-            <remarks>
-            <para>
-            A class to hold the value, name and display name for a level
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Repository.Hierarchy.Hierarchy.LevelEntry.ToString">
-            <summary>
-            Override <c>Object.ToString</c> to return sensible debug info
-            </summary>
-            <returns>string info about this object</returns>
-        </member>
-        <member name="P:log4net.Repository.Hierarchy.Hierarchy.LevelEntry.Value">
-            <summary>
-            Value of the level
-            </summary>
-            <remarks>
-            <para>
-            If the value is not set (defaults to -1) the value will be looked
-            up for the current level with the same name.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Repository.Hierarchy.Hierarchy.LevelEntry.Name">
-            <summary>
-            Name of the level
-            </summary>
-            <value>
-            The name of the level
-            </value>
-            <remarks>
-            <para>
-            The name of the level.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Repository.Hierarchy.Hierarchy.LevelEntry.DisplayName">
-            <summary>
-            Display name for the level
-            </summary>
-            <value>
-            The display name of the level
-            </value>
-            <remarks>
-            <para>
-            The display name of the level.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Repository.Hierarchy.Hierarchy.PropertyEntry">
-            <summary>
-            A class to hold the key and data for a property set in the config file
-            </summary>
-            <remarks>
-            <para>
-            A class to hold the key and data for a property set in the config file
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Repository.Hierarchy.Hierarchy.PropertyEntry.ToString">
-            <summary>
-            Override <c>Object.ToString</c> to return sensible debug info
-            </summary>
-            <returns>string info about this object</returns>
-        </member>
-        <member name="P:log4net.Repository.Hierarchy.Hierarchy.PropertyEntry.Key">
-            <summary>
-            Property Key
-            </summary>
-            <value>
-            Property Key
-            </value>
-            <remarks>
-            <para>
-            Property Key.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Repository.Hierarchy.Hierarchy.PropertyEntry.Value">
-            <summary>
-            Property Value
-            </summary>
-            <value>
-            Property Value
-            </value>
-            <remarks>
-            <para>
-            Property Value.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Repository.Hierarchy.LoggerKey">
-            <summary>
-            Used internally to accelerate hash table searches.
-            </summary>
-            <remarks>
-            <para>
-            Internal class used to improve performance of 
-            string keyed hashtables.
-            </para>
-            <para>
-            The hashcode of the string is cached for reuse.
-            The string is stored as an interned value.
-            When comparing two <see cref="T:log4net.Repository.Hierarchy.LoggerKey"/> objects for equality 
-            the reference equality of the interned strings is compared.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-        </member>
-        <member name="M:log4net.Repository.Hierarchy.LoggerKey.#ctor(System.String)">
-            <summary>
-            Construct key with string name
-            </summary>
-            <remarks>
-            <para>
-            Initializes a new instance of the <see cref="T:log4net.Repository.Hierarchy.LoggerKey"/> class 
-            with the specified name.
-            </para>
-            <para>
-            Stores the hashcode of the string and interns
-            the string key to optimize comparisons.
-            </para>
-            <note>
-            The Compact Framework 1.0 the <see cref="M:System.String.Intern(System.String)"/>
-            method does not work. On the Compact Framework
-            the string keys are not interned nor are they
-            compared by reference.
-            </note>
-            </remarks>
-            <param name="name">The name of the logger.</param>
-        </member>
-        <member name="M:log4net.Repository.Hierarchy.LoggerKey.GetHashCode">
-            <summary>
-            Returns a hash code for the current instance.
-            </summary>
-            <returns>A hash code for the current instance.</returns>
-            <remarks>
-            <para>
-            Returns the cached hashcode.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Repository.Hierarchy.LoggerKey.Equals(System.Object)">
-            <summary>
-            Determines whether two <see cref="T:log4net.Repository.Hierarchy.LoggerKey"/> instances 
-            are equal.
-            </summary>
-            <param name="obj">The <see cref="T:System.Object"/> to compare with the current <see cref="T:log4net.Repository.Hierarchy.LoggerKey"/>.</param>
-            <returns>
-            <c>true</c> if the specified <see cref="T:System.Object"/> is equal to the current <see cref="T:log4net.Repository.Hierarchy.LoggerKey"/>; otherwise, <c>false</c>.
-            </returns>
-            <remarks>
-            <para>
-            Compares the references of the interned strings.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Repository.Hierarchy.ProvisionNode">
-            <summary>
-            Provision nodes are used where no logger instance has been specified
-            </summary>
-            <remarks>
-            <para>
-            <see cref="T:log4net.Repository.Hierarchy.ProvisionNode"/> instances are used in the 
-            <see cref="T:log4net.Repository.Hierarchy.Hierarchy"/> when there is no specified 
-            <see cref="T:log4net.Repository.Hierarchy.Logger"/> for that node.
-            </para>
-            <para>
-            A provision node holds a list of child loggers on behalf of
-            a logger that does not exist.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-        </member>
-        <member name="M:log4net.Repository.Hierarchy.ProvisionNode.#ctor(log4net.Repository.Hierarchy.Logger)">
-            <summary>
-            Create a new provision node with child node
-            </summary>
-            <param name="log">A child logger to add to this node.</param>
-            <remarks>
-            <para>
-            Initializes a new instance of the <see cref="T:log4net.Repository.Hierarchy.ProvisionNode"/> class 
-            with the specified child logger.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Repository.Hierarchy.RootLogger">
-            <summary>
-            The <see cref="T:log4net.Repository.Hierarchy.RootLogger"/> sits at the root of the logger hierarchy tree. 
-            </summary>
-            <remarks>
-            <para>
-            The <see cref="T:log4net.Repository.Hierarchy.RootLogger"/> is a regular <see cref="T:log4net.Repository.Hierarchy.Logger"/> except 
-            that it provides several guarantees.
-            </para>
-            <para>
-            First, it cannot be assigned a <c>null</c>
-            level. Second, since the root logger cannot have a parent, the
-            <see cref="P:log4net.Repository.Hierarchy.RootLogger.EffectiveLevel"/> property always returns the value of the
-            level field without walking the hierarchy.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-        </member>
-        <member name="M:log4net.Repository.Hierarchy.RootLogger.#ctor(log4net.Core.Level)">
-            <summary>
-            Construct a <see cref="T:log4net.Repository.Hierarchy.RootLogger"/>
-            </summary>
-            <param name="level">The level to assign to the root logger.</param>
-            <remarks>
-            <para>
-            Initializes a new instance of the <see cref="T:log4net.Repository.Hierarchy.RootLogger"/> class with
-            the specified logging level.
-            </para>
-            <para>
-            The root logger names itself as "root". However, the root
-            logger cannot be retrieved by name.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Repository.Hierarchy.RootLogger.EffectiveLevel">
-            <summary>
-            Gets the assigned level value without walking the logger hierarchy.
-            </summary>
-            <value>The assigned level value without walking the logger hierarchy.</value>
-            <remarks>
-            <para>
-            Because the root logger cannot have a parent and its level
-            must not be <c>null</c> this property just returns the
-            value of <see cref="P:log4net.Repository.Hierarchy.Logger.Level"/>.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Repository.Hierarchy.RootLogger.Level">
-            <summary>
-            Gets or sets the assigned <see cref="P:log4net.Repository.Hierarchy.RootLogger.Level"/> for the root logger.  
-            </summary>
-            <value>
-            The <see cref="P:log4net.Repository.Hierarchy.RootLogger.Level"/> of the root logger.
-            </value>
-            <remarks>
-            <para>
-            Setting the level of the root logger to a <c>null</c> reference
-            may have catastrophic results. We prevent this here.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Repository.Hierarchy.XmlHierarchyConfigurator">
-            <summary>
-            Initializes the log4net environment using an XML DOM.
-            </summary>
-            <remarks>
-            <para>
-            Configures a <see cref="T:log4net.Repository.Hierarchy.Hierarchy"/> using an XML DOM.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-        </member>
-        <member name="M:log4net.Repository.Hierarchy.XmlHierarchyConfigurator.#ctor(log4net.Repository.Hierarchy.Hierarchy)">
-            <summary>
-            Construct the configurator for a hierarchy
-            </summary>
-            <param name="hierarchy">The hierarchy to build.</param>
-            <remarks>
-            <para>
-            Initializes a new instance of the <see cref="T:log4net.Repository.Hierarchy.XmlHierarchyConfigurator"/> class
-            with the specified <see cref="T:log4net.Repository.Hierarchy.Hierarchy"/>.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Repository.Hierarchy.XmlHierarchyConfigurator.Configure(System.Xml.XmlElement)">
-            <summary>
-            Configure the hierarchy by parsing a DOM tree of XML elements.
-            </summary>
-            <param name="element">The root element to parse.</param>
-            <remarks>
-            <para>
-            Configure the hierarchy by parsing a DOM tree of XML elements.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Repository.Hierarchy.XmlHierarchyConfigurator.FindAppenderByReference(System.Xml.XmlElement)">
-            <summary>
-            Parse appenders by IDREF.
-            </summary>
-            <param name="appenderRef">The appender ref element.</param>
-            <returns>The instance of the appender that the ref refers to.</returns>
-            <remarks>
-            <para>
-            Parse an XML element that represents an appender and return 
-            the appender.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Repository.Hierarchy.XmlHierarchyConfigurator.ParseAppender(System.Xml.XmlElement)">
-            <summary>
-            Parses an appender element.
-            </summary>
-            <param name="appenderElement">The appender element.</param>
-            <returns>The appender instance or <c>null</c> when parsing failed.</returns>
-            <remarks>
-            <para>
-            Parse an XML element that represents an appender and return
-            the appender instance.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Repository.Hierarchy.XmlHierarchyConfigurator.ParseLogger(System.Xml.XmlElement)">
-            <summary>
-            Parses a logger element.
-            </summary>
-            <param name="loggerElement">The logger element.</param>
-            <remarks>
-            <para>
-            Parse an XML element that represents a logger.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Repository.Hierarchy.XmlHierarchyConfigurator.ParseRoot(System.Xml.XmlElement)">
-            <summary>
-            Parses the root logger element.
-            </summary>
-            <param name="rootElement">The root element.</param>
-            <remarks>
-            <para>
-            Parse an XML element that represents the root logger.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Repository.Hierarchy.XmlHierarchyConfigurator.ParseChildrenOfLoggerElement(System.Xml.XmlElement,log4net.Repository.Hierarchy.Logger,System.Boolean)">
-            <summary>
-            Parses the children of a logger element.
-            </summary>
-            <param name="catElement">The category element.</param>
-            <param name="log">The logger instance.</param>
-            <param name="isRoot">Flag to indicate if the logger is the root logger.</param>
-            <remarks>
-            <para>
-            Parse the child elements of a &lt;logger&gt; element.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Repository.Hierarchy.XmlHierarchyConfigurator.ParseRenderer(System.Xml.XmlElement)">
-            <summary>
-            Parses an object renderer.
-            </summary>
-            <param name="element">The renderer element.</param>
-            <remarks>
-            <para>
-            Parse an XML element that represents a renderer.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Repository.Hierarchy.XmlHierarchyConfigurator.ParseLevel(System.Xml.XmlElement,log4net.Repository.Hierarchy.Logger,System.Boolean)">
-            <summary>
-            Parses a level element.
-            </summary>
-            <param name="element">The level element.</param>
-            <param name="log">The logger object to set the level on.</param>
-            <param name="isRoot">Flag to indicate if the logger is the root logger.</param>
-            <remarks>
-            <para>
-            Parse an XML element that represents a level.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Repository.Hierarchy.XmlHierarchyConfigurator.SetParameter(System.Xml.XmlElement,System.Object)">
-            <summary>
-            Sets a parameter on an object.
-            </summary>
-            <param name="element">The parameter element.</param>
-            <param name="target">The object to set the parameter on.</param>
-            <remarks>
-            The parameter name must correspond to a writable property
-            on the object. The value of the parameter is a string,
-            therefore this function will attempt to set a string
-            property first. If unable to set a string property it
-            will inspect the property and its argument type. It will
-            attempt to call a static method called <c>Parse</c> on the
-            type of the property. This method will take a single
-            string argument and return a value that can be used to
-            set the property.
-            </remarks>
-        </member>
-        <member name="M:log4net.Repository.Hierarchy.XmlHierarchyConfigurator.HasAttributesOrElements(System.Xml.XmlElement)">
-            <summary>
-            Test if an element has no attributes or child elements
-            </summary>
-            <param name="element">the element to inspect</param>
-            <returns><c>true</c> if the element has any attributes or child elements, <c>false</c> otherwise</returns>
-        </member>
-        <member name="M:log4net.Repository.Hierarchy.XmlHierarchyConfigurator.IsTypeConstructible(System.Type)">
-            <summary>
-            Test if a <see cref="T:System.Type"/> is constructible with <c>Activator.CreateInstance</c>.
-            </summary>
-            <param name="type">the type to inspect</param>
-            <returns><c>true</c> if the type is creatable using a default constructor, <c>false</c> otherwise</returns>
-        </member>
-        <member name="M:log4net.Repository.Hierarchy.XmlHierarchyConfigurator.FindMethodInfo(System.Type,System.String)">
-            <summary>
-            Look for a method on the <paramref name="targetType"/> that matches the <paramref name="name"/> supplied
-            </summary>
-            <param name="targetType">the type that has the method</param>
-            <param name="name">the name of the method</param>
-            <returns>the method info found</returns>
-            <remarks>
-            <para>
-            The method must be a public instance method on the <paramref name="targetType"/>.
-            The method must be named <paramref name="name"/> or "Add" followed by <paramref name="name"/>.
-            The method must take a single parameter.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Repository.Hierarchy.XmlHierarchyConfigurator.ConvertStringTo(System.Type,System.String)">
-            <summary>
-            Converts a string value to a target type.
-            </summary>
-            <param name="type">The type of object to convert the string to.</param>
-            <param name="value">The string value to use as the value of the object.</param>
-            <returns>
-            <para>
-            An object of type <paramref name="type"/> with value <paramref name="value"/> or 
-            <c>null</c> when the conversion could not be performed.
-            </para>
-            </returns>
-        </member>
-        <member name="M:log4net.Repository.Hierarchy.XmlHierarchyConfigurator.CreateObjectFromXml(System.Xml.XmlElement,System.Type,System.Type)">
-            <summary>
-            Creates an object as specified in XML.
-            </summary>
-            <param name="element">The XML element that contains the definition of the object.</param>
-            <param name="defaultTargetType">The object type to use if not explicitly specified.</param>
-            <param name="typeConstraint">The type that the returned object must be or must inherit from.</param>
-            <returns>The object or <c>null</c></returns>
-            <remarks>
-            <para>
-            Parse an XML element and create an object instance based on the configuration
-            data.
-            </para>
-            <para>
-            The type of the instance may be specified in the XML. If not
-            specified then the <paramref name="defaultTargetType"/> is used
-            as the type. However the type is specified it must support the
-            <paramref name="typeConstraint"/> type.
-            </para>
-            </remarks>
-        </member>
-        <member name="F:log4net.Repository.Hierarchy.XmlHierarchyConfigurator.m_appenderBag">
-            <summary>
-            key: appenderName, value: appender.
-            </summary>
-        </member>
-        <member name="F:log4net.Repository.Hierarchy.XmlHierarchyConfigurator.m_hierarchy">
-            <summary>
-            The Hierarchy being configured.
-            </summary>
-        </member>
-        <member name="T:log4net.Repository.LoggerRepositoryShutdownEventHandler">
-            <summary>
-            Delegate used to handle logger repository shutdown event notifications
-            </summary>
-            <param name="sender">The <see cref="T:log4net.Repository.ILoggerRepository"/> that is shutting down.</param>
-            <param name="e">Empty event args</param>
-            <remarks>
-            <para>
-            Delegate used to handle logger repository shutdown event notifications.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Repository.LoggerRepositoryConfigurationResetEventHandler">
-            <summary>
-            Delegate used to handle logger repository configuration reset event notifications
-            </summary>
-            <param name="sender">The <see cref="T:log4net.Repository.ILoggerRepository"/> that has had its configuration reset.</param>
-            <param name="e">Empty event args</param>
-            <remarks>
-            <para>
-            Delegate used to handle logger repository configuration reset event notifications.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Repository.LoggerRepositoryConfigurationChangedEventHandler">
-            <summary>
-            Delegate used to handle event notifications for logger repository configuration changes.
-            </summary>
-            <param name="sender">The <see cref="T:log4net.Repository.ILoggerRepository"/> that has had its configuration changed.</param>
-            <param name="e">Empty event arguments.</param>
-            <remarks>
-            <para>
-            Delegate used to handle event notifications for logger repository configuration changes.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Util.PatternStringConverters.AppDomainPatternConverter">
-            <summary>
-            Write the name of the current AppDomain to the output
-            </summary>
-            <remarks>
-            <para>
-            Write the name of the current AppDomain to the output writer
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-        </member>
-        <member name="M:log4net.Util.PatternStringConverters.AppDomainPatternConverter.Convert(System.IO.TextWriter,System.Object)">
-            <summary>
-            Write the name of the current AppDomain to the output
-            </summary>
-            <param name="writer">the writer to write to</param>
-            <param name="state">null, state is not set</param>
-            <remarks>
-            <para>
-            Writes name of the current AppDomain to the output <paramref name="writer"/>.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Util.PatternStringConverters.DatePatternConverter">
-            <summary>
-            Write the current date to the output
-            </summary>
-            <remarks>
-            <para>
-            Date pattern converter, uses a <see cref="T:log4net.DateFormatter.IDateFormatter"/> to format 
-            the current date and time to the writer as a string.
-            </para>
-            <para>
-            The value of the <see cref="P:log4net.Util.PatternConverter.Option"/> determines 
-            the formatting of the date. The following values are allowed:
-            <list type="definition">
-            	<listheader>
-            		<term>Option value</term>
-            		<description>Output</description>
-            	</listheader>
-            	<item>
-            		<term>ISO8601</term>
-            		<description>
-            		Uses the <see cref="T:log4net.DateFormatter.Iso8601DateFormatter"/> formatter. 
-            		Formats using the <c>"yyyy-MM-dd HH:mm:ss,fff"</c> pattern.
-            		</description>
-            	</item>
-            	<item>
-            		<term>DATE</term>
-            		<description>
-            		Uses the <see cref="T:log4net.DateFormatter.DateTimeDateFormatter"/> formatter. 
-            		Formats using the <c>"dd MMM yyyy HH:mm:ss,fff"</c> for example, <c>"06 Nov 1994 15:49:37,459"</c>.
-            		</description>
-            	</item>
-            	<item>
-            		<term>ABSOLUTE</term>
-            		<description>
-            		Uses the <see cref="T:log4net.DateFormatter.AbsoluteTimeDateFormatter"/> formatter. 
-            		Formats using the <c>"HH:mm:ss,fff"</c> for example, <c>"15:49:37,459"</c>.
-            		</description>
-            	</item>
-            	<item>
-            		<term>other</term>
-            		<description>
-            		Any other pattern string uses the <see cref="T:log4net.DateFormatter.SimpleDateFormatter"/> formatter. 
-            		This formatter passes the pattern string to the <see cref="T:System.DateTime"/> 
-            		<see cref="M:System.DateTime.ToString(System.String)"/> method.
-            		For details on valid patterns see 
-            		<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfsystemglobalizationdatetimeformatinfoclasstopic.asp">DateTimeFormatInfo Class</a>.
-            		</description>
-            	</item>
-            </list>
-            </para>
-            <para>
-            The date and time is in the local time zone and is rendered in that zone.
-            To output the time in Universal time see <see cref="T:log4net.Util.PatternStringConverters.UtcDatePatternConverter"/>.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-        </member>
-        <member name="F:log4net.Util.PatternStringConverters.DatePatternConverter.m_dateFormatter">
-            <summary>
-            The <see cref="T:log4net.DateFormatter.IDateFormatter"/> used to render the date to a string
-            </summary>
-            <remarks>
-            <para>
-            The <see cref="T:log4net.DateFormatter.IDateFormatter"/> used to render the date to a string
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.PatternStringConverters.DatePatternConverter.ActivateOptions">
-            <summary>
-            Initialize the converter options
-            </summary>
-            <remarks>
-            <para>
-            This is part of the <see cref="T:log4net.Core.IOptionHandler"/> delayed object
-            activation scheme. The <see cref="M:log4net.Util.PatternStringConverters.DatePatternConverter.ActivateOptions"/> method must 
-            be called on this object after the configuration properties have
-            been set. Until <see cref="M:log4net.Util.PatternStringConverters.DatePatternConverter.ActivateOptions"/> is called this
-            object is in an undefined state and must not be used. 
-            </para>
-            <para>
-            If any of the configuration properties are modified then 
-            <see cref="M:log4net.Util.PatternStringConverters.DatePatternConverter.ActivateOptions"/> must be called again.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.PatternStringConverters.DatePatternConverter.Convert(System.IO.TextWriter,System.Object)">
-            <summary>
-            Write the current date to the output
-            </summary>
-            <param name="writer"><see cref="T:System.IO.TextWriter"/> that will receive the formatted result.</param>
-            <param name="state">null, state is not set</param>
-            <remarks>
-            <para>
-            Pass the current date and time to the <see cref="T:log4net.DateFormatter.IDateFormatter"/>
-            for it to render it to the writer.
-            </para>
-            <para>
-            The date and time passed is in the local time zone.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Util.PatternStringConverters.EnvironmentPatternConverter">
-            <summary>
-            Write an environment variable to the output
-            </summary>
-            <remarks>
-            <para>
-            Write an environment variable to the output writer.
-            The value of the <see cref="P:log4net.Util.PatternConverter.Option"/> determines 
-            the name of the variable to output.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-        </member>
-        <member name="M:log4net.Util.PatternStringConverters.EnvironmentPatternConverter.Convert(System.IO.TextWriter,System.Object)">
-            <summary>
-            Write an environment variable to the output
-            </summary>
-            <param name="writer">the writer to write to</param>
-            <param name="state">null, state is not set</param>
-            <remarks>
-            <para>
-            Writes the environment variable to the output <paramref name="writer"/>.
-            The name of the environment variable to output must be set
-            using the <see cref="P:log4net.Util.PatternConverter.Option"/>
-            property.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Util.PatternStringConverters.IdentityPatternConverter">
-            <summary>
-            Write the current thread identity to the output
-            </summary>
-            <remarks>
-            <para>
-            Write the current thread identity to the output writer
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-        </member>
-        <member name="M:log4net.Util.PatternStringConverters.IdentityPatternConverter.Convert(System.IO.TextWriter,System.Object)">
-            <summary>
-            Write the current thread identity to the output
-            </summary>
-            <param name="writer">the writer to write to</param>
-            <param name="state">null, state is not set</param>
-            <remarks>
-            <para>
-            Writes the current thread identity to the output <paramref name="writer"/>.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Util.PatternStringConverters.LiteralPatternConverter">
-            <summary>
-            Pattern converter for literal string instances in the pattern
-            </summary>
-            <remarks>
-            <para>
-            Writes the literal string value specified in the 
-            <see cref="P:log4net.Util.PatternConverter.Option"/> property to 
-            the output.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-        </member>
-        <member name="M:log4net.Util.PatternStringConverters.LiteralPatternConverter.SetNext(log4net.Util.PatternConverter)">
-            <summary>
-            Set the next converter in the chain
-            </summary>
-            <param name="pc">The next pattern converter in the chain</param>
-            <returns>The next pattern converter</returns>
-            <remarks>
-            <para>
-            Special case the building of the pattern converter chain
-            for <see cref="T:log4net.Util.PatternStringConverters.LiteralPatternConverter"/> instances. Two adjacent
-            literals in the pattern can be represented by a single combined
-            pattern converter. This implementation detects when a 
-            <see cref="T:log4net.Util.PatternStringConverters.LiteralPatternConverter"/> is added to the chain
-            after this converter and combines its value with this converter's
-            literal value.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.PatternStringConverters.LiteralPatternConverter.Format(System.IO.TextWriter,System.Object)">
-            <summary>
-            Write the literal to the output
-            </summary>
-            <param name="writer">the writer to write to</param>
-            <param name="state">null, not set</param>
-            <remarks>
-            <para>
-            Override the formatting behavior to ignore the FormattingInfo
-            because we have a literal instead.
-            </para>
-            <para>
-            Writes the value of <see cref="P:log4net.Util.PatternConverter.Option"/>
-            to the output <paramref name="writer"/>.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.PatternStringConverters.LiteralPatternConverter.Convert(System.IO.TextWriter,System.Object)">
-            <summary>
-            Convert this pattern into the rendered message
-            </summary>
-            <param name="writer"><see cref="T:System.IO.TextWriter"/> that will receive the formatted result.</param>
-            <param name="state">null, not set</param>
-            <remarks>
-            <para>
-            This method is not used.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Util.PatternStringConverters.NewLinePatternConverter">
-            <summary>
-            Writes a newline to the output
-            </summary>
-            <remarks>
-            <para>
-            Writes the system dependent line terminator to the output.
-            This behavior can be overridden by setting the <see cref="P:log4net.Util.PatternConverter.Option"/>:
-            </para>
-            <list type="definition">
-              <listheader>
-                <term>Option Value</term>
-                <description>Output</description>
-              </listheader>
-              <item>
-                <term>DOS</term>
-                <description>DOS or Windows line terminator <c>"\r\n"</c></description>
-              </item>
-              <item>
-                <term>UNIX</term>
-                <description>UNIX line terminator <c>"\n"</c></description>
-              </item>
-            </list>
-            </remarks>
-            <author>Nicko Cadell</author>
-        </member>
-        <member name="M:log4net.Util.PatternStringConverters.NewLinePatternConverter.ActivateOptions">
-            <summary>
-            Initialize the converter
-            </summary>
-            <remarks>
-            <para>
-            This is part of the <see cref="T:log4net.Core.IOptionHandler"/> delayed object
-            activation scheme. The <see cref="M:log4net.Util.PatternStringConverters.NewLinePatternConverter.ActivateOptions"/> method must 
-            be called on this object after the configuration properties have
-            been set. Until <see cref="M:log4net.Util.PatternStringConverters.NewLinePatternConverter.ActivateOptions"/> is called this
-            object is in an undefined state and must not be used. 
-            </para>
-            <para>
-            If any of the configuration properties are modified then 
-            <see cref="M:log4net.Util.PatternStringConverters.NewLinePatternConverter.ActivateOptions"/> must be called again.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Util.PatternStringConverters.ProcessIdPatternConverter">
-            <summary>
-            Write the current process ID to the output
-            </summary>
-            <remarks>
-            <para>
-            Write the current process ID to the output writer
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-        </member>
-        <member name="M:log4net.Util.PatternStringConverters.ProcessIdPatternConverter.Convert(System.IO.TextWriter,System.Object)">
-            <summary>
-            Write the current process ID to the output
-            </summary>
-            <param name="writer">the writer to write to</param>
-            <param name="state">null, state is not set</param>
-            <remarks>
-            <para>
-            Write the current process ID to the output <paramref name="writer"/>.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Util.PatternStringConverters.PropertyPatternConverter">
-            <summary>
-            Property pattern converter
-            </summary>
-            <remarks>
-            <para>
-            This pattern converter reads the thread and global properties.
-            The thread properties take priority over global properties.
-            See <see cref="P:log4net.ThreadContext.Properties"/> for details of the 
-            thread properties. See <see cref="P:log4net.GlobalContext.Properties"/> for
-            details of the global properties.
-            </para>
-            <para>
-            If the <see cref="P:log4net.Util.PatternConverter.Option"/> is specified then that will be used to
-            lookup a single property. If no <see cref="P:log4net.Util.PatternConverter.Option"/> is specified
-            then all properties will be dumped as a list of key value pairs.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-        </member>
-        <member name="M:log4net.Util.PatternStringConverters.PropertyPatternConverter.Convert(System.IO.TextWriter,System.Object)">
-            <summary>
-            Write the property value to the output
-            </summary>
-            <param name="writer"><see cref="T:System.IO.TextWriter"/> that will receive the formatted result.</param>
-            <param name="state">null, state is not set</param>
-            <remarks>
-            <para>
-            Writes out the value of a named property. The property name
-            should be set in the <see cref="P:log4net.Util.PatternConverter.Option"/>
-            property.
-            </para>
-            <para>
-            If the <see cref="P:log4net.Util.PatternConverter.Option"/> is set to <c>null</c>
-            then all the properties are written as key value pairs.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Util.PatternStringConverters.RandomStringPatternConverter">
-            <summary>
-            A Pattern converter that generates a string of random characters
-            </summary>
-            <remarks>
-            <para>
-            The converter generates a string of random characters. By default
-            the string is length 4. This can be changed by setting the <see cref="P:log4net.Util.PatternConverter.Option"/>
-            to the string value of the length required.
-            </para>
-            <para>
-            The random characters in the string are limited to uppercase letters
-            and numbers only.
-            </para>
-            <para>
-            The random number generator used by this class is not cryptographically secure.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-        </member>
-        <member name="F:log4net.Util.PatternStringConverters.RandomStringPatternConverter.s_random">
-            <summary>
-            Shared random number generator
-            </summary>
-        </member>
-        <member name="F:log4net.Util.PatternStringConverters.RandomStringPatternConverter.m_length">
-            <summary>
-            Length of random string to generate. Default length 4.
-            </summary>
-        </member>
-        <member name="M:log4net.Util.PatternStringConverters.RandomStringPatternConverter.ActivateOptions">
-            <summary>
-            Initialize the converter options
-            </summary>
-            <remarks>
-            <para>
-            This is part of the <see cref="T:log4net.Core.IOptionHandler"/> delayed object
-            activation scheme. The <see cref="M:log4net.Util.PatternStringConverters.RandomStringPatternConverter.ActivateOptions"/> method must 
-            be called on this object after the configuration properties have
-            been set. Until <see cref="M:log4net.Util.PatternStringConverters.RandomStringPatternConverter.ActivateOptions"/> is called this
-            object is in an undefined state and must not be used. 
-            </para>
-            <para>
-            If any of the configuration properties are modified then 
-            <see cref="M:log4net.Util.PatternStringConverters.RandomStringPatternConverter.ActivateOptions"/> must be called again.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.PatternStringConverters.RandomStringPatternConverter.Convert(System.IO.TextWriter,System.Object)">
-            <summary>
-            Write a randoim string to the output
-            </summary>
-            <param name="writer">the writer to write to</param>
-            <param name="state">null, state is not set</param>
-            <remarks>
-            <para>
-            Write a randoim string to the output <paramref name="writer"/>.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Util.PatternStringConverters.UserNamePatternConverter">
-            <summary>
-            Write the current threads username to the output
-            </summary>
-            <remarks>
-            <para>
-            Write the current threads username to the output writer
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-        </member>
-        <member name="M:log4net.Util.PatternStringConverters.UserNamePatternConverter.Convert(System.IO.TextWriter,System.Object)">
-            <summary>
-            Write the current threads username to the output
-            </summary>
-            <param name="writer">the writer to write to</param>
-            <param name="state">null, state is not set</param>
-            <remarks>
-            <para>
-            Write the current threads username to the output <paramref name="writer"/>.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Util.PatternStringConverters.UtcDatePatternConverter">
-            <summary>
-            Write the UTC date time to the output
-            </summary>
-            <remarks>
-            <para>
-            Date pattern converter, uses a <see cref="T:log4net.DateFormatter.IDateFormatter"/> to format 
-            the current date and time in Universal time.
-            </para>
-            <para>
-            See the <see cref="T:log4net.Util.PatternStringConverters.DatePatternConverter"/> for details on the date pattern syntax.
-            </para>
-            </remarks>
-            <seealso cref="T:log4net.Util.PatternStringConverters.DatePatternConverter"/>
-            <author>Nicko Cadell</author>
-        </member>
-        <member name="M:log4net.Util.PatternStringConverters.UtcDatePatternConverter.Convert(System.IO.TextWriter,System.Object)">
-            <summary>
-            Write the current date and time to the output
-            </summary>
-            <param name="writer"><see cref="T:System.IO.TextWriter"/> that will receive the formatted result.</param>
-            <param name="state">null, state is not set</param>
-            <remarks>
-            <para>
-            Pass the current date and time to the <see cref="T:log4net.DateFormatter.IDateFormatter"/>
-            for it to render it to the writer.
-            </para>
-            <para>
-            The date is in Universal time when it is rendered.
-            </para>
-            </remarks>
-            <seealso cref="T:log4net.Util.PatternStringConverters.DatePatternConverter"/>
-        </member>
-        <member name="T:log4net.Util.TypeConverters.BooleanConverter">
-            <summary>
-            Type converter for Boolean.
-            </summary>
-            <remarks>
-            <para>
-            Supports conversion from string to <c>bool</c> type.
-            </para>
-            </remarks>
-            <seealso cref="T:log4net.Util.TypeConverters.ConverterRegistry"/>
-            <seealso cref="T:log4net.Util.TypeConverters.IConvertFrom"/>
-            <seealso cref="T:log4net.Util.TypeConverters.IConvertTo"/>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-        </member>
-        <member name="M:log4net.Util.TypeConverters.BooleanConverter.CanConvertFrom(System.Type)">
-            <summary>
-            Can the source type be converted to the type supported by this object
-            </summary>
-            <param name="sourceType">the type to convert</param>
-            <returns>true if the conversion is possible</returns>
-            <remarks>
-            <para>
-            Returns <c>true</c> if the <paramref name="sourceType"/> is
-            the <see cref="T:System.String"/> type.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.TypeConverters.BooleanConverter.ConvertFrom(System.Object)">
-            <summary>
-            Convert the source object to the type supported by this object
-            </summary>
-            <param name="source">the object to convert</param>
-            <returns>the converted object</returns>
-            <remarks>
-            <para>
-            Uses the <see cref="M:System.Boolean.Parse(System.String)"/> method to convert the
-            <see cref="T:System.String"/> argument to a <see cref="T:System.Boolean"/>.
-            </para>
-            </remarks>
-            <exception cref="T:log4net.Util.TypeConverters.ConversionNotSupportedException">
-            The <paramref name="source"/> object cannot be converted to the
-            target type. To check for this condition use the <see cref="M:log4net.Util.TypeConverters.BooleanConverter.CanConvertFrom(System.Type)"/>
-            method.
-            </exception>
-        </member>
-        <member name="T:log4net.Util.TypeConverters.ConversionNotSupportedException">
-            <summary>
-            Exception base type for conversion errors.
-            </summary>
-            <remarks>
-            <para>
-            This type extends <see cref="T:System.ApplicationException"/>. It
-            does not add any new functionality but does differentiate the
-            type of exception being thrown.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-        </member>
-        <member name="M:log4net.Util.TypeConverters.ConversionNotSupportedException.#ctor">
-            <summary>
-            Constructor
-            </summary>
-            <remarks>
-            <para>
-            Initializes a new instance of the <see cref="T:log4net.Util.TypeConverters.ConversionNotSupportedException"/> class.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.TypeConverters.ConversionNotSupportedException.#ctor(System.String)">
-            <summary>
-            Constructor
-            </summary>
-            <param name="message">A message to include with the exception.</param>
-            <remarks>
-            <para>
-            Initializes a new instance of the <see cref="T:log4net.Util.TypeConverters.ConversionNotSupportedException"/> class
-            with the specified message.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.TypeConverters.ConversionNotSupportedException.#ctor(System.String,System.Exception)">
-            <summary>
-            Constructor
-            </summary>
-            <param name="message">A message to include with the exception.</param>
-            <param name="innerException">A nested exception to include.</param>
-            <remarks>
-            <para>
-            Initializes a new instance of the <see cref="T:log4net.Util.TypeConverters.ConversionNotSupportedException"/> class
-            with the specified message and inner exception.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.TypeConverters.ConversionNotSupportedException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
-            <summary>
-            Serialization constructor
-            </summary>
-            <param name="info">The <see cref="T:System.Runtime.Serialization.SerializationInfo"/> that holds the serialized object data about the exception being thrown.</param>
-            <param name="context">The <see cref="T:System.Runtime.Serialization.StreamingContext"/> that contains contextual information about the source or destination.</param>
-            <remarks>
-            <para>
-            Initializes a new instance of the <see cref="T:log4net.Util.TypeConverters.ConversionNotSupportedException"/> class 
-            with serialized data.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.TypeConverters.ConversionNotSupportedException.Create(System.Type,System.Object)">
-            <summary>
-            Creates a new instance of the <see cref="T:log4net.Util.TypeConverters.ConversionNotSupportedException"/> class.
-            </summary>
-            <param name="destinationType">The conversion destination type.</param>
-            <param name="sourceValue">The value to convert.</param>
-            <returns>An instance of the <see cref="T:log4net.Util.TypeConverters.ConversionNotSupportedException"/>.</returns>
-            <remarks>
-            <para>
-            Creates a new instance of the <see cref="T:log4net.Util.TypeConverters.ConversionNotSupportedException"/> class.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.TypeConverters.ConversionNotSupportedException.Create(System.Type,System.Object,System.Exception)">
-            <summary>
-            Creates a new instance of the <see cref="T:log4net.Util.TypeConverters.ConversionNotSupportedException"/> class.
-            </summary>
-            <param name="destinationType">The conversion destination type.</param>
-            <param name="sourceValue">The value to convert.</param>
-            <param name="innerException">A nested exception to include.</param>
-            <returns>An instance of the <see cref="T:log4net.Util.TypeConverters.ConversionNotSupportedException"/>.</returns>
-            <remarks>
-            <para>
-            Creates a new instance of the <see cref="T:log4net.Util.TypeConverters.ConversionNotSupportedException"/> class.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Util.TypeConverters.ConverterRegistry">
-            <summary>
-            Register of type converters for specific types.
-            </summary>
-            <remarks>
-            <para>
-            Maintains a registry of type converters used to convert between
-            types.
-            </para>
-            <para>
-            Use the <see cref="M:log4net.Util.TypeConverters.ConverterRegistry.AddConverter(System.Type,System.Object)"/> and 
-            <see cref="M:log4net.Util.TypeConverters.ConverterRegistry.AddConverter(System.Type,System.Type)"/> methods to register new converters.
-            The <see cref="M:log4net.Util.TypeConverters.ConverterRegistry.GetConvertTo(System.Type,System.Type)"/> and <see cref="M:log4net.Util.TypeConverters.ConverterRegistry.GetConvertFrom(System.Type)"/> methods
-            lookup appropriate converters to use.
-            </para>
-            </remarks>
-            <seealso cref="T:log4net.Util.TypeConverters.IConvertFrom"/>
-            <seealso cref="T:log4net.Util.TypeConverters.IConvertTo"/>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-        </member>
-        <member name="M:log4net.Util.TypeConverters.ConverterRegistry.#ctor">
-            <summary>
-            Private constructor
-            </summary>
-            <remarks>
-            Initializes a new instance of the <see cref="T:log4net.Util.TypeConverters.ConverterRegistry"/> class.
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.TypeConverters.ConverterRegistry.#cctor">
-            <summary>
-            Static constructor.
-            </summary>
-            <remarks>
-            <para>
-            This constructor defines the intrinsic type converters.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.TypeConverters.ConverterRegistry.AddConverter(System.Type,System.Object)">
-            <summary>
-            Adds a converter for a specific type.
-            </summary>
-            <param name="destinationType">The type being converted to.</param>
-            <param name="converter">The type converter to use to convert to the destination type.</param>
-            <remarks>
-            <para>
-            Adds a converter instance for a specific type.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.TypeConverters.ConverterRegistry.AddConverter(System.Type,System.Type)">
-            <summary>
-            Adds a converter for a specific type.
-            </summary>
-            <param name="destinationType">The type being converted to.</param>
-            <param name="converterType">The type of the type converter to use to convert to the destination type.</param>
-            <remarks>
-            <para>
-            Adds a converter <see cref="T:System.Type"/> for a specific type.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.TypeConverters.ConverterRegistry.GetConvertTo(System.Type,System.Type)">
-            <summary>
-            Gets the type converter to use to convert values to the destination type.
-            </summary>
-            <param name="sourceType">The type being converted from.</param>
-            <param name="destinationType">The type being converted to.</param>
-            <returns>
-            The type converter instance to use for type conversions or <c>null</c> 
-            if no type converter is found.
-            </returns>
-            <remarks>
-            <para>
-            Gets the type converter to use to convert values to the destination type.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.TypeConverters.ConverterRegistry.GetConvertFrom(System.Type)">
-            <summary>
-            Gets the type converter to use to convert values to the destination type.
-            </summary>
-            <param name="destinationType">The type being converted to.</param>
-            <returns>
-            The type converter instance to use for type conversions or <c>null</c> 
-            if no type converter is found.
-            </returns>
-            <remarks>
-            <para>
-            Gets the type converter to use to convert values to the destination type.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.TypeConverters.ConverterRegistry.GetConverterFromAttribute(System.Type)">
-            <summary>
-            Lookups the type converter to use as specified by the attributes on the 
-            destination type.
-            </summary>
-            <param name="destinationType">The type being converted to.</param>
-            <returns>
-            The type converter instance to use for type conversions or <c>null</c> 
-            if no type converter is found.
-            </returns>
-        </member>
-        <member name="M:log4net.Util.TypeConverters.ConverterRegistry.CreateConverterInstance(System.Type)">
-            <summary>
-            Creates the instance of the type converter.
-            </summary>
-            <param name="converterType">The type of the type converter.</param>
-            <returns>
-            The type converter instance to use for type conversions or <c>null</c> 
-            if no type converter is found.
-            </returns>
-            <remarks>
-            <para>
-            The type specified for the type converter must implement 
-            the <see cref="T:log4net.Util.TypeConverters.IConvertFrom"/> or <see cref="T:log4net.Util.TypeConverters.IConvertTo"/> interfaces 
-            and must have a public default (no argument) constructor.
-            </para>
-            </remarks>
-        </member>
-        <member name="F:log4net.Util.TypeConverters.ConverterRegistry.s_type2converter">
-            <summary>
-            Mapping from <see cref="T:System.Type"/> to type converter.
-            </summary>
-        </member>
-        <member name="T:log4net.Util.TypeConverters.EncodingConverter">
-            <summary>
-            Supports conversion from string to <see cref="T:System.Text.Encoding"/> type.
-            </summary>
-            <remarks>
-            <para>
-            Supports conversion from string to <see cref="T:System.Text.Encoding"/> type.
-            </para>
-            </remarks>
-            <seealso cref="T:log4net.Util.TypeConverters.ConverterRegistry"/>
-            <seealso cref="T:log4net.Util.TypeConverters.IConvertFrom"/>
-            <seealso cref="T:log4net.Util.TypeConverters.IConvertTo"/>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-        </member>
-        <member name="M:log4net.Util.TypeConverters.EncodingConverter.CanConvertFrom(System.Type)">
-            <summary>
-            Can the source type be converted to the type supported by this object
-            </summary>
-            <param name="sourceType">the type to convert</param>
-            <returns>true if the conversion is possible</returns>
-            <remarks>
-            <para>
-            Returns <c>true</c> if the <paramref name="sourceType"/> is
-            the <see cref="T:System.String"/> type.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.TypeConverters.EncodingConverter.ConvertFrom(System.Object)">
-            <summary>
-            Overrides the ConvertFrom method of IConvertFrom.
-            </summary>
-            <param name="source">the object to convert to an encoding</param>
-            <returns>the encoding</returns>
-            <remarks>
-            <para>
-            Uses the <see cref="M:System.Text.Encoding.GetEncoding(System.String)"/> method to 
-            convert the <see cref="T:System.String"/> argument to an <see cref="T:System.Text.Encoding"/>.
-            </para>
-            </remarks>
-            <exception cref="T:log4net.Util.TypeConverters.ConversionNotSupportedException">
-            The <paramref name="source"/> object cannot be converted to the
-            target type. To check for this condition use the <see cref="M:log4net.Util.TypeConverters.EncodingConverter.CanConvertFrom(System.Type)"/>
-            method.
-            </exception>
-        </member>
-        <member name="T:log4net.Util.TypeConverters.IConvertTo">
-            <summary>
-            Interface supported by type converters
-            </summary>
-            <remarks>
-            <para>
-            This interface supports conversion from a single type to arbitrary types.
-            See <see cref="T:log4net.Util.TypeConverters.TypeConverterAttribute"/>.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-        </member>
-        <member name="M:log4net.Util.TypeConverters.IConvertTo.CanConvertTo(System.Type)">
-            <summary>
-            Returns whether this converter can convert the object to the specified type
-            </summary>
-            <param name="targetType">A Type that represents the type you want to convert to</param>
-            <returns>true if the conversion is possible</returns>
-            <remarks>
-            <para>
-            Test if the type supported by this converter can be converted to the
-            <paramref name="targetType"/>.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.TypeConverters.IConvertTo.ConvertTo(System.Object,System.Type)">
-            <summary>
-            Converts the given value object to the specified type, using the arguments
-            </summary>
-            <param name="source">the object to convert</param>
-            <param name="targetType">The Type to convert the value parameter to</param>
-            <returns>the converted object</returns>
-            <remarks>
-            <para>
-            Converts the <paramref name="source"/> (which must be of the type supported
-            by this converter) to the <paramref name="targetType"/> specified..
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Util.TypeConverters.IPAddressConverter">
-            <summary>
-            Supports conversion from string to <see cref="T:System.Net.IPAddress"/> type.
-            </summary>
-            <remarks>
-            <para>
-            Supports conversion from string to <see cref="T:System.Net.IPAddress"/> type.
-            </para>
-            </remarks>
-            <seealso cref="T:log4net.Util.TypeConverters.ConverterRegistry"/>
-            <seealso cref="T:log4net.Util.TypeConverters.IConvertFrom"/>
-            <author>Nicko Cadell</author>
-        </member>
-        <member name="M:log4net.Util.TypeConverters.IPAddressConverter.CanConvertFrom(System.Type)">
-            <summary>
-            Can the source type be converted to the type supported by this object
-            </summary>
-            <param name="sourceType">the type to convert</param>
-            <returns>true if the conversion is possible</returns>
-            <remarks>
-            <para>
-            Returns <c>true</c> if the <paramref name="sourceType"/> is
-            the <see cref="T:System.String"/> type.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.TypeConverters.IPAddressConverter.ConvertFrom(System.Object)">
-            <summary>
-            Overrides the ConvertFrom method of IConvertFrom.
-            </summary>
-            <param name="source">the object to convert to an IPAddress</param>
-            <returns>the IPAddress</returns>
-            <remarks>
-            <para>
-            Uses the <see cref="M:System.Net.IPAddress.Parse(System.String)"/> method to convert the
-            <see cref="T:System.String"/> argument to an <see cref="T:System.Net.IPAddress"/>.
-            If that fails then the string is resolved as a DNS hostname.
-            </para>
-            </remarks>
-            <exception cref="T:log4net.Util.TypeConverters.ConversionNotSupportedException">
-            The <paramref name="source"/> object cannot be converted to the
-            target type. To check for this condition use the <see cref="M:log4net.Util.TypeConverters.IPAddressConverter.CanConvertFrom(System.Type)"/>
-            method.
-            </exception>
-        </member>
-        <member name="F:log4net.Util.TypeConverters.IPAddressConverter.validIpAddressChars">
-            <summary>
-            Valid characters in an IPv4 or IPv6 address string. (Does not support subnets)
-            </summary>
-        </member>
-        <member name="T:log4net.Util.TypeConverters.PatternLayoutConverter">
-            <summary>
-            Supports conversion from string to <see cref="T:log4net.Layout.PatternLayout"/> type.
-            </summary>
-            <remarks>
-            <para>
-            Supports conversion from string to <see cref="T:log4net.Layout.PatternLayout"/> type.
-            </para>
-            <para>
-            The string is used as the <see cref="P:log4net.Layout.PatternLayout.ConversionPattern"/> 
-            of the <see cref="T:log4net.Layout.PatternLayout"/>.
-            </para>
-            </remarks>
-            <seealso cref="T:log4net.Util.TypeConverters.ConverterRegistry"/>
-            <seealso cref="T:log4net.Util.TypeConverters.IConvertFrom"/>
-            <seealso cref="T:log4net.Util.TypeConverters.IConvertTo"/>
-            <author>Nicko Cadell</author>
-        </member>
-        <member name="M:log4net.Util.TypeConverters.PatternLayoutConverter.CanConvertFrom(System.Type)">
-            <summary>
-            Can the source type be converted to the type supported by this object
-            </summary>
-            <param name="sourceType">the type to convert</param>
-            <returns>true if the conversion is possible</returns>
-            <remarks>
-            <para>
-            Returns <c>true</c> if the <paramref name="sourceType"/> is
-            the <see cref="T:System.String"/> type.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.TypeConverters.PatternLayoutConverter.ConvertFrom(System.Object)">
-            <summary>
-            Overrides the ConvertFrom method of IConvertFrom.
-            </summary>
-            <param name="source">the object to convert to a PatternLayout</param>
-            <returns>the PatternLayout</returns>
-            <remarks>
-            <para>
-            Creates and returns a new <see cref="T:log4net.Layout.PatternLayout"/> using
-            the <paramref name="source"/> <see cref="T:System.String"/> as the
-            <see cref="P:log4net.Layout.PatternLayout.ConversionPattern"/>.
-            </para>
-            </remarks>
-            <exception cref="T:log4net.Util.TypeConverters.ConversionNotSupportedException">
-            The <paramref name="source"/> object cannot be converted to the
-            target type. To check for this condition use the <see cref="M:log4net.Util.TypeConverters.PatternLayoutConverter.CanConvertFrom(System.Type)"/>
-            method.
-            </exception>
-        </member>
-        <member name="T:log4net.Util.TypeConverters.PatternStringConverter">
-            <summary>
-            Convert between string and <see cref="T:log4net.Util.PatternString"/>
-            </summary>
-            <remarks>
-            <para>
-            Supports conversion from string to <see cref="T:log4net.Util.PatternString"/> type, 
-            and from a <see cref="T:log4net.Util.PatternString"/> type to a string.
-            </para>
-            <para>
-            The string is used as the <see cref="P:log4net.Util.PatternString.ConversionPattern"/> 
-            of the <see cref="T:log4net.Util.PatternString"/>.
-            </para>
-            </remarks>
-            <seealso cref="T:log4net.Util.TypeConverters.ConverterRegistry"/>
-            <seealso cref="T:log4net.Util.TypeConverters.IConvertFrom"/>
-            <seealso cref="T:log4net.Util.TypeConverters.IConvertTo"/>
-            <author>Nicko Cadell</author>
-        </member>
-        <member name="M:log4net.Util.TypeConverters.PatternStringConverter.CanConvertTo(System.Type)">
-            <summary>
-            Can the target type be converted to the type supported by this object
-            </summary>
-            <param name="targetType">A <see cref="T:System.Type"/> that represents the type you want to convert to</param>
-            <returns>true if the conversion is possible</returns>
-            <remarks>
-            <para>
-            Returns <c>true</c> if the <paramref name="targetType"/> is
-            assignable from a <see cref="T:System.String"/> type.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.TypeConverters.PatternStringConverter.ConvertTo(System.Object,System.Type)">
-            <summary>
-            Converts the given value object to the specified type, using the arguments
-            </summary>
-            <param name="source">the object to convert</param>
-            <param name="targetType">The Type to convert the value parameter to</param>
-            <returns>the converted object</returns>
-            <remarks>
-            <para>
-            Uses the <see cref="M:log4net.Util.PatternString.Format"/> method to convert the
-            <see cref="T:log4net.Util.PatternString"/> argument to a <see cref="T:System.String"/>.
-            </para>
-            </remarks>
-            <exception cref="T:log4net.Util.TypeConverters.ConversionNotSupportedException">
-            The <paramref name="source"/> object cannot be converted to the
-            <paramref name="targetType"/>. To check for this condition use the 
-            <see cref="M:log4net.Util.TypeConverters.PatternStringConverter.CanConvertTo(System.Type)"/> method.
-            </exception>
-        </member>
-        <member name="M:log4net.Util.TypeConverters.PatternStringConverter.CanConvertFrom(System.Type)">
-            <summary>
-            Can the source type be converted to the type supported by this object
-            </summary>
-            <param name="sourceType">the type to convert</param>
-            <returns>true if the conversion is possible</returns>
-            <remarks>
-            <para>
-            Returns <c>true</c> if the <paramref name="sourceType"/> is
-            the <see cref="T:System.String"/> type.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.TypeConverters.PatternStringConverter.ConvertFrom(System.Object)">
-            <summary>
-            Overrides the ConvertFrom method of IConvertFrom.
-            </summary>
-            <param name="source">the object to convert to a PatternString</param>
-            <returns>the PatternString</returns>
-            <remarks>
-            <para>
-            Creates and returns a new <see cref="T:log4net.Util.PatternString"/> using
-            the <paramref name="source"/> <see cref="T:System.String"/> as the
-            <see cref="P:log4net.Util.PatternString.ConversionPattern"/>.
-            </para>
-            </remarks>
-            <exception cref="T:log4net.Util.TypeConverters.ConversionNotSupportedException">
-            The <paramref name="source"/> object cannot be converted to the
-            target type. To check for this condition use the <see cref="M:log4net.Util.TypeConverters.PatternStringConverter.CanConvertFrom(System.Type)"/>
-            method.
-            </exception>
-        </member>
-        <member name="T:log4net.Util.TypeConverters.TypeConverter">
-            <summary>
-            Supports conversion from string to <see cref="T:System.Type"/> type.
-            </summary>
-            <remarks>
-            <para>
-            Supports conversion from string to <see cref="T:System.Type"/> type.
-            </para>
-            </remarks>
-            <seealso cref="T:log4net.Util.TypeConverters.ConverterRegistry"/>
-            <seealso cref="T:log4net.Util.TypeConverters.IConvertFrom"/>
-            <seealso cref="T:log4net.Util.TypeConverters.IConvertTo"/>
-            <author>Nicko Cadell</author>
-        </member>
-        <member name="M:log4net.Util.TypeConverters.TypeConverter.CanConvertFrom(System.Type)">
-            <summary>
-            Can the source type be converted to the type supported by this object
-            </summary>
-            <param name="sourceType">the type to convert</param>
-            <returns>true if the conversion is possible</returns>
-            <remarks>
-            <para>
-            Returns <c>true</c> if the <paramref name="sourceType"/> is
-            the <see cref="T:System.String"/> type.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.TypeConverters.TypeConverter.ConvertFrom(System.Object)">
-            <summary>
-            Overrides the ConvertFrom method of IConvertFrom.
-            </summary>
-            <param name="source">the object to convert to a Type</param>
-            <returns>the Type</returns>
-            <remarks>
-            <para>
-            Uses the <see cref="M:System.Type.GetType(System.String,System.Boolean)"/> method to convert the
-            <see cref="T:System.String"/> argument to a <see cref="T:System.Type"/>.
-            Additional effort is made to locate partially specified types
-            by searching the loaded assemblies.
-            </para>
-            </remarks>
-            <exception cref="T:log4net.Util.TypeConverters.ConversionNotSupportedException">
-            The <paramref name="source"/> object cannot be converted to the
-            target type. To check for this condition use the <see cref="M:log4net.Util.TypeConverters.TypeConverter.CanConvertFrom(System.Type)"/>
-            method.
-            </exception>
-        </member>
-        <member name="T:log4net.Util.TypeConverters.TypeConverterAttribute">
-            <summary>
-            Attribute used to associate a type converter
-            </summary>
-            <remarks>
-            <para>
-            Class and Interface level attribute that specifies a type converter
-            to use with the associated type.
-            </para>
-            <para>
-            To associate a type converter with a target type apply a
-            <c>TypeConverterAttribute</c> to the target type. Specify the
-            type of the type converter on the attribute.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-        </member>
-        <member name="F:log4net.Util.TypeConverters.TypeConverterAttribute.m_typeName">
-            <summary>
-            The string type name of the type converter
-            </summary>
-        </member>
-        <member name="M:log4net.Util.TypeConverters.TypeConverterAttribute.#ctor">
-            <summary>
-            Default constructor
-            </summary>
-            <remarks>
-            <para>
-            Default constructor
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.TypeConverters.TypeConverterAttribute.#ctor(System.String)">
-            <summary>
-            Create a new type converter attribute for the specified type name
-            </summary>
-            <param name="typeName">The string type name of the type converter</param>
-            <remarks>
-            <para>
-            The type specified must implement the <see cref="T:log4net.Util.TypeConverters.IConvertFrom"/> 
-            or the <see cref="T:log4net.Util.TypeConverters.IConvertTo"/> interfaces.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.TypeConverters.TypeConverterAttribute.#ctor(System.Type)">
-            <summary>
-            Create a new type converter attribute for the specified type
-            </summary>
-            <param name="converterType">The type of the type converter</param>
-            <remarks>
-            <para>
-            The type specified must implement the <see cref="T:log4net.Util.TypeConverters.IConvertFrom"/> 
-            or the <see cref="T:log4net.Util.TypeConverters.IConvertTo"/> interfaces.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Util.TypeConverters.TypeConverterAttribute.ConverterTypeName">
-            <summary>
-            The string type name of the type converter 
-            </summary>
-            <value>
-            The string type name of the type converter 
-            </value>
-            <remarks>
-            <para>
-            The type specified must implement the <see cref="T:log4net.Util.TypeConverters.IConvertFrom"/> 
-            or the <see cref="T:log4net.Util.TypeConverters.IConvertTo"/> interfaces.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Util.AppenderAttachedImpl">
-            <summary>
-            A straightforward implementation of the <see cref="T:log4net.Core.IAppenderAttachable"/> interface.
-            </summary>
-            <remarks>
-            <para>
-            This is the default implementation of the <see cref="T:log4net.Core.IAppenderAttachable"/>
-            interface. Implementors of the <see cref="T:log4net.Core.IAppenderAttachable"/> interface
-            should aggregate an instance of this type.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-        </member>
-        <member name="M:log4net.Util.AppenderAttachedImpl.#ctor">
-            <summary>
-            Constructor
-            </summary>
-            <remarks>
-            <para>
-            Initializes a new instance of the <see cref="T:log4net.Util.AppenderAttachedImpl"/> class.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.AppenderAttachedImpl.AppendLoopOnAppenders(log4net.Core.LoggingEvent)">
-            <summary>
-            Append on on all attached appenders.
-            </summary>
-            <param name="loggingEvent">The event being logged.</param>
-            <returns>The number of appenders called.</returns>
-            <remarks>
-            <para>
-            Calls the <see cref="M:log4net.Appender.IAppender.DoAppend(log4net.Core.LoggingEvent)"/> method on all 
-            attached appenders.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.AppenderAttachedImpl.AppendLoopOnAppenders(log4net.Core.LoggingEvent[])">
-            <summary>
-            Append on on all attached appenders.
-            </summary>
-            <param name="loggingEvents">The array of events being logged.</param>
-            <returns>The number of appenders called.</returns>
-            <remarks>
-            <para>
-            Calls the <see cref="M:log4net.Appender.IAppender.DoAppend(log4net.Core.LoggingEvent)"/> method on all 
-            attached appenders.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.AppenderAttachedImpl.CallAppend(log4net.Appender.IAppender,log4net.Core.LoggingEvent[])">
-            <summary>
-            Calls the DoAppende method on the <see cref="T:log4net.Appender.IAppender"/> with 
-            the <see cref="T:log4net.Core.LoggingEvent"/> objects supplied.
-            </summary>
-            <param name="appender">The appender</param>
-            <param name="loggingEvents">The events</param>
-            <remarks>
-            <para>
-            If the <paramref name="appender"/> supports the <see cref="T:log4net.Appender.IBulkAppender"/>
-            interface then the <paramref name="loggingEvents"/> will be passed 
-            through using that interface. Otherwise the <see cref="T:log4net.Core.LoggingEvent"/>
-            objects in the array will be passed one at a time.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.AppenderAttachedImpl.AddAppender(log4net.Appender.IAppender)">
-            <summary>
-            Attaches an appender.
-            </summary>
-            <param name="newAppender">The appender to add.</param>
-            <remarks>
-            <para>
-            If the appender is already in the list it won't be added again.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.AppenderAttachedImpl.GetAppender(System.String)">
-            <summary>
-            Gets an attached appender with the specified name.
-            </summary>
-            <param name="name">The name of the appender to get.</param>
-            <returns>
-            The appender with the name specified, or <c>null</c> if no appender with the
-            specified name is found.
-            </returns>
-            <remarks>
-            <para>
-            Lookup an attached appender by name.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.AppenderAttachedImpl.RemoveAllAppenders">
-            <summary>
-            Removes all attached appenders.
-            </summary>
-            <remarks>
-            <para>
-            Removes and closes all attached appenders
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.AppenderAttachedImpl.RemoveAppender(log4net.Appender.IAppender)">
-            <summary>
-            Removes the specified appender from the list of attached appenders.
-            </summary>
-            <param name="appender">The appender to remove.</param>
-            <returns>The appender removed from the list</returns>
-            <remarks>
-            <para>
-            The appender removed is not closed.
-            If you are discarding the appender you must call
-            <see cref="M:log4net.Appender.IAppender.Close"/> on the appender removed.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.AppenderAttachedImpl.RemoveAppender(System.String)">
-            <summary>
-            Removes the appender with the specified name from the list of appenders.
-            </summary>
-            <param name="name">The name of the appender to remove.</param>
-            <returns>The appender removed from the list</returns>
-            <remarks>
-            <para>
-            The appender removed is not closed.
-            If you are discarding the appender you must call
-            <see cref="M:log4net.Appender.IAppender.Close"/> on the appender removed.
-            </para>
-            </remarks>
-        </member>
-        <member name="F:log4net.Util.AppenderAttachedImpl.m_appenderList">
-            <summary>
-            List of appenders
-            </summary>
-        </member>
-        <member name="F:log4net.Util.AppenderAttachedImpl.m_appenderArray">
-            <summary>
-            Array of appenders, used to cache the m_appenderList
-            </summary>
-        </member>
-        <member name="P:log4net.Util.AppenderAttachedImpl.Appenders">
-            <summary>
-            Gets all attached appenders.
-            </summary>
-            <returns>
-            A collection of attached appenders, or <c>null</c> if there
-            are no attached appenders.
-            </returns>
-            <remarks>
-            <para>
-            The read only collection of all currently attached appenders.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Util.CompositeProperties">
-            <summary>
-            This class aggregates several PropertiesDictionary collections together.
-            </summary>
-            <remarks>
-            <para>
-            Provides a dictionary style lookup over an ordered list of
-            <see cref="T:log4net.Util.PropertiesDictionary"/> collections.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-        </member>
-        <member name="M:log4net.Util.CompositeProperties.#ctor">
-            <summary>
-            Constructor
-            </summary>
-            <remarks>
-            <para>
-            Initializes a new instance of the <see cref="T:log4net.Util.CompositeProperties"/> class.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.CompositeProperties.Add(log4net.Util.ReadOnlyPropertiesDictionary)">
-            <summary>
-            Add a Properties Dictionary to this composite collection
-            </summary>
-            <param name="properties">the properties to add</param>
-            <remarks>
-            <para>
-            Properties dictionaries added first take precedence over dictionaries added
-            later.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.CompositeProperties.Flatten">
-            <summary>
-            Flatten this composite collection into a single properties dictionary
-            </summary>
-            <returns>the flattened dictionary</returns>
-            <remarks>
-            <para>
-            Reduces the collection of ordered dictionaries to a single dictionary
-            containing the resultant values for the keys.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Util.CompositeProperties.Item(System.String)">
-            <summary>
-            Gets the value of a property
-            </summary>
-            <value>
-            The value for the property with the specified key
-            </value>
-            <remarks>
-            <para>
-            Looks up the value for the <paramref name="key"/> specified.
-            The <see cref="T:log4net.Util.PropertiesDictionary"/> collections are searched
-            in the order in which they were added to this collection. The value
-            returned is the value held by the first collection that contains
-            the specified key.
-            </para>
-            <para>
-            If none of the collections contain the specified key then
-            <c>null</c> is returned.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Util.ContextPropertiesBase">
-            <summary>
-            Base class for Context Properties implementations
-            </summary>
-            <remarks>
-            <para>
-            This class defines a basic property get set accessor
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-        </member>
-        <member name="P:log4net.Util.ContextPropertiesBase.Item(System.String)">
-            <summary>
-            Gets or sets the value of a property
-            </summary>
-            <value>
-            The value for the property with the specified key
-            </value>
-            <remarks>
-            <para>
-            Gets or sets the value of a property
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Util.CountingQuietTextWriter">
-            <summary>
-            Subclass of <see cref="T:log4net.Util.QuietTextWriter"/> that maintains a count of 
-            the number of bytes written.
-            </summary>
-            <remarks>
-            <para>
-            This writer counts the number of bytes written.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-        </member>
-        <member name="T:log4net.Util.QuietTextWriter">
-            <summary>
-            <see cref="T:System.IO.TextWriter"/> that does not leak exceptions
-            </summary>
-            <remarks>
-            <para>
-            <see cref="T:log4net.Util.QuietTextWriter"/> does not throw exceptions when things go wrong. 
-            Instead, it delegates error handling to its <see cref="T:log4net.Core.IErrorHandler"/>.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-        </member>
-        <member name="T:log4net.Util.TextWriterAdapter">
-            <summary>
-            Adapter that extends <see cref="T:System.IO.TextWriter"/> and forwards all
-            messages to an instance of <see cref="T:System.IO.TextWriter"/>.
-            </summary>
-            <remarks>
-            <para>
-            Adapter that extends <see cref="T:System.IO.TextWriter"/> and forwards all
-            messages to an instance of <see cref="T:System.IO.TextWriter"/>.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-        </member>
-        <member name="F:log4net.Util.TextWriterAdapter.m_writer">
-            <summary>
-            The writer to forward messages to
-            </summary>
-        </member>
-        <member name="M:log4net.Util.TextWriterAdapter.#ctor(System.IO.TextWriter)">
-            <summary>
-            Create an instance of <see cref="T:log4net.Util.TextWriterAdapter"/> that forwards all
-            messages to a <see cref="T:System.IO.TextWriter"/>.
-            </summary>
-            <param name="writer">The <see cref="T:System.IO.TextWriter"/> to forward to</param>
-            <remarks>
-            <para>
-            Create an instance of <see cref="T:log4net.Util.TextWriterAdapter"/> that forwards all
-            messages to a <see cref="T:System.IO.TextWriter"/>.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.TextWriterAdapter.Close">
-            <summary>
-            Closes the writer and releases any system resources associated with the writer
-            </summary>
-            <remarks>
-            <para>
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.TextWriterAdapter.Dispose(System.Boolean)">
-            <summary>
-            Dispose this writer
-            </summary>
-            <param name="disposing">flag indicating if we are being disposed</param>
-            <remarks>
-            <para>
-            Dispose this writer
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.TextWriterAdapter.Flush">
-            <summary>
-            Flushes any buffered output
-            </summary>
-            <remarks>
-            <para>
-            Clears all buffers for the writer and causes any buffered data to be written 
-            to the underlying device
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.TextWriterAdapter.Write(System.Char)">
-            <summary>
-            Writes a character to the wrapped TextWriter
-            </summary>
-            <param name="value">the value to write to the TextWriter</param>
-            <remarks>
-            <para>
-            Writes a character to the wrapped TextWriter
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.TextWriterAdapter.Write(System.Char[],System.Int32,System.Int32)">
-            <summary>
-            Writes a character buffer to the wrapped TextWriter
-            </summary>
-            <param name="buffer">the data buffer</param>
-            <param name="index">the start index</param>
-            <param name="count">the number of characters to write</param>
-            <remarks>
-            <para>
-            Writes a character buffer to the wrapped TextWriter
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.TextWriterAdapter.Write(System.String)">
-            <summary>
-            Writes a string to the wrapped TextWriter
-            </summary>
-            <param name="value">the value to write to the TextWriter</param>
-            <remarks>
-            <para>
-            Writes a string to the wrapped TextWriter
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Util.TextWriterAdapter.Writer">
-            <summary>
-            Gets or sets the underlying <see cref="T:System.IO.TextWriter"/>.
-            </summary>
-            <value>
-            The underlying <see cref="T:System.IO.TextWriter"/>.
-            </value>
-            <remarks>
-            <para>
-            Gets or sets the underlying <see cref="T:System.IO.TextWriter"/>.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Util.TextWriterAdapter.Encoding">
-            <summary>
-            The Encoding in which the output is written
-            </summary>
-            <value>
-            The <see cref="P:log4net.Util.TextWriterAdapter.Encoding"/>
-            </value>
-            <remarks>
-            <para>
-            The Encoding in which the output is written
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Util.TextWriterAdapter.FormatProvider">
-            <summary>
-            Gets an object that controls formatting
-            </summary>
-            <value>
-            The format provider
-            </value>
-            <remarks>
-            <para>
-            Gets an object that controls formatting
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Util.TextWriterAdapter.NewLine">
-            <summary>
-            Gets or sets the line terminator string used by the TextWriter
-            </summary>
-            <value>
-            The line terminator to use
-            </value>
-            <remarks>
-            <para>
-            Gets or sets the line terminator string used by the TextWriter
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.QuietTextWriter.#ctor(System.IO.TextWriter,log4net.Core.IErrorHandler)">
-            <summary>
-            Constructor
-            </summary>
-            <param name="writer">the writer to actually write to</param>
-            <param name="errorHandler">the error handler to report error to</param>
-            <remarks>
-            <para>
-            Create a new QuietTextWriter using a writer and error handler
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.QuietTextWriter.Write(System.Char)">
-            <summary>
-            Writes a character to the underlying writer
-            </summary>
-            <param name="value">the char to write</param>
-            <remarks>
-            <para>
-            Writes a character to the underlying writer
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.QuietTextWriter.Write(System.Char[],System.Int32,System.Int32)">
-            <summary>
-            Writes a buffer to the underlying writer
-            </summary>
-            <param name="buffer">the buffer to write</param>
-            <param name="index">the start index to write from</param>
-            <param name="count">the number of characters to write</param>
-            <remarks>
-            <para>
-            Writes a buffer to the underlying writer
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.QuietTextWriter.Write(System.String)">
-            <summary>
-            Writes a string to the output.
-            </summary>
-            <param name="value">The string data to write to the output.</param>
-            <remarks>
-            <para>
-            Writes a string to the output.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.QuietTextWriter.Close">
-            <summary>
-            Closes the underlying output writer.
-            </summary>
-            <remarks>
-            <para>
-            Closes the underlying output writer.
-            </para>
-            </remarks>
-        </member>
-        <member name="F:log4net.Util.QuietTextWriter.m_errorHandler">
-            <summary>
-            The error handler instance to pass all errors to
-            </summary>
-        </member>
-        <member name="F:log4net.Util.QuietTextWriter.m_closed">
-            <summary>
-            Flag to indicate if this writer is closed
-            </summary>
-        </member>
-        <member name="P:log4net.Util.QuietTextWriter.ErrorHandler">
-            <summary>
-            Gets or sets the error handler that all errors are passed to.
-            </summary>
-            <value>
-            The error handler that all errors are passed to.
-            </value>
-            <remarks>
-            <para>
-            Gets or sets the error handler that all errors are passed to.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Util.QuietTextWriter.Closed">
-            <summary>
-            Gets a value indicating whether this writer is closed.
-            </summary>
-            <value>
-            <c>true</c> if this writer is closed, otherwise <c>false</c>.
-            </value>
-            <remarks>
-            <para>
-            Gets a value indicating whether this writer is closed.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.CountingQuietTextWriter.#ctor(System.IO.TextWriter,log4net.Core.IErrorHandler)">
-            <summary>
-            Constructor
-            </summary>
-            <param name="writer">The <see cref="T:System.IO.TextWriter"/> to actually write to.</param>
-            <param name="errorHandler">The <see cref="T:log4net.Core.IErrorHandler"/> to report errors to.</param>
-            <remarks>
-            <para>
-            Creates a new instance of the <see cref="T:log4net.Util.CountingQuietTextWriter"/> class 
-            with the specified <see cref="T:System.IO.TextWriter"/> and <see cref="T:log4net.Core.IErrorHandler"/>.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.CountingQuietTextWriter.Write(System.Char)">
-            <summary>
-            Writes a character to the underlying writer and counts the number of bytes written.
-            </summary>
-            <param name="value">the char to write</param>
-            <remarks>
-            <para>
-            Overrides implementation of <see cref="T:log4net.Util.QuietTextWriter"/>. Counts
-            the number of bytes written.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.CountingQuietTextWriter.Write(System.Char[],System.Int32,System.Int32)">
-            <summary>
-            Writes a buffer to the underlying writer and counts the number of bytes written.
-            </summary>
-            <param name="buffer">the buffer to write</param>
-            <param name="index">the start index to write from</param>
-            <param name="count">the number of characters to write</param>
-            <remarks>
-            <para>
-            Overrides implementation of <see cref="T:log4net.Util.QuietTextWriter"/>. Counts
-            the number of bytes written.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.CountingQuietTextWriter.Write(System.String)">
-            <summary>
-            Writes a string to the output and counts the number of bytes written.
-            </summary>
-            <param name="str">The string data to write to the output.</param>
-            <remarks>
-            <para>
-            Overrides implementation of <see cref="T:log4net.Util.QuietTextWriter"/>. Counts
-            the number of bytes written.
-            </para>
-            </remarks>
-        </member>
-        <member name="F:log4net.Util.CountingQuietTextWriter.m_countBytes">
-            <summary>
-            Total number of bytes written.
-            </summary>
-        </member>
-        <member name="P:log4net.Util.CountingQuietTextWriter.Count">
-            <summary>
-            Gets or sets the total number of bytes written.
-            </summary>
-            <value>
-            The total number of bytes written.
-            </value>
-            <remarks>
-            <para>
-            Gets or sets the total number of bytes written.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Util.CyclicBuffer">
-            <summary>
-            A fixed size rolling buffer of logging events.
-            </summary>
-            <remarks>
-            <para>
-            An array backed fixed size leaky bucket.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-        </member>
-        <member name="M:log4net.Util.CyclicBuffer.#ctor(System.Int32)">
-            <summary>
-            Constructor
-            </summary>
-            <param name="maxSize">The maximum number of logging events in the buffer.</param>
-            <remarks>
-            <para>
-            Initializes a new instance of the <see cref="T:log4net.Util.CyclicBuffer"/> class with 
-            the specified maximum number of buffered logging events.
-            </para>
-            </remarks>
-            <exception cref="T:System.ArgumentOutOfRangeException">The <paramref name="maxSize"/> argument is not a positive integer.</exception>
-        </member>
-        <member name="M:log4net.Util.CyclicBuffer.Append(log4net.Core.LoggingEvent)">
-            <summary>
-            Appends a <paramref name="loggingEvent"/> to the buffer.
-            </summary>
-            <param name="loggingEvent">The event to append to the buffer.</param>
-            <returns>The event discarded from the buffer, if the buffer is full, otherwise <c>null</c>.</returns>
-            <remarks>
-            <para>
-            Append an event to the buffer. If the buffer still contains free space then
-            <c>null</c> is returned. If the buffer is full then an event will be dropped
-            to make space for the new event, the event dropped is returned.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.CyclicBuffer.PopOldest">
-            <summary>
-            Get and remove the oldest event in the buffer.
-            </summary>
-            <returns>The oldest logging event in the buffer</returns>
-            <remarks>
-            <para>
-            Gets the oldest (first) logging event in the buffer and removes it 
-            from the buffer.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.CyclicBuffer.PopAll">
-            <summary>
-            Pops all the logging events from the buffer into an array.
-            </summary>
-            <returns>An array of all the logging events in the buffer.</returns>
-            <remarks>
-            <para>
-            Get all the events in the buffer and clear the buffer.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.CyclicBuffer.Clear">
-            <summary>
-            Clear the buffer
-            </summary>
-            <remarks>
-            <para>
-            Clear the buffer of all events. The events in the buffer are lost.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Util.CyclicBuffer.Item(System.Int32)">
-            <summary>
-            Gets the <paramref name="i"/>th oldest event currently in the buffer.
-            </summary>
-            <value>The <paramref name="i"/>th oldest event currently in the buffer.</value>
-            <remarks>
-            <para>
-            If <paramref name="i"/> is outside the range 0 to the number of events
-            currently in the buffer, then <c>null</c> is returned.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Util.CyclicBuffer.MaxSize">
-            <summary>
-            Gets the maximum size of the buffer.
-            </summary>
-            <value>The maximum size of the buffer.</value>
-            <remarks>
-            <para>
-            Gets the maximum size of the buffer
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Util.CyclicBuffer.Length">
-            <summary>
-            Gets the number of logging events in the buffer.
-            </summary>
-            <value>The number of logging events in the buffer.</value>
-            <remarks>
-            <para>
-            This number is guaranteed to be in the range 0 to <see cref="P:log4net.Util.CyclicBuffer.MaxSize"/>
-            (inclusive).
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Util.EmptyCollection">
-            <summary>
-            An always empty <see cref="T:System.Collections.ICollection"/>.
-            </summary>
-            <remarks>
-            <para>
-            A singleton implementation of the <see cref="T:System.Collections.ICollection"/>
-            interface that always represents an empty collection.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-        </member>
-        <member name="M:log4net.Util.EmptyCollection.#ctor">
-            <summary>
-            Initializes a new instance of the <see cref="T:log4net.Util.EmptyCollection"/> class. 
-            </summary>
-            <remarks>
-            <para>
-            Uses a private access modifier to enforce the singleton pattern.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.EmptyCollection.CopyTo(System.Array,System.Int32)">
-            <summary>
-            Copies the elements of the <see cref="T:System.Collections.ICollection"/> to an 
-            <see cref="T:System.Array"/>, starting at a particular Array index.
-            </summary>
-            <param name="array">The one-dimensional <see cref="T:System.Array"/> 
-            that is the destination of the elements copied from 
-            <see cref="T:System.Collections.ICollection"/>. The Array must have zero-based 
-            indexing.</param>
-            <param name="index">The zero-based index in array at which 
-            copying begins.</param>
-            <remarks>
-            <para>
-            As the collection is empty no values are copied into the array.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.EmptyCollection.GetEnumerator">
-            <summary>
-            Returns an enumerator that can iterate through a collection.
-            </summary>
-            <returns>
-            An <see cref="T:System.Collections.IEnumerator"/> that can be used to 
-            iterate through the collection.
-            </returns>
-            <remarks>
-            <para>
-            As the collection is empty a <see cref="T:log4net.Util.NullEnumerator"/> is returned.
-            </para>
-            </remarks>
-        </member>
-        <member name="F:log4net.Util.EmptyCollection.s_instance">
-            <summary>
-            The singleton instance of the empty collection.
-            </summary>
-        </member>
-        <member name="P:log4net.Util.EmptyCollection.Instance">
-            <summary>
-            Gets the singleton instance of the empty collection.
-            </summary>
-            <returns>The singleton instance of the empty collection.</returns>
-            <remarks>
-            <para>
-            Gets the singleton instance of the empty collection.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Util.EmptyCollection.IsSynchronized">
-            <summary>
-            Gets a value indicating if access to the <see cref="T:System.Collections.ICollection"/> is synchronized (thread-safe).
-            </summary>
-            <value>
-            <b>true</b> if access to the <see cref="T:System.Collections.ICollection"/> is synchronized (thread-safe); otherwise, <b>false</b>.
-            </value>
-            <remarks>
-            <para>
-            For the <see cref="T:log4net.Util.EmptyCollection"/> this property is always <c>true</c>.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Util.EmptyCollection.Count">
-            <summary>
-            Gets the number of elements contained in the <see cref="T:System.Collections.ICollection"/>.
-            </summary>
-            <value>
-            The number of elements contained in the <see cref="T:System.Collections.ICollection"/>.
-            </value>
-            <remarks>
-            <para>
-            As the collection is empty the <see cref="P:log4net.Util.EmptyCollection.Count"/> is always <c>0</c>.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Util.EmptyCollection.SyncRoot">
-            <summary>
-            Gets an object that can be used to synchronize access to the <see cref="T:System.Collections.ICollection"/>.
-            </summary>
-            <value>
-            An object that can be used to synchronize access to the <see cref="T:System.Collections.ICollection"/>.
-            </value>
-            <remarks>
-            <para>
-            As the collection is empty and thread safe and synchronized this instance is also
-            the <see cref="P:log4net.Util.EmptyCollection.SyncRoot"/> object.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Util.EmptyDictionary">
-            <summary>
-            An always empty <see cref="T:System.Collections.IDictionary"/>.
-            </summary>
-            <remarks>
-            <para>
-            A singleton implementation of the <see cref="T:System.Collections.IDictionary"/>
-            interface that always represents an empty collection.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-        </member>
-        <member name="M:log4net.Util.EmptyDictionary.#ctor">
-            <summary>
-            Initializes a new instance of the <see cref="T:log4net.Util.EmptyDictionary"/> class. 
-            </summary>
-            <remarks>
-            <para>
-            Uses a private access modifier to enforce the singleton pattern.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.EmptyDictionary.CopyTo(System.Array,System.Int32)">
-            <summary>
-            Copies the elements of the <see cref="T:System.Collections.ICollection"/> to an 
-            <see cref="T:System.Array"/>, starting at a particular Array index.
-            </summary>
-            <param name="array">The one-dimensional <see cref="T:System.Array"/> 
-            that is the destination of the elements copied from 
-            <see cref="T:System.Collections.ICollection"/>. The Array must have zero-based 
-            indexing.</param>
-            <param name="index">The zero-based index in array at which 
-            copying begins.</param>
-            <remarks>
-            <para>
-            As the collection is empty no values are copied into the array.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.EmptyDictionary.System#Collections#IEnumerable#GetEnumerator">
-            <summary>
-            Returns an enumerator that can iterate through a collection.
-            </summary>
-            <returns>
-            An <see cref="T:System.Collections.IEnumerator"/> that can be used to 
-            iterate through the collection.
-            </returns>
-            <remarks>
-            <para>
-            As the collection is empty a <see cref="T:log4net.Util.NullEnumerator"/> is returned.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.EmptyDictionary.Add(System.Object,System.Object)">
-            <summary>
-            Adds an element with the provided key and value to the 
-            <see cref="T:log4net.Util.EmptyDictionary"/>.
-            </summary>
-            <param name="key">The <see cref="T:System.Object"/> to use as the key of the element to add.</param>
-            <param name="value">The <see cref="T:System.Object"/> to use as the value of the element to add.</param>
-            <remarks>
-            <para>
-            As the collection is empty no new values can be added. A <see cref="T:System.InvalidOperationException"/>
-            is thrown if this method is called.
-            </para>
-            </remarks>
-            <exception cref="T:System.InvalidOperationException">This dictionary is always empty and cannot be modified.</exception>
-        </member>
-        <member name="M:log4net.Util.EmptyDictionary.Clear">
-            <summary>
-            Removes all elements from the <see cref="T:log4net.Util.EmptyDictionary"/>.
-            </summary>
-            <remarks>
-            <para>
-            As the collection is empty no values can be removed. A <see cref="T:System.InvalidOperationException"/>
-            is thrown if this method is called.
-            </para>
-            </remarks>
-            <exception cref="T:System.InvalidOperationException">This dictionary is always empty and cannot be modified.</exception>
-        </member>
-        <member name="M:log4net.Util.EmptyDictionary.Contains(System.Object)">
-            <summary>
-            Determines whether the <see cref="T:log4net.Util.EmptyDictionary"/> contains an element 
-            with the specified key.
-            </summary>
-            <param name="key">The key to locate in the <see cref="T:log4net.Util.EmptyDictionary"/>.</param>
-            <returns><c>false</c></returns>
-            <remarks>
-            <para>
-            As the collection is empty the <see cref="M:log4net.Util.EmptyDictionary.Contains(System.Object)"/> method always returns <c>false</c>.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.EmptyDictionary.GetEnumerator">
-            <summary>
-            Returns an enumerator that can iterate through a collection.
-            </summary>
-            <returns>
-            An <see cref="T:System.Collections.IEnumerator"/> that can be used to 
-            iterate through the collection.
-            </returns>
-            <remarks>
-            <para>
-            As the collection is empty a <see cref="T:log4net.Util.NullEnumerator"/> is returned.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.EmptyDictionary.Remove(System.Object)">
-            <summary>
-            Removes the element with the specified key from the <see cref="T:log4net.Util.EmptyDictionary"/>.
-            </summary>
-            <param name="key">The key of the element to remove.</param>
-            <remarks>
-            <para>
-            As the collection is empty no values can be removed. A <see cref="T:System.InvalidOperationException"/>
-            is thrown if this method is called.
-            </para>
-            </remarks>
-            <exception cref="T:System.InvalidOperationException">This dictionary is always empty and cannot be modified.</exception>
-        </member>
-        <member name="F:log4net.Util.EmptyDictionary.s_instance">
-            <summary>
-            The singleton instance of the empty dictionary.
-            </summary>
-        </member>
-        <member name="P:log4net.Util.EmptyDictionary.Instance">
-            <summary>
-            Gets the singleton instance of the <see cref="T:log4net.Util.EmptyDictionary"/>.
-            </summary>
-            <returns>The singleton instance of the <see cref="T:log4net.Util.EmptyDictionary"/>.</returns>
-            <remarks>
-            <para>
-            Gets the singleton instance of the <see cref="T:log4net.Util.EmptyDictionary"/>.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Util.EmptyDictionary.IsSynchronized">
-            <summary>
-            Gets a value indicating if access to the <see cref="T:System.Collections.ICollection"/> is synchronized (thread-safe).
-            </summary>
-            <value>
-            <b>true</b> if access to the <see cref="T:System.Collections.ICollection"/> is synchronized (thread-safe); otherwise, <b>false</b>.
-            </value>
-            <remarks>
-            <para>
-            For the <see cref="T:log4net.Util.EmptyCollection"/> this property is always <b>true</b>.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Util.EmptyDictionary.Count">
-            <summary>
-            Gets the number of elements contained in the <see cref="T:System.Collections.ICollection"/>
-            </summary>
-            <value>
-            The number of elements contained in the <see cref="T:System.Collections.ICollection"/>.
-            </value>
-            <remarks>
-            <para>
-            As the collection is empty the <see cref="P:log4net.Util.EmptyDictionary.Count"/> is always <c>0</c>.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Util.EmptyDictionary.SyncRoot">
-            <summary>
-            Gets an object that can be used to synchronize access to the <see cref="T:System.Collections.ICollection"/>.
-            </summary>
-            <value>
-            An object that can be used to synchronize access to the <see cref="T:System.Collections.ICollection"/>.
-            </value>
-            <remarks>
-            <para>
-            As the collection is empty and thread safe and synchronized this instance is also
-            the <see cref="P:log4net.Util.EmptyDictionary.SyncRoot"/> object.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Util.EmptyDictionary.IsFixedSize">
-            <summary>
-            Gets a value indicating whether the <see cref="T:log4net.Util.EmptyDictionary"/> has a fixed size.
-            </summary>
-            <value><c>true</c></value>
-            <remarks>
-            <para>
-            As the collection is empty <see cref="P:log4net.Util.EmptyDictionary.IsFixedSize"/> always returns <c>true</c>.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Util.EmptyDictionary.IsReadOnly">
-            <summary>
-            Gets a value indicating whether the <see cref="T:log4net.Util.EmptyDictionary"/> is read-only.
-            </summary>
-            <value><c>true</c></value>
-            <remarks>
-            <para>
-            As the collection is empty <see cref="P:log4net.Util.EmptyDictionary.IsReadOnly"/> always returns <c>true</c>.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Util.EmptyDictionary.Keys">
-            <summary>
-            Gets an <see cref="T:System.Collections.ICollection"/> containing the keys of the <see cref="T:log4net.Util.EmptyDictionary"/>.
-            </summary>
-            <value>An <see cref="T:System.Collections.ICollection"/> containing the keys of the <see cref="T:log4net.Util.EmptyDictionary"/>.</value>
-            <remarks>
-            <para>
-            As the collection is empty a <see cref="T:log4net.Util.EmptyCollection"/> is returned.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Util.EmptyDictionary.Values">
-            <summary>
-            Gets an <see cref="T:System.Collections.ICollection"/> containing the values of the <see cref="T:log4net.Util.EmptyDictionary"/>.
-            </summary>
-            <value>An <see cref="T:System.Collections.ICollection"/> containing the values of the <see cref="T:log4net.Util.EmptyDictionary"/>.</value>
-            <remarks>
-            <para>
-            As the collection is empty a <see cref="T:log4net.Util.EmptyCollection"/> is returned.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Util.EmptyDictionary.Item(System.Object)">
-            <summary>
-            Gets or sets the element with the specified key.
-            </summary>
-            <param name="key">The key of the element to get or set.</param>
-            <value><c>null</c></value>
-            <remarks>
-            <para>
-            As the collection is empty no values can be looked up or stored. 
-            If the index getter is called then <c>null</c> is returned.
-            A <see cref="T:System.InvalidOperationException"/> is thrown if the setter is called.
-            </para>
-            </remarks>
-            <exception cref="T:System.InvalidOperationException">This dictionary is always empty and cannot be modified.</exception>
-        </member>
-        <member name="T:log4net.Util.FormattingInfo">
-            <summary>
-            Contain the information obtained when parsing formatting modifiers 
-            in conversion modifiers.
-            </summary>
-            <remarks>
-            <para>
-            Holds the formatting information extracted from the format string by
-            the <see cref="T:log4net.Util.PatternParser"/>. This is used by the <see cref="T:log4net.Util.PatternConverter"/>
-            objects when rendering the output.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-        </member>
-        <member name="M:log4net.Util.FormattingInfo.#ctor">
-            <summary>
-            Defaut Constructor
-            </summary>
-            <remarks>
-            <para>
-            Initializes a new instance of the <see cref="T:log4net.Util.FormattingInfo"/> class.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.FormattingInfo.#ctor(System.Int32,System.Int32,System.Boolean)">
-            <summary>
-            Constructor
-            </summary>
-            <remarks>
-            <para>
-            Initializes a new instance of the <see cref="T:log4net.Util.FormattingInfo"/> class
-            with the specified parameters.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Util.FormattingInfo.Min">
-            <summary>
-            Gets or sets the minimum value.
-            </summary>
-            <value>
-            The minimum value.
-            </value>
-            <remarks>
-            <para>
-            Gets or sets the minimum value.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Util.FormattingInfo.Max">
-            <summary>
-            Gets or sets the maximum value.
-            </summary>
-            <value>
-            The maximum value.
-            </value>
-            <remarks>
-            <para>
-            Gets or sets the maximum value.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Util.FormattingInfo.LeftAlign">
-            <summary>
-            Gets or sets a flag indicating whether left align is enabled
-            or not.
-            </summary>
-            <value>
-            A flag indicating whether left align is enabled or not.
-            </value>
-            <remarks>
-            <para>
-            Gets or sets a flag indicating whether left align is enabled or not.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Util.GlobalContextProperties">
-            <summary>
-            Implementation of Properties collection for the <see cref="T:log4net.GlobalContext"/>
-            </summary>
-            <remarks>
-            <para>
-            This class implements a properties collection that is thread safe and supports both
-            storing properties and capturing a read only copy of the current propertied.
-            </para>
-            <para>
-            This class is optimized to the scenario where the properties are read frequently
-            and are modified infrequently.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-        </member>
-        <member name="F:log4net.Util.GlobalContextProperties.m_readOnlyProperties">
-            <summary>
-            The read only copy of the properties.
-            </summary>
-            <remarks>
-            <para>
-            This variable is declared <c>volatile</c> to prevent the compiler and JIT from
-            reordering reads and writes of this thread performed on different threads.
-            </para>
-            </remarks>
-        </member>
-        <member name="F:log4net.Util.GlobalContextProperties.m_syncRoot">
-            <summary>
-            Lock object used to synchronize updates within this instance
-            </summary>
-        </member>
-        <member name="M:log4net.Util.GlobalContextProperties.#ctor">
-            <summary>
-            Constructor
-            </summary>
-            <remarks>
-            <para>
-            Initializes a new instance of the <see cref="T:log4net.Util.GlobalContextProperties"/> class.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.GlobalContextProperties.Remove(System.String)">
-            <summary>
-            Remove a property from the global context
-            </summary>
-            <param name="key">the key for the entry to remove</param>
-            <remarks>
-            <para>
-            Removing an entry from the global context properties is relatively expensive compared
-            with reading a value. 
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.GlobalContextProperties.Clear">
-            <summary>
-            Clear the global context properties
-            </summary>
-        </member>
-        <member name="M:log4net.Util.GlobalContextProperties.GetReadOnlyProperties">
-            <summary>
-            Get a readonly immutable copy of the properties
-            </summary>
-            <returns>the current global context properties</returns>
-            <remarks>
-            <para>
-            This implementation is fast because the GlobalContextProperties class
-            stores a readonly copy of the properties.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Util.GlobalContextProperties.Item(System.String)">
-            <summary>
-            Gets or sets the value of a property
-            </summary>
-            <value>
-            The value for the property with the specified key
-            </value>
-            <remarks>
-            <para>
-            Reading the value for a key is faster than setting the value.
-            When the value is written a new read only copy of 
-            the properties is created.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Util.LevelMapping">
-            <summary>
-            Manages a mapping from levels to <see cref="T:log4net.Util.LevelMappingEntry"/>
-            </summary>
-            <remarks>
-            <para>
-            Manages an ordered mapping from <see cref="T:log4net.Core.Level"/> instances 
-            to <see cref="T:log4net.Util.LevelMappingEntry"/> subclasses.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-        </member>
-        <member name="M:log4net.Util.LevelMapping.#ctor">
-            <summary>
-            Default constructor
-            </summary>
-            <remarks>
-            <para>
-            Initialise a new instance of <see cref="T:log4net.Util.LevelMapping"/>.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.LevelMapping.Add(log4net.Util.LevelMappingEntry)">
-            <summary>
-            Add a <see cref="T:log4net.Util.LevelMappingEntry"/> to this mapping
-            </summary>
-            <param name="entry">the entry to add</param>
-            <remarks>
-            <para>
-            If a <see cref="T:log4net.Util.LevelMappingEntry"/> has previously been added
-            for the same <see cref="T:log4net.Core.Level"/> then that entry will be 
-            overwritten.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.LevelMapping.Lookup(log4net.Core.Level)">
-            <summary>
-            Lookup the mapping for the specified level
-            </summary>
-            <param name="level">the level to lookup</param>
-            <returns>the <see cref="T:log4net.Util.LevelMappingEntry"/> for the level or <c>null</c> if no mapping found</returns>
-            <remarks>
-            <para>
-            Lookup the value for the specified level. Finds the nearest
-            mapping value for the level that is equal to or less than the
-            <paramref name="level"/> specified.
-            </para>
-            <para>
-            If no mapping could be found then <c>null</c> is returned.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.LevelMapping.ActivateOptions">
-            <summary>
-            Initialize options
-            </summary>
-            <remarks>
-            <para>
-            Caches the sorted list of <see cref="T:log4net.Util.LevelMappingEntry"/> in an array
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Util.LogicalThreadContextProperties">
-            <summary>
-            Implementation of Properties collection for the <see cref="T:log4net.LogicalThreadContext"/>
-            </summary>
-            <remarks>
-            <para>
-            Class implements a collection of properties that is specific to each thread.
-            The class is not synchronized as each thread has its own <see cref="T:log4net.Util.PropertiesDictionary"/>.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-        </member>
-        <member name="M:log4net.Util.LogicalThreadContextProperties.#ctor">
-            <summary>
-            Constructor
-            </summary>
-            <remarks>
-            <para>
-            Initializes a new instance of the <see cref="T:log4net.Util.LogicalThreadContextProperties"/> class.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.LogicalThreadContextProperties.Remove(System.String)">
-            <summary>
-            Remove a property
-            </summary>
-            <param name="key">the key for the entry to remove</param>
-            <remarks>
-            <para>
-            Remove the value for the specified <paramref name="key"/> from the context.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.LogicalThreadContextProperties.Clear">
-            <summary>
-            Clear all the context properties
-            </summary>
-            <remarks>
-            <para>
-            Clear all the context properties
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.LogicalThreadContextProperties.GetProperties(System.Boolean)">
-            <summary>
-            Get the PropertiesDictionary stored in the LocalDataStoreSlot for this thread.
-            </summary>
-            <param name="create">create the dictionary if it does not exist, otherwise return null if is does not exist</param>
-            <returns>the properties for this thread</returns>
-            <remarks>
-            <para>
-            The collection returned is only to be used on the calling thread. If the
-            caller needs to share the collection between different threads then the 
-            caller must clone the collection before doings so.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Util.LogicalThreadContextProperties.Item(System.String)">
-            <summary>
-            Gets or sets the value of a property
-            </summary>
-            <value>
-            The value for the property with the specified key
-            </value>
-            <remarks>
-            <para>
-            Get or set the property value for the <paramref name="key"/> specified.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Util.LogLog">
-            <summary>
-            Outputs log statements from within the log4net assembly.
-            </summary>
-            <remarks>
-            <para>
-            Log4net components cannot make log4net logging calls. However, it is
-            sometimes useful for the user to learn about what log4net is
-            doing.
-            </para>
-            <para>
-            All log4net internal debug calls go to the standard output stream
-            whereas internal error messages are sent to the standard error output 
-            stream.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-        </member>
-        <member name="M:log4net.Util.LogLog.#ctor">
-            <summary>
-            Initializes a new instance of the <see cref="T:log4net.Util.LogLog"/> class. 
-            </summary>
-            <remarks>
-            <para>
-            Uses a private access modifier to prevent instantiation of this class.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.LogLog.#cctor">
-            <summary>
-            Static constructor that initializes logging by reading 
-            settings from the application configuration file.
-            </summary>
-            <remarks>
-            <para>
-            The <c>log4net.Internal.Debug</c> application setting
-            controls internal debugging. This setting should be set
-            to <c>true</c> to enable debugging.
-            </para>
-            <para>
-            The <c>log4net.Internal.Quiet</c> application setting
-            suppresses all internal logging including error messages. 
-            This setting should be set to <c>true</c> to enable message
-            suppression.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.LogLog.Debug(System.String)">
-            <summary>
-            Writes log4net internal debug messages to the 
-            standard output stream.
-            </summary>
-            <param name="message">The message to log.</param>
-            <remarks>
-            <para>
-            All internal debug messages are prepended with 
-            the string "log4net: ".
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.LogLog.Debug(System.String,System.Exception)">
-            <summary>
-            Writes log4net internal debug messages to the 
-            standard output stream.
-            </summary>
-            <param name="message">The message to log.</param>
-            <param name="exception">An exception to log.</param>
-            <remarks>
-            <para>
-            All internal debug messages are prepended with 
-            the string "log4net: ".
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.LogLog.Warn(System.String)">
-            <summary>
-            Writes log4net internal warning messages to the 
-            standard error stream.
-            </summary>
-            <param name="message">The message to log.</param>
-            <remarks>
-            <para>
-            All internal warning messages are prepended with 
-            the string "log4net:WARN ".
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.LogLog.Warn(System.String,System.Exception)">
-            <summary>
-            Writes log4net internal warning messages to the 
-            standard error stream.
-            </summary>
-            <param name="message">The message to log.</param>
-            <param name="exception">An exception to log.</param>
-            <remarks>
-            <para>
-            All internal warning messages are prepended with 
-            the string "log4net:WARN ".
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.LogLog.Error(System.String)">
-            <summary>
-            Writes log4net internal error messages to the 
-            standard error stream.
-            </summary>
-            <param name="message">The message to log.</param>
-            <remarks>
-            <para>
-            All internal error messages are prepended with 
-            the string "log4net:ERROR ".
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.LogLog.Error(System.String,System.Exception)">
-            <summary>
-            Writes log4net internal error messages to the 
-            standard error stream.
-            </summary>
-            <param name="message">The message to log.</param>
-            <param name="exception">An exception to log.</param>
-            <remarks>
-            <para>
-            All internal debug messages are prepended with 
-            the string "log4net:ERROR ".
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.LogLog.EmitOutLine(System.String)">
-            <summary>
-            Writes output to the standard output stream.  
-            </summary>
-            <param name="message">The message to log.</param>
-            <remarks>
-            <para>
-            Writes to both Console.Out and System.Diagnostics.Trace.
-            Note that the System.Diagnostics.Trace is not supported
-            on the Compact Framework.
-            </para>
-            <para>
-            If the AppDomain is not configured with a config file then
-            the call to System.Diagnostics.Trace may fail. This is only
-            an issue if you are programmatically creating your own AppDomains.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.LogLog.EmitErrorLine(System.String)">
-            <summary>
-            Writes output to the standard error stream.  
-            </summary>
-            <param name="message">The message to log.</param>
-            <remarks>
-            <para>
-            Writes to both Console.Error and System.Diagnostics.Trace.
-            Note that the System.Diagnostics.Trace is not supported
-            on the Compact Framework.
-            </para>
-            <para>
-            If the AppDomain is not configured with a config file then
-            the call to System.Diagnostics.Trace may fail. This is only
-            an issue if you are programmatically creating your own AppDomains.
-            </para>
-            </remarks>
-        </member>
-        <member name="F:log4net.Util.LogLog.s_debugEnabled">
-            <summary>
-             Default debug level
-            </summary>
-        </member>
-        <member name="F:log4net.Util.LogLog.s_quietMode">
-            <summary>
-            In quietMode not even errors generate any output.
-            </summary>
-        </member>
-        <member name="P:log4net.Util.LogLog.InternalDebugging">
-            <summary>
-            Gets or sets a value indicating whether log4net internal logging
-            is enabled or disabled.
-            </summary>
-            <value>
-            <c>true</c> if log4net internal logging is enabled, otherwise 
-            <c>false</c>.
-            </value>
-            <remarks>
-            <para>
-            When set to <c>true</c>, internal debug level logging will be 
-            displayed.
-            </para>
-            <para>
-            This value can be set by setting the application setting 
-            <c>log4net.Internal.Debug</c> in the application configuration
-            file.
-            </para>
-            <para>
-            The default value is <c>false</c>, i.e. debugging is
-            disabled.
-            </para>
-            </remarks>
-            <example>
-            <para>
-            The following example enables internal debugging using the 
-            application configuration file :
-            </para>
-            <code lang="XML" escaped="true">
-            <configuration>
-            	<appSettings>
-            		<add key="log4net.Internal.Debug" value="true" />
-            	</appSettings>
-            </configuration>
-            </code>
-            </example>
-        </member>
-        <member name="P:log4net.Util.LogLog.QuietMode">
-            <summary>
-            Gets or sets a value indicating whether log4net should generate no output
-            from internal logging, not even for errors. 
-            </summary>
-            <value>
-            <c>true</c> if log4net should generate no output at all from internal 
-            logging, otherwise <c>false</c>.
-            </value>
-            <remarks>
-            <para>
-            When set to <c>true</c> will cause internal logging at all levels to be 
-            suppressed. This means that no warning or error reports will be logged. 
-            This option overrides the <see cref="P:log4net.Util.LogLog.InternalDebugging"/> setting and 
-            disables all debug also.
-            </para>
-            <para>This value can be set by setting the application setting
-            <c>log4net.Internal.Quiet</c> in the application configuration file.
-            </para>
-            <para>
-            The default value is <c>false</c>, i.e. internal logging is not
-            disabled.
-            </para>
-            </remarks>
-            <example>
-            The following example disables internal logging using the 
-            application configuration file :
-            <code lang="XML" escaped="true">
-            <configuration>
-            	<appSettings>
-            		<add key="log4net.Internal.Quiet" value="true"/>
-            	</appSettings>
-            </configuration>
-            </code>
-            </example>
-        </member>
-        <member name="P:log4net.Util.LogLog.IsDebugEnabled">
-            <summary>
-            Test if LogLog.Debug is enabled for output.
-            </summary>
-            <value>
-            <c>true</c> if Debug is enabled
-            </value>
-            <remarks>
-            <para>
-            Test if LogLog.Debug is enabled for output.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Util.LogLog.IsWarnEnabled">
-            <summary>
-            Test if LogLog.Warn is enabled for output.
-            </summary>
-            <value>
-            <c>true</c> if Warn is enabled
-            </value>
-            <remarks>
-            <para>
-            Test if LogLog.Warn is enabled for output.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Util.LogLog.IsErrorEnabled">
-            <summary>
-            Test if LogLog.Error is enabled for output.
-            </summary>
-            <value>
-            <c>true</c> if Error is enabled
-            </value>
-            <remarks>
-            <para>
-            Test if LogLog.Error is enabled for output.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Util.NativeError">
-            <summary>
-            Represents a native error code and message.
-            </summary>
-            <remarks>
-            <para>
-            Represents a Win32 platform native error.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-        </member>
-        <member name="M:log4net.Util.NativeError.#ctor(System.Int32,System.String)">
-            <summary>
-            Create an instance of the <see cref="T:log4net.Util.NativeError"/> class with the specified 
-            error number and message.
-            </summary>
-            <param name="number">The number of the native error.</param>
-            <param name="message">The message of the native error.</param>
-            <remarks>
-            <para>
-            Create an instance of the <see cref="T:log4net.Util.NativeError"/> class with the specified 
-            error number and message.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.NativeError.GetLastError">
-            <summary>
-            Create a new instance of the <see cref="T:log4net.Util.NativeError"/> class for the last Windows error.
-            </summary>
-            <returns>
-            An instance of the <see cref="T:log4net.Util.NativeError"/> class for the last windows error.
-            </returns>
-            <remarks>
-            <para>
-            The message for the <see cref="M:System.Runtime.InteropServices.Marshal.GetLastWin32Error"/> error number is lookup up using the 
-            native Win32 <c>FormatMessage</c> function.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.NativeError.GetError(System.Int32)">
-            <summary>
-            Create a new instance of the <see cref="T:log4net.Util.NativeError"/> class.
-            </summary>
-            <param name="number">the error number for the native error</param>
-            <returns>
-            An instance of the <see cref="T:log4net.Util.NativeError"/> class for the specified 
-            error number.
-            </returns>
-            <remarks>
-            <para>
-            The message for the specified error number is lookup up using the 
-            native Win32 <c>FormatMessage</c> function.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.NativeError.GetErrorMessage(System.Int32)">
-            <summary>
-            Retrieves the message corresponding with a Win32 message identifier.
-            </summary>
-            <param name="messageId">Message identifier for the requested message.</param>
-            <returns>
-            The message corresponding with the specified message identifier.
-            </returns>
-            <remarks>
-            <para>
-            The message will be searched for in system message-table resource(s)
-            using the native <c>FormatMessage</c> function.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.NativeError.ToString">
-            <summary>
-            Return error information string
-            </summary>
-            <returns>error information string</returns>
-            <remarks>
-            <para>
-            Return error information string
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.NativeError.FormatMessage(System.Int32,System.IntPtr@,System.Int32,System.Int32,System.String@,System.Int32,System.IntPtr)">
-            <summary>
-            Formats a message string.
-            </summary>
-            <param name="dwFlags">Formatting options, and how to interpret the <paramref name="lpSource"/> parameter.</param>
-            <param name="lpSource">Location of the message definition.</param>
-            <param name="dwMessageId">Message identifier for the requested message.</param>
-            <param name="dwLanguageId">Language identifier for the requested message.</param>
-            <param name="lpBuffer">If <paramref name="dwFlags"/> includes FORMAT_MESSAGE_ALLOCATE_BUFFER, the function allocates a buffer using the <c>LocalAlloc</c> function, and places the pointer to the buffer at the address specified in <paramref name="lpBuffer"/>.</param>
-            <param name="nSize">If the FORMAT_MESSAGE_ALLOCATE_BUFFER flag is not set, this parameter specifies the maximum number of TCHARs that can be stored in the output buffer. If FORMAT_MESSAGE_ALLOCATE_BUFFER is set, this parameter specifies the minimum number of TCHARs to allocate for an output buffer.</param>
-            <param name="Arguments">Pointer to an array of values that are used as insert values in the formatted message.</param>
-            <remarks>
-            <para>
-            The function requires a message definition as input. The message definition can come from a 
-            buffer passed into the function. It can come from a message table resource in an 
-            already-loaded module. Or the caller can ask the function to search the system's message 
-            table resource(s) for the message definition. The function finds the message definition 
-            in a message table resource based on a message identifier and a language identifier. 
-            The function copies the formatted message text to an output buffer, processing any embedded 
-            insert sequences if requested.
-            </para>
-            <para>
-            To prevent the usage of unsafe code, this stub does not support inserting values in the formatted message.
-            </para>
-            </remarks>
-            <returns>
-            <para>
-            If the function succeeds, the return value is the number of TCHARs stored in the output 
-            buffer, excluding the terminating null character.
-            </para>
-            <para>
-            If the function fails, the return value is zero. To get extended error information, 
-            call <see cref="M:System.Runtime.InteropServices.Marshal.GetLastWin32Error"/>.
-            </para>
-            </returns>
-        </member>
-        <member name="P:log4net.Util.NativeError.Number">
-            <summary>
-            Gets the number of the native error.
-            </summary>
-            <value>
-            The number of the native error.
-            </value>
-            <remarks>
-            <para>
-            Gets the number of the native error.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Util.NativeError.Message">
-            <summary>
-            Gets the message of the native error.
-            </summary>
-            <value>
-            The message of the native error.
-            </value>
-            <remarks>
-            <para>
-            </para>
-            Gets the message of the native error.
-            </remarks>
-        </member>
-        <member name="T:log4net.Util.NullDictionaryEnumerator">
-            <summary>
-            An always empty <see cref="T:System.Collections.IDictionaryEnumerator"/>.
-            </summary>
-            <remarks>
-            <para>
-            A singleton implementation of the <see cref="T:System.Collections.IDictionaryEnumerator"/> over a collection
-            that is empty and not modifiable.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-        </member>
-        <member name="M:log4net.Util.NullDictionaryEnumerator.#ctor">
-            <summary>
-            Initializes a new instance of the <see cref="T:log4net.Util.NullDictionaryEnumerator"/> class. 
-            </summary>
-            <remarks>
-            <para>
-            Uses a private access modifier to enforce the singleton pattern.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.NullDictionaryEnumerator.MoveNext">
-            <summary>
-            Test if the enumerator can advance, if so advance.
-            </summary>
-            <returns><c>false</c> as the <see cref="T:log4net.Util.NullDictionaryEnumerator"/> cannot advance.</returns>
-            <remarks>
-            <para>
-            As the enumerator is over an empty collection its <see cref="P:log4net.Util.NullDictionaryEnumerator.Current"/>
-            value cannot be moved over a valid position, therefore <see cref="M:log4net.Util.NullDictionaryEnumerator.MoveNext"/>
-            will always return <c>false</c>.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.NullDictionaryEnumerator.Reset">
-            <summary>
-            Resets the enumerator back to the start.
-            </summary>
-            <remarks>
-            <para>
-            As the enumerator is over an empty collection <see cref="M:log4net.Util.NullDictionaryEnumerator.Reset"/> does nothing.
-            </para>
-            </remarks>
-        </member>
-        <member name="F:log4net.Util.NullDictionaryEnumerator.s_instance">
-            <summary>
-            The singleton instance of the <see cref="T:log4net.Util.NullDictionaryEnumerator"/>.
-            </summary>
-        </member>
-        <member name="P:log4net.Util.NullDictionaryEnumerator.Instance">
-            <summary>
-            Gets the singleton instance of the <see cref="T:log4net.Util.NullDictionaryEnumerator"/>.
-            </summary>
-            <returns>The singleton instance of the <see cref="T:log4net.Util.NullDictionaryEnumerator"/>.</returns>
-            <remarks>
-            <para>
-            Gets the singleton instance of the <see cref="T:log4net.Util.NullDictionaryEnumerator"/>.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Util.NullDictionaryEnumerator.Current">
-            <summary>
-            Gets the current object from the enumerator.
-            </summary>
-            <remarks>
-            Throws an <see cref="T:System.InvalidOperationException"/> because the 
-            <see cref="T:log4net.Util.NullDictionaryEnumerator"/> never has a current value.
-            </remarks>
-            <remarks>
-            <para>
-            As the enumerator is over an empty collection its <see cref="P:log4net.Util.NullDictionaryEnumerator.Current"/>
-            value cannot be moved over a valid position, therefore <see cref="P:log4net.Util.NullDictionaryEnumerator.Current"/>
-            will throw an <see cref="T:System.InvalidOperationException"/>.
-            </para>
-            </remarks>
-            <exception cref="T:System.InvalidOperationException">The collection is empty and <see cref="P:log4net.Util.NullDictionaryEnumerator.Current"/> 
-            cannot be positioned over a valid location.</exception>
-        </member>
-        <member name="P:log4net.Util.NullDictionaryEnumerator.Key">
-            <summary>
-            Gets the current key from the enumerator.
-            </summary>
-            <remarks>
-            Throws an exception because the <see cref="T:log4net.Util.NullDictionaryEnumerator"/>
-            never has a current value.
-            </remarks>
-            <remarks>
-            <para>
-            As the enumerator is over an empty collection its <see cref="P:log4net.Util.NullDictionaryEnumerator.Current"/>
-            value cannot be moved over a valid position, therefore <see cref="P:log4net.Util.NullDictionaryEnumerator.Key"/>
-            will throw an <see cref="T:System.InvalidOperationException"/>.
-            </para>
-            </remarks>
-            <exception cref="T:System.InvalidOperationException">The collection is empty and <see cref="P:log4net.Util.NullDictionaryEnumerator.Current"/> 
-            cannot be positioned over a valid location.</exception>
-        </member>
-        <member name="P:log4net.Util.NullDictionaryEnumerator.Value">
-            <summary>
-            Gets the current value from the enumerator.
-            </summary>
-            <value>The current value from the enumerator.</value>
-            <remarks>
-            Throws an <see cref="T:System.InvalidOperationException"/> because the 
-            <see cref="T:log4net.Util.NullDictionaryEnumerator"/> never has a current value.
-            </remarks>
-            <remarks>
-            <para>
-            As the enumerator is over an empty collection its <see cref="P:log4net.Util.NullDictionaryEnumerator.Current"/>
-            value cannot be moved over a valid position, therefore <see cref="P:log4net.Util.NullDictionaryEnumerator.Value"/>
-            will throw an <see cref="T:System.InvalidOperationException"/>.
-            </para>
-            </remarks>
-            <exception cref="T:System.InvalidOperationException">The collection is empty and <see cref="P:log4net.Util.NullDictionaryEnumerator.Current"/> 
-            cannot be positioned over a valid location.</exception>
-        </member>
-        <member name="P:log4net.Util.NullDictionaryEnumerator.Entry">
-            <summary>
-            Gets the current entry from the enumerator.
-            </summary>
-            <remarks>
-            Throws an <see cref="T:System.InvalidOperationException"/> because the 
-            <see cref="T:log4net.Util.NullDictionaryEnumerator"/> never has a current entry.
-            </remarks>
-            <remarks>
-            <para>
-            As the enumerator is over an empty collection its <see cref="P:log4net.Util.NullDictionaryEnumerator.Current"/>
-            value cannot be moved over a valid position, therefore <see cref="P:log4net.Util.NullDictionaryEnumerator.Entry"/>
-            will throw an <see cref="T:System.InvalidOperationException"/>.
-            </para>
-            </remarks>
-            <exception cref="T:System.InvalidOperationException">The collection is empty and <see cref="P:log4net.Util.NullDictionaryEnumerator.Current"/> 
-            cannot be positioned over a valid location.</exception>
-        </member>
-        <member name="T:log4net.Util.NullEnumerator">
-            <summary>
-            An always empty <see cref="T:System.Collections.IEnumerator"/>.
-            </summary>
-            <remarks>
-            <para>
-            A singleton implementation of the <see cref="T:System.Collections.IEnumerator"/> over a collection
-            that is empty and not modifiable.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-        </member>
-        <member name="M:log4net.Util.NullEnumerator.#ctor">
-            <summary>
-            Initializes a new instance of the <see cref="T:log4net.Util.NullEnumerator"/> class. 
-            </summary>
-            <remarks>
-            <para>
-            Uses a private access modifier to enforce the singleton pattern.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.NullEnumerator.MoveNext">
-            <summary>
-            Test if the enumerator can advance, if so advance
-            </summary>
-            <returns><c>false</c> as the <see cref="T:log4net.Util.NullEnumerator"/> cannot advance.</returns>
-            <remarks>
-            <para>
-            As the enumerator is over an empty collection its <see cref="P:log4net.Util.NullEnumerator.Current"/>
-            value cannot be moved over a valid position, therefore <see cref="M:log4net.Util.NullEnumerator.MoveNext"/>
-            will always return <c>false</c>.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.NullEnumerator.Reset">
-            <summary>
-            Resets the enumerator back to the start.
-            </summary>
-            <remarks>
-            <para>
-            As the enumerator is over an empty collection <see cref="M:log4net.Util.NullEnumerator.Reset"/> does nothing.
-            </para>
-            </remarks>
-        </member>
-        <member name="F:log4net.Util.NullEnumerator.s_instance">
-            <summary>
-            The singleton instance of the <see cref="T:log4net.Util.NullEnumerator"/>.
-            </summary>
-        </member>
-        <member name="P:log4net.Util.NullEnumerator.Instance">
-            <summary>
-            Get the singleton instance of the <see cref="T:log4net.Util.NullEnumerator"/>.
-            </summary>
-            <returns>The singleton instance of the <see cref="T:log4net.Util.NullEnumerator"/>.</returns>
-            <remarks>
-            <para>
-            Gets the singleton instance of the <see cref="T:log4net.Util.NullEnumerator"/>.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Util.NullEnumerator.Current">
-            <summary>
-            Gets the current object from the enumerator.
-            </summary>
-            <remarks>
-            Throws an <see cref="T:System.InvalidOperationException"/> because the 
-            <see cref="T:log4net.Util.NullDictionaryEnumerator"/> never has a current value.
-            </remarks>
-            <remarks>
-            <para>
-            As the enumerator is over an empty collection its <see cref="P:log4net.Util.NullEnumerator.Current"/>
-            value cannot be moved over a valid position, therefore <see cref="P:log4net.Util.NullEnumerator.Current"/>
-            will throw an <see cref="T:System.InvalidOperationException"/>.
-            </para>
-            </remarks>
-            <exception cref="T:System.InvalidOperationException">The collection is empty and <see cref="P:log4net.Util.NullEnumerator.Current"/> 
-            cannot be positioned over a valid location.</exception>
-        </member>
-        <member name="T:log4net.Util.NullSecurityContext">
-            <summary>
-            A SecurityContext used when a SecurityContext is not required
-            </summary>
-            <remarks>
-            <para>
-            The <see cref="T:log4net.Util.NullSecurityContext"/> is a no-op implementation of the
-            <see cref="T:log4net.Core.SecurityContext"/> base class. It is used where a <see cref="T:log4net.Core.SecurityContext"/>
-            is required but one has not been provided.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-        </member>
-        <member name="F:log4net.Util.NullSecurityContext.Instance">
-            <summary>
-            Singleton instance of <see cref="T:log4net.Util.NullSecurityContext"/>
-            </summary>
-            <remarks>
-            <para>
-            Singleton instance of <see cref="T:log4net.Util.NullSecurityContext"/>
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.NullSecurityContext.#ctor">
-            <summary>
-            Private constructor
-            </summary>
-            <remarks>
-            <para>
-            Private constructor for singleton pattern.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.NullSecurityContext.Impersonate(System.Object)">
-            <summary>
-            Impersonate this SecurityContext
-            </summary>
-            <param name="state">State supplied by the caller</param>
-            <returns><c>null</c></returns>
-            <remarks>
-            <para>
-            No impersonation is done and <c>null</c> is always returned.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Util.OnlyOnceErrorHandler">
-            <summary>
-            Implements log4net's default error handling policy which consists 
-            of emitting a message for the first error in an appender and 
-            ignoring all subsequent errors.
-            </summary>
-            <remarks>
-            <para>
-            The error message is printed on the standard error output stream.
-            </para>
-            <para>
-            This policy aims at protecting an otherwise working application
-            from being flooded with error messages when logging fails.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-        </member>
-        <member name="M:log4net.Util.OnlyOnceErrorHandler.#ctor">
-            <summary>
-            Default Constructor
-            </summary>
-            <remarks>
-            <para>
-            Initializes a new instance of the <see cref="T:log4net.Util.OnlyOnceErrorHandler"/> class.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.OnlyOnceErrorHandler.#ctor(System.String)">
-            <summary>
-            Constructor
-            </summary>
-            <param name="prefix">The prefix to use for each message.</param>
-            <remarks>
-            <para>
-            Initializes a new instance of the <see cref="T:log4net.Util.OnlyOnceErrorHandler"/> class
-            with the specified prefix.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.OnlyOnceErrorHandler.Error(System.String,System.Exception,log4net.Core.ErrorCode)">
-            <summary>
-            Log an Error
-            </summary>
-            <param name="message">The error message.</param>
-            <param name="e">The exception.</param>
-            <param name="errorCode">The internal error code.</param>
-            <remarks>
-            <para>
-            Prints the message and the stack trace of the exception on the standard
-            error output stream.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.OnlyOnceErrorHandler.Error(System.String,System.Exception)">
-            <summary>
-            Log an Error
-            </summary>
-            <param name="message">The error message.</param>
-            <param name="e">The exception.</param>
-            <remarks>
-            <para>
-            Prints the message and the stack trace of the exception on the standard
-            error output stream.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.OnlyOnceErrorHandler.Error(System.String)">
-            <summary>
-            Log an error
-            </summary>
-            <param name="message">The error message.</param>
-            <remarks>
-            <para>
-            Print a the error message passed as parameter on the standard
-            error output stream.
-            </para>
-            </remarks>
-        </member>
-        <member name="F:log4net.Util.OnlyOnceErrorHandler.m_firstTime">
-            <summary>
-            Flag to indicate if it is the first error
-            </summary>
-        </member>
-        <member name="F:log4net.Util.OnlyOnceErrorHandler.m_prefix">
-            <summary>
-            String to prefix each message with
-            </summary>
-        </member>
-        <member name="P:log4net.Util.OnlyOnceErrorHandler.IsEnabled">
-            <summary>
-            Is error logging enabled
-            </summary>
-            <remarks>
-            <para>
-            Is error logging enabled. Logging is only enabled for the
-            first error delivered to the <see cref="T:log4net.Util.OnlyOnceErrorHandler"/>.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Util.OptionConverter">
-            <summary>
-            A convenience class to convert property values to specific types.
-            </summary>
-            <remarks>
-            <para>
-            Utility functions for converting types and parsing values.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-        </member>
-        <member name="M:log4net.Util.OptionConverter.#ctor">
-            <summary>
-            Initializes a new instance of the <see cref="T:log4net.Util.OptionConverter"/> class. 
-            </summary>
-            <remarks>
-            <para>
-            Uses a private access modifier to prevent instantiation of this class.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.OptionConverter.ToBoolean(System.String,System.Boolean)">
-            <summary>
-            Converts a string to a <see cref="T:System.Boolean"/> value.
-            </summary>
-            <param name="argValue">String to convert.</param>
-            <param name="defaultValue">The default value.</param>
-            <returns>The <see cref="T:System.Boolean"/> value of <paramref name="argValue"/>.</returns>
-            <remarks>
-            <para>
-            If <paramref name="argValue"/> is "true", then <c>true</c> is returned. 
-            If <paramref name="argValue"/> is "false", then <c>false</c> is returned. 
-            Otherwise, <paramref name="defaultValue"/> is returned.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.OptionConverter.ToFileSize(System.String,System.Int64)">
-            <summary>
-            Parses a file size into a number.
-            </summary>
-            <param name="argValue">String to parse.</param>
-            <param name="defaultValue">The default value.</param>
-            <returns>The <see cref="T:System.Int64"/> value of <paramref name="argValue"/>.</returns>
-            <remarks>
-            <para>
-            Parses a file size of the form: number[KB|MB|GB] into a
-            long value. It is scaled with the appropriate multiplier.
-            </para>
-            <para>
-            <paramref name="defaultValue"/> is returned when <paramref name="argValue"/>
-            cannot be converted to a <see cref="T:System.Int64"/> value.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.OptionConverter.ConvertStringTo(System.Type,System.String)">
-            <summary>
-            Converts a string to an object.
-            </summary>
-            <param name="target">The target type to convert to.</param>
-            <param name="txt">The string to convert to an object.</param>
-            <returns>
-            The object converted from a string or <c>null</c> when the 
-            conversion failed.
-            </returns>
-            <remarks>
-            <para>
-            Converts a string to an object. Uses the converter registry to try
-            to convert the string value into the specified target type.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.OptionConverter.CanConvertTypeTo(System.Type,System.Type)">
-            <summary>
-            Checks if there is an appropriate type conversion from the source type to the target type.
-            </summary>
-            <param name="sourceType">The type to convert from.</param>
-            <param name="targetType">The type to convert to.</param>
-            <returns><c>true</c> if there is a conversion from the source type to the target type.</returns>
-            <remarks>
-            Checks if there is an appropriate type conversion from the source type to the target type.
-            <para>
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.OptionConverter.ConvertTypeTo(System.Object,System.Type)">
-            <summary>
-            Converts an object to the target type.
-            </summary>
-            <param name="sourceInstance">The object to convert to the target type.</param>
-            <param name="targetType">The type to convert to.</param>
-            <returns>The converted object.</returns>
-            <remarks>
-            <para>
-            Converts an object to the target type.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.OptionConverter.InstantiateByClassName(System.String,System.Type,System.Object)">
-            <summary>
-            Instantiates an object given a class name.
-            </summary>
-            <param name="className">The fully qualified class name of the object to instantiate.</param>
-            <param name="superClass">The class to which the new object should belong.</param>
-            <param name="defaultValue">The object to return in case of non-fulfillment.</param>
-            <returns>
-            An instance of the <paramref name="className"/> or <paramref name="defaultValue"/>
-            if the object could not be instantiated.
-            </returns>
-            <remarks>
-            <para>
-            Checks that the <paramref name="className"/> is a subclass of
-            <paramref name="superClass"/>. If that test fails or the object could
-            not be instantiated, then <paramref name="defaultValue"/> is returned.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.OptionConverter.SubstituteVariables(System.String,System.Collections.IDictionary)">
-            <summary>
-            Performs variable substitution in string <paramref name="val"/> from the 
-            values of keys found in <paramref name="props"/>.
-            </summary>
-            <param name="value">The string on which variable substitution is performed.</param>
-            <param name="props">The dictionary to use to lookup variables.</param>
-            <returns>The result of the substitutions.</returns>
-            <remarks>
-            <para>
-            The variable substitution delimiters are <b>${</b> and <b>}</b>.
-            </para>
-            <para>
-            For example, if props contains <c>key=value</c>, then the call
-            </para>
-            <para>
-            <code lang="C#">
-            string s = OptionConverter.SubstituteVariables("Value of key is ${key}.");
-            </code>
-            </para>
-            <para>
-            will set the variable <c>s</c> to "Value of key is value.".
-            </para>
-            <para>
-            If no value could be found for the specified key, then substitution 
-            defaults to an empty string.
-            </para>
-            <para>
-            For example, if system properties contains no value for the key
-            "nonExistentKey", then the call
-            </para>
-            <para>
-            <code lang="C#">
-            string s = OptionConverter.SubstituteVariables("Value of nonExistentKey is [${nonExistentKey}]");
-            </code>
-            </para>
-            <para>
-            will set <s>s</s> to "Value of nonExistentKey is []".	 
-            </para>
-            <para>
-            An Exception is thrown if <paramref name="value"/> contains a start 
-            delimiter "${" which is not balanced by a stop delimiter "}". 
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.OptionConverter.ParseEnum(System.Type,System.String,System.Boolean)">
-            <summary>
-            Converts the string representation of the name or numeric value of one or 
-            more enumerated constants to an equivalent enumerated object.
-            </summary>
-            <param name="enumType">The type to convert to.</param>
-            <param name="value">The enum string value.</param>
-            <param name="ignoreCase">If <c>true</c>, ignore case; otherwise, regard case.</param>
-            <returns>An object of type <paramref name="enumType" /> whose value is represented by <paramref name="value" />.</returns>
-        </member>
-        <member name="T:log4net.Util.PatternParser">
-            <summary>
-            Most of the work of the <see cref="T:log4net.Layout.PatternLayout"/> class
-            is delegated to the PatternParser class.
-            </summary>
-            <remarks>
-            <para>
-            The <c>PatternParser</c> processes a pattern string and
-            returns a chain of <see cref="T:log4net.Util.PatternConverter"/> objects.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-        </member>
-        <member name="M:log4net.Util.PatternParser.#ctor(System.String)">
-            <summary>
-            Constructor
-            </summary>
-            <param name="pattern">The pattern to parse.</param>
-            <remarks>
-            <para>
-            Initializes a new instance of the <see cref="T:log4net.Util.PatternParser"/> class 
-            with the specified pattern string.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.PatternParser.Parse">
-            <summary>
-            Parses the pattern into a chain of pattern converters.
-            </summary>
-            <returns>The head of a chain of pattern converters.</returns>
-            <remarks>
-            <para>
-            Parses the pattern into a chain of pattern converters.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.PatternParser.BuildCache">
-            <summary>
-            Build the unified cache of converters from the static and instance maps
-            </summary>
-            <returns>the list of all the converter names</returns>
-            <remarks>
-            <para>
-            Build the unified cache of converters from the static and instance maps
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.PatternParser.ParseInternal(System.String,System.String[])">
-            <summary>
-            Internal method to parse the specified pattern to find specified matches
-            </summary>
-            <param name="pattern">the pattern to parse</param>
-            <param name="matches">the converter names to match in the pattern</param>
-            <remarks>
-            <para>
-            The matches param must be sorted such that longer strings come before shorter ones.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.PatternParser.ProcessLiteral(System.String)">
-            <summary>
-            Process a parsed literal
-            </summary>
-            <param name="text">the literal text</param>
-        </member>
-        <member name="M:log4net.Util.PatternParser.ProcessConverter(System.String,System.String,log4net.Util.FormattingInfo)">
-            <summary>
-            Process a parsed converter pattern
-            </summary>
-            <param name="converterName">the name of the converter</param>
-            <param name="option">the optional option for the converter</param>
-            <param name="formattingInfo">the formatting info for the converter</param>
-        </member>
-        <member name="M:log4net.Util.PatternParser.AddConverter(log4net.Util.PatternConverter)">
-            <summary>
-            Resets the internal state of the parser and adds the specified pattern converter 
-            to the chain.
-            </summary>
-            <param name="pc">The pattern converter to add.</param>
-        </member>
-        <member name="F:log4net.Util.PatternParser.m_head">
-            <summary>
-            The first pattern converter in the chain
-            </summary>
-        </member>
-        <member name="F:log4net.Util.PatternParser.m_tail">
-            <summary>
-             the last pattern converter in the chain
-            </summary>
-        </member>
-        <member name="F:log4net.Util.PatternParser.m_pattern">
-            <summary>
-            The pattern
-            </summary>
-        </member>
-        <member name="F:log4net.Util.PatternParser.m_patternConverters">
-            <summary>
-            Internal map of converter identifiers to converter types
-            </summary>
-            <remarks>
-            <para>
-            This map overrides the static s_globalRulesRegistry map.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Util.PatternParser.PatternConverters">
-            <summary>
-            Get the converter registry used by this parser
-            </summary>
-            <value>
-            The converter registry used by this parser
-            </value>
-            <remarks>
-            <para>
-            Get the converter registry used by this parser
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Util.PatternParser.StringLengthComparer">
-            <summary>
-            Sort strings by length
-            </summary>
-            <remarks>
-            <para>
-            <see cref="T:System.Collections.IComparer"/> that orders strings by string length.
-            The longest strings are placed first
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Util.PatternString">
-            <summary>
-            This class implements a patterned string.
-            </summary>
-            <remarks>
-            <para>
-            This string has embedded patterns that are resolved and expanded
-            when the string is formatted.
-            </para>
-            <para>
-            This class functions similarly to the <see cref="T:log4net.Layout.PatternLayout"/>
-            in that it accepts a pattern and renders it to a string. Unlike the 
-            <see cref="T:log4net.Layout.PatternLayout"/> however the <c>PatternString</c>
-            does not render the properties of a specific <see cref="T:log4net.Core.LoggingEvent"/> but
-            of the process in general.
-            </para>
-            <para>
-            The recognized conversion pattern names are:
-            </para>
-            <list type="table">
-                <listheader>
-                    <term>Conversion Pattern Name</term>
-                    <description>Effect</description>
-                </listheader>
-                <item>
-                    <term>appdomain</term>
-                    <description>
-                        <para>
-                        Used to output the friendly name of the current AppDomain.
-                        </para>
-                    </description>
-                </item>
-                <item>
-                    <term>date</term>
-                    <description>
-            			<para>
-            			Used to output the date of the logging event in the local time zone. 
-            			To output the date in universal time use the <c>%utcdate</c> pattern.
-            			The date conversion 
-            			specifier may be followed by a <i>date format specifier</i> enclosed 
-            			between braces. For example, <b>%date{HH:mm:ss,fff}</b> or
-            			<b>%date{dd MMM yyyy HH:mm:ss,fff}</b>.  If no date format specifier is 
-            			given then ISO8601 format is
-            			assumed (<see cref="T:log4net.DateFormatter.Iso8601DateFormatter"/>).
-            			</para>
-            			<para>
-            			The date format specifier admits the same syntax as the
-            			time pattern string of the <see cref="M:System.DateTime.ToString(System.String)"/>.
-            			</para>
-            			<para>
-            			For better results it is recommended to use the log4net date
-            			formatters. These can be specified using one of the strings
-            			"ABSOLUTE", "DATE" and "ISO8601" for specifying 
-            			<see cref="T:log4net.DateFormatter.AbsoluteTimeDateFormatter"/>, 
-            			<see cref="T:log4net.DateFormatter.DateTimeDateFormatter"/> and respectively 
-            			<see cref="T:log4net.DateFormatter.Iso8601DateFormatter"/>. For example, 
-            			<b>%date{ISO8601}</b> or <b>%date{ABSOLUTE}</b>.
-            			</para>
-            			<para>
-            			These dedicated date formatters perform significantly
-            			better than <see cref="M:System.DateTime.ToString(System.String)"/>.
-            			</para>
-                    </description>
-                </item>
-                <item>
-                    <term>env</term>
-                    <description>
-                        <para>
-            			Used to output the a specific environment variable. The key to 
-            			lookup must be specified within braces and directly following the
-            			pattern specifier, e.g. <b>%env{COMPUTERNAME}</b> would include the value
-            			of the <c>COMPUTERNAME</c> environment variable.
-                        </para>
-                        <para>
-                        The <c>env</c> pattern is not supported on the .NET Compact Framework.
-                        </para>
-                    </description>
-                </item>
-                <item>
-                    <term>identity</term>
-                    <description>
-            			<para>
-            			Used to output the user name for the currently active user
-            			(Principal.Identity.Name).
-            			</para>
-                    </description>
-                </item>
-                <item>
-                    <term>newline</term>
-                    <description>
-            			<para>
-            			Outputs the platform dependent line separator character or
-            			characters.
-            			</para>
-            			<para>
-            			This conversion pattern name offers the same performance as using 
-            			non-portable line separator strings such as	"\n", or "\r\n". 
-            			Thus, it is the preferred way of specifying a line separator.
-            			</para> 
-                    </description>
-                </item>
-                <item>
-                    <term>processid</term>
-                    <description>
-                        <para>
-            			Used to output the system process ID for the current process.
-                        </para>
-                    </description>
-                </item>
-                <item>
-                    <term>property</term>
-                    <description>
-            			<para>
-            			Used to output a specific context property. The key to 
-            			lookup must be specified within braces and directly following the
-            			pattern specifier, e.g. <b>%property{user}</b> would include the value
-            			from the property that is keyed by the string 'user'. Each property value
-            			that is to be included in the log must be specified separately.
-            			Properties are stored in logging contexts. By default 
-            			the <c>log4net:HostName</c> property is set to the name of machine on 
-            			which the event was originally logged.
-            			</para>
-            			<para>
-            			If no key is specified, e.g. <b>%property</b> then all the keys and their
-            			values are printed in a comma separated list.
-            			</para>
-            			<para>
-            			The properties of an event are combined from a number of different
-            			contexts. These are listed below in the order in which they are searched.
-            			</para>
-            			<list type="definition">
-            				<item>
-            					<term>the thread properties</term>
-            					<description>
-            					The <see cref="P:log4net.ThreadContext.Properties"/> that are set on the current
-            					thread. These properties are shared by all events logged on this thread.
-            					</description>
-            				</item>
-            				<item>
-            					<term>the global properties</term>
-            					<description>
-            					The <see cref="P:log4net.GlobalContext.Properties"/> that are set globally. These 
-            					properties are shared by all the threads in the AppDomain.
-            					</description>
-            				</item>
-            			</list>
-                    </description>
-                </item>
-                <item>
-                    <term>random</term>
-                    <description>
-                        <para>
-                        Used to output a random string of characters. The string is made up of
-                        uppercase letters and numbers. By default the string is 4 characters long.
-                        The length of the string can be specified within braces directly following the
-            			pattern specifier, e.g. <b>%random{8}</b> would output an 8 character string.
-                        </para>
-                    </description>
-                </item>
-                <item>
-                    <term>username</term>
-                    <description>
-            			<para>
-            			Used to output the WindowsIdentity for the currently
-            			active user.
-            			</para>
-                    </description>
-                </item>
-                <item>
-                    <term>utcdate</term>
-                    <description>
-            			<para>
-            			Used to output the date of the logging event in universal time. 
-            			The date conversion 
-            			specifier may be followed by a <i>date format specifier</i> enclosed 
-            			between braces. For example, <b>%utcdate{HH:mm:ss,fff}</b> or
-            			<b>%utcdate{dd MMM yyyy HH:mm:ss,fff}</b>.  If no date format specifier is 
-            			given then ISO8601 format is
-            			assumed (<see cref="T:log4net.DateFormatter.Iso8601DateFormatter"/>).
-            			</para>
-            			<para>
-            			The date format specifier admits the same syntax as the
-            			time pattern string of the <see cref="M:System.DateTime.ToString(System.String)"/>.
-            			</para>
-            			<para>
-            			For better results it is recommended to use the log4net date
-            			formatters. These can be specified using one of the strings
-            			"ABSOLUTE", "DATE" and "ISO8601" for specifying 
-            			<see cref="T:log4net.DateFormatter.AbsoluteTimeDateFormatter"/>, 
-            			<see cref="T:log4net.DateFormatter.DateTimeDateFormatter"/> and respectively 
-            			<see cref="T:log4net.DateFormatter.Iso8601DateFormatter"/>. For example, 
-            			<b>%utcdate{ISO8601}</b> or <b>%utcdate{ABSOLUTE}</b>.
-            			</para>
-            			<para>
-            			These dedicated date formatters perform significantly
-            			better than <see cref="M:System.DateTime.ToString(System.String)"/>.
-            			</para>
-                    </description>
-                </item>
-            	<item>
-            		<term>%</term>
-            		<description>
-            			<para>
-            			The sequence %% outputs a single percent sign.
-            			</para>
-            		</description>
-            	</item>
-            </list>
-            <para>
-            Additional pattern converters may be registered with a specific <see cref="T:log4net.Util.PatternString"/>
-            instance using <see cref="M:log4net.Util.PatternString.AddConverter(log4net.Util.PatternString.ConverterInfo)"/> or
-            <see cref="M:log4net.Util.PatternString.AddConverter(System.String,System.Type)"/>.
-            </para>
-            <para>
-            See the <see cref="T:log4net.Layout.PatternLayout"/> for details on the 
-            <i>format modifiers</i> supported by the patterns.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-        </member>
-        <member name="F:log4net.Util.PatternString.s_globalRulesRegistry">
-            <summary>
-            Internal map of converter identifiers to converter types.
-            </summary>
-        </member>
-        <member name="F:log4net.Util.PatternString.m_pattern">
-            <summary>
-            the pattern
-            </summary>
-        </member>
-        <member name="F:log4net.Util.PatternString.m_head">
-            <summary>
-            the head of the pattern converter chain
-            </summary>
-        </member>
-        <member name="F:log4net.Util.PatternString.m_instanceRulesRegistry">
-            <summary>
-            patterns defined on this PatternString only
-            </summary>
-        </member>
-        <member name="M:log4net.Util.PatternString.#cctor">
-            <summary>
-            Initialize the global registry
-            </summary>
-        </member>
-        <member name="M:log4net.Util.PatternString.#ctor">
-            <summary>
-            Default constructor
-            </summary>
-            <remarks>
-            <para>
-            Initialize a new instance of <see cref="T:log4net.Util.PatternString"/>
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.PatternString.#ctor(System.String)">
-            <summary>
-            Constructs a PatternString
-            </summary>
-            <param name="pattern">The pattern to use with this PatternString</param>
-            <remarks>
-            <para>
-            Initialize a new instance of <see cref="T:log4net.Util.PatternString"/> with the pattern specified.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.PatternString.ActivateOptions">
-            <summary>
-            Initialize object options
-            </summary>
-            <remarks>
-            <para>
-            This is part of the <see cref="T:log4net.Core.IOptionHandler"/> delayed object
-            activation scheme. The <see cref="M:log4net.Util.PatternString.ActivateOptions"/> method must 
-            be called on this object after the configuration properties have
-            been set. Until <see cref="M:log4net.Util.PatternString.ActivateOptions"/> is called this
-            object is in an undefined state and must not be used. 
-            </para>
-            <para>
-            If any of the configuration properties are modified then 
-            <see cref="M:log4net.Util.PatternString.ActivateOptions"/> must be called again.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.PatternString.CreatePatternParser(System.String)">
-            <summary>
-            Create the <see cref="T:log4net.Util.PatternParser"/> used to parse the pattern
-            </summary>
-            <param name="pattern">the pattern to parse</param>
-            <returns>The <see cref="T:log4net.Util.PatternParser"/></returns>
-            <remarks>
-            <para>
-            Returns PatternParser used to parse the conversion string. Subclasses
-            may override this to return a subclass of PatternParser which recognize
-            custom conversion pattern name.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.PatternString.Format(System.IO.TextWriter)">
-            <summary>
-            Produces a formatted string as specified by the conversion pattern.
-            </summary>
-            <param name="writer">The TextWriter to write the formatted event to</param>
-            <remarks>
-            <para>
-            Format the pattern to the <paramref name="writer"/>.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.PatternString.Format">
-            <summary>
-            Format the pattern as a string
-            </summary>
-            <returns>the pattern formatted as a string</returns>
-            <remarks>
-            <para>
-            Format the pattern to a string.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.PatternString.AddConverter(log4net.Util.PatternString.ConverterInfo)">
-            <summary>
-            Add a converter to this PatternString
-            </summary>
-            <param name="converterInfo">the converter info</param>
-            <remarks>
-            <para>
-            This version of the method is used by the configurator.
-            Programmatic users should use the alternative <see cref="M:log4net.Util.PatternString.AddConverter(System.String,System.Type)"/> method.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.PatternString.AddConverter(System.String,System.Type)">
-            <summary>
-            Add a converter to this PatternString
-            </summary>
-            <param name="name">the name of the conversion pattern for this converter</param>
-            <param name="type">the type of the converter</param>
-            <remarks>
-            <para>
-            Add a converter to this PatternString
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Util.PatternString.ConversionPattern">
-            <summary>
-            Gets or sets the pattern formatting string
-            </summary>
-            <value>
-            The pattern formatting string
-            </value>
-            <remarks>
-            <para>
-            The <b>ConversionPattern</b> option. This is the string which
-            controls formatting and consists of a mix of literal content and
-            conversion specifiers.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Util.PatternString.ConverterInfo">
-            <summary>
-            Wrapper class used to map converter names to converter types
-            </summary>
-            <remarks>
-            <para>
-            Wrapper class used to map converter names to converter types
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.PatternString.ConverterInfo.#ctor">
-            <summary>
-            default constructor
-            </summary>
-        </member>
-        <member name="P:log4net.Util.PatternString.ConverterInfo.Name">
-            <summary>
-            Gets or sets the name of the conversion pattern
-            </summary>
-            <value>
-            The name of the conversion pattern
-            </value>
-            <remarks>
-            <para>
-            Gets or sets the name of the conversion pattern
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Util.PatternString.ConverterInfo.Type">
-            <summary>
-            Gets or sets the type of the converter
-            </summary>
-            <value>
-            The type of the converter
-            </value>
-            <remarks>
-            <para>
-            Gets or sets the type of the converter
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Util.PropertiesDictionary">
-            <summary>
-            String keyed object map.
-            </summary>
-            <remarks>
-            <para>
-            While this collection is serializable only member 
-            objects that are serializable will
-            be serialized along with this collection.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-        </member>
-        <member name="T:log4net.Util.ReadOnlyPropertiesDictionary">
-            <summary>
-            String keyed object map that is read only.
-            </summary>
-            <remarks>
-            <para>
-            This collection is readonly and cannot be modified.
-            </para>
-            <para>
-            While this collection is serializable only member 
-            objects that are serializable will
-            be serialized along with this collection.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-        </member>
-        <member name="F:log4net.Util.ReadOnlyPropertiesDictionary.m_hashtable">
-            <summary>
-            The Hashtable used to store the properties data
-            </summary>
-        </member>
-        <member name="M:log4net.Util.ReadOnlyPropertiesDictionary.#ctor">
-            <summary>
-            Constructor
-            </summary>
-            <remarks>
-            <para>
-            Initializes a new instance of the <see cref="T:log4net.Util.ReadOnlyPropertiesDictionary"/> class.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.ReadOnlyPropertiesDictionary.#ctor(log4net.Util.ReadOnlyPropertiesDictionary)">
-            <summary>
-            Copy Constructor
-            </summary>
-            <param name="propertiesDictionary">properties to copy</param>
-            <remarks>
-            <para>
-            Initializes a new instance of the <see cref="T:log4net.Util.ReadOnlyPropertiesDictionary"/> class.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.ReadOnlyPropertiesDictionary.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
-            <summary>
-            Deserialization constructor
-            </summary>
-            <param name="info">The <see cref="T:System.Runtime.Serialization.SerializationInfo"/> that holds the serialized object data.</param>
-            <param name="context">The <see cref="T:System.Runtime.Serialization.StreamingContext"/> that contains contextual information about the source or destination.</param>
-            <remarks>
-            <para>
-            Initializes a new instance of the <see cref="T:log4net.Util.ReadOnlyPropertiesDictionary"/> class 
-            with serialized data.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.ReadOnlyPropertiesDictionary.GetKeys">
-            <summary>
-            Gets the key names.
-            </summary>
-            <returns>An array of all the keys.</returns>
-            <remarks>
-            <para>
-            Gets the key names.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.ReadOnlyPropertiesDictionary.Contains(System.String)">
-            <summary>
-            Test if the dictionary contains a specified key
-            </summary>
-            <param name="key">the key to look for</param>
-            <returns>true if the dictionary contains the specified key</returns>
-            <remarks>
-            <para>
-            Test if the dictionary contains a specified key
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.ReadOnlyPropertiesDictionary.GetObjectData(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
-            <summary>
-            Serializes this object into the <see cref="T:System.Runtime.Serialization.SerializationInfo"/> provided.
-            </summary>
-            <param name="info">The <see cref="T:System.Runtime.Serialization.SerializationInfo"/> to populate with data.</param>
-            <param name="context">The destination for this serialization.</param>
-            <remarks>
-            <para>
-            Serializes this object into the <see cref="T:System.Runtime.Serialization.SerializationInfo"/> provided.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.ReadOnlyPropertiesDictionary.System#Collections#IDictionary#GetEnumerator">
-            <summary>
-            See <see cref="M:System.Collections.IDictionary.GetEnumerator"/>
-            </summary>
-        </member>
-        <member name="M:log4net.Util.ReadOnlyPropertiesDictionary.System#Collections#IDictionary#Remove(System.Object)">
-            <summary>
-            See <see cref="M:System.Collections.IDictionary.Remove(System.Object)"/>
-            </summary>
-            <param name="key"></param>
-        </member>
-        <member name="M:log4net.Util.ReadOnlyPropertiesDictionary.System#Collections#IDictionary#Contains(System.Object)">
-            <summary>
-            See <see cref="M:System.Collections.IDictionary.Contains(System.Object)"/>
-            </summary>
-            <param name="key"></param>
-            <returns></returns>
-        </member>
-        <member name="M:log4net.Util.ReadOnlyPropertiesDictionary.Clear">
-            <summary>
-            Remove all properties from the properties collection
-            </summary>
-        </member>
-        <member name="M:log4net.Util.ReadOnlyPropertiesDictionary.System#Collections#IDictionary#Add(System.Object,System.Object)">
-            <summary>
-            See <see cref="M:System.Collections.IDictionary.Add(System.Object,System.Object)"/>
-            </summary>
-            <param name="key"></param>
-            <param name="value"></param>
-        </member>
-        <member name="M:log4net.Util.ReadOnlyPropertiesDictionary.System#Collections#ICollection#CopyTo(System.Array,System.Int32)">
-            <summary>
-            See <see cref="M:System.Collections.ICollection.CopyTo(System.Array,System.Int32)"/>
-            </summary>
-            <param name="array"></param>
-            <param name="index"></param>
-        </member>
-        <member name="M:log4net.Util.ReadOnlyPropertiesDictionary.System#Collections#IEnumerable#GetEnumerator">
-            <summary>
-            See <see cref="M:System.Collections.IEnumerable.GetEnumerator"/>
-            </summary>
-        </member>
-        <member name="P:log4net.Util.ReadOnlyPropertiesDictionary.Item(System.String)">
-            <summary>
-            Gets or sets the value of the  property with the specified key.
-            </summary>
-            <value>
-            The value of the property with the specified key.
-            </value>
-            <param name="key">The key of the property to get or set.</param>
-            <remarks>
-            <para>
-            The property value will only be serialized if it is serializable.
-            If it cannot be serialized it will be silently ignored if
-            a serialization operation is performed.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Util.ReadOnlyPropertiesDictionary.InnerHashtable">
-            <summary>
-            The hashtable used to store the properties
-            </summary>
-            <value>
-            The internal collection used to store the properties
-            </value>
-            <remarks>
-            <para>
-            The hashtable used to store the properties
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Util.ReadOnlyPropertiesDictionary.System#Collections#IDictionary#IsReadOnly">
-            <summary>
-            See <see cref="P:System.Collections.IDictionary.IsReadOnly"/>
-            </summary>
-        </member>
-        <member name="P:log4net.Util.ReadOnlyPropertiesDictionary.System#Collections#IDictionary#Item(System.Object)">
-            <summary>
-            See <see cref="P:System.Collections.IDictionary.Item(System.Object)"/>
-            </summary>
-        </member>
-        <member name="P:log4net.Util.ReadOnlyPropertiesDictionary.System#Collections#IDictionary#Values">
-            <summary>
-            See <see cref="P:System.Collections.IDictionary.Values"/>
-            </summary>
-        </member>
-        <member name="P:log4net.Util.ReadOnlyPropertiesDictionary.System#Collections#IDictionary#Keys">
-            <summary>
-            See <see cref="P:System.Collections.IDictionary.Keys"/>
-            </summary>
-        </member>
-        <member name="P:log4net.Util.ReadOnlyPropertiesDictionary.System#Collections#IDictionary#IsFixedSize">
-            <summary>
-            See <see cref="P:System.Collections.IDictionary.IsFixedSize"/>
-            </summary>
-        </member>
-        <member name="P:log4net.Util.ReadOnlyPropertiesDictionary.System#Collections#ICollection#IsSynchronized">
-            <summary>
-            See <see cref="P:System.Collections.ICollection.IsSynchronized"/>
-            </summary>
-        </member>
-        <member name="P:log4net.Util.ReadOnlyPropertiesDictionary.Count">
-            <summary>
-            The number of properties in this collection
-            </summary>
-        </member>
-        <member name="P:log4net.Util.ReadOnlyPropertiesDictionary.System#Collections#ICollection#SyncRoot">
-            <summary>
-            See <see cref="P:System.Collections.ICollection.SyncRoot"/>
-            </summary>
-        </member>
-        <member name="M:log4net.Util.PropertiesDictionary.#ctor">
-            <summary>
-            Constructor
-            </summary>
-            <remarks>
-            <para>
-            Initializes a new instance of the <see cref="T:log4net.Util.PropertiesDictionary"/> class.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.PropertiesDictionary.#ctor(log4net.Util.ReadOnlyPropertiesDictionary)">
-            <summary>
-            Constructor
-            </summary>
-            <param name="propertiesDictionary">properties to copy</param>
-            <remarks>
-            <para>
-            Initializes a new instance of the <see cref="T:log4net.Util.PropertiesDictionary"/> class.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.PropertiesDictionary.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
-            <summary>
-            Initializes a new instance of the <see cref="T:log4net.Util.PropertiesDictionary"/> class 
-            with serialized data.
-            </summary>
-            <param name="info">The <see cref="T:System.Runtime.Serialization.SerializationInfo"/> that holds the serialized object data.</param>
-            <param name="context">The <see cref="T:System.Runtime.Serialization.StreamingContext"/> that contains contextual information about the source or destination.</param>
-            <remarks>
-            <para>
-            Because this class is sealed the serialization constructor is private.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.PropertiesDictionary.Remove(System.String)">
-            <summary>
-            Remove the entry with the specified key from this dictionary
-            </summary>
-            <param name="key">the key for the entry to remove</param>
-            <remarks>
-            <para>
-            Remove the entry with the specified key from this dictionary
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.PropertiesDictionary.System#Collections#IDictionary#GetEnumerator">
-            <summary>
-            See <see cref="M:System.Collections.IDictionary.GetEnumerator"/>
-            </summary>
-            <returns>an enumerator</returns>
-            <remarks>
-            <para>
-            Returns a <see cref="T:System.Collections.IDictionaryEnumerator"/> over the contest of this collection.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.PropertiesDictionary.System#Collections#IDictionary#Remove(System.Object)">
-            <summary>
-            See <see cref="M:System.Collections.IDictionary.Remove(System.Object)"/>
-            </summary>
-            <param name="key">the key to remove</param>
-            <remarks>
-            <para>
-            Remove the entry with the specified key from this dictionary
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.PropertiesDictionary.System#Collections#IDictionary#Contains(System.Object)">
-            <summary>
-            See <see cref="M:System.Collections.IDictionary.Contains(System.Object)"/>
-            </summary>
-            <param name="key">the key to lookup in the collection</param>
-            <returns><c>true</c> if the collection contains the specified key</returns>
-            <remarks>
-            <para>
-            Test if this collection contains a specified key.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.PropertiesDictionary.Clear">
-            <summary>
-            Remove all properties from the properties collection
-            </summary>
-            <remarks>
-            <para>
-            Remove all properties from the properties collection
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.PropertiesDictionary.System#Collections#IDictionary#Add(System.Object,System.Object)">
-            <summary>
-            See <see cref="M:System.Collections.IDictionary.Add(System.Object,System.Object)"/>
-            </summary>
-            <param name="key">the key</param>
-            <param name="value">the value to store for the key</param>
-            <remarks>
-            <para>
-            Store a value for the specified <see cref="T:System.String"/> <paramref name="key"/>.
-            </para>
-            </remarks>
-            <exception cref="T:System.ArgumentException">Thrown if the <paramref name="key"/> is not a string</exception>
-        </member>
-        <member name="M:log4net.Util.PropertiesDictionary.System#Collections#ICollection#CopyTo(System.Array,System.Int32)">
-            <summary>
-            See <see cref="M:System.Collections.ICollection.CopyTo(System.Array,System.Int32)"/>
-            </summary>
-            <param name="array"></param>
-            <param name="index"></param>
-        </member>
-        <member name="M:log4net.Util.PropertiesDictionary.System#Collections#IEnumerable#GetEnumerator">
-            <summary>
-            See <see cref="M:System.Collections.IEnumerable.GetEnumerator"/>
-            </summary>
-        </member>
-        <member name="P:log4net.Util.PropertiesDictionary.Item(System.String)">
-            <summary>
-            Gets or sets the value of the  property with the specified key.
-            </summary>
-            <value>
-            The value of the property with the specified key.
-            </value>
-            <param name="key">The key of the property to get or set.</param>
-            <remarks>
-            <para>
-            The property value will only be serialized if it is serializable.
-            If it cannot be serialized it will be silently ignored if
-            a serialization operation is performed.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Util.PropertiesDictionary.System#Collections#IDictionary#IsReadOnly">
-            <summary>
-            See <see cref="P:System.Collections.IDictionary.IsReadOnly"/>
-            </summary>
-            <value>
-            <c>false</c>
-            </value>
-            <remarks>
-            <para>
-            This collection is modifiable. This property always
-            returns <c>false</c>.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Util.PropertiesDictionary.System#Collections#IDictionary#Item(System.Object)">
-            <summary>
-            See <see cref="P:System.Collections.IDictionary.Item(System.Object)"/>
-            </summary>
-            <value>
-            The value for the key specified.
-            </value>
-            <remarks>
-            <para>
-            Get or set a value for the specified <see cref="T:System.String"/> <paramref name="key"/>.
-            </para>
-            </remarks>
-            <exception cref="T:System.ArgumentException">Thrown if the <paramref name="key"/> is not a string</exception>
-        </member>
-        <member name="P:log4net.Util.PropertiesDictionary.System#Collections#IDictionary#Values">
-            <summary>
-            See <see cref="P:System.Collections.IDictionary.Values"/>
-            </summary>
-        </member>
-        <member name="P:log4net.Util.PropertiesDictionary.System#Collections#IDictionary#Keys">
-            <summary>
-            See <see cref="P:System.Collections.IDictionary.Keys"/>
-            </summary>
-        </member>
-        <member name="P:log4net.Util.PropertiesDictionary.System#Collections#IDictionary#IsFixedSize">
-            <summary>
-            See <see cref="P:System.Collections.IDictionary.IsFixedSize"/>
-            </summary>
-        </member>
-        <member name="P:log4net.Util.PropertiesDictionary.System#Collections#ICollection#IsSynchronized">
-            <summary>
-            See <see cref="P:System.Collections.ICollection.IsSynchronized"/>
-            </summary>
-        </member>
-        <member name="P:log4net.Util.PropertiesDictionary.System#Collections#ICollection#SyncRoot">
-            <summary>
-            See <see cref="P:System.Collections.ICollection.SyncRoot"/>
-            </summary>
-        </member>
-        <member name="T:log4net.Util.ProtectCloseTextWriter">
-            <summary>
-            A <see cref="T:System.IO.TextWriter"/> that ignores the <see cref="M:log4net.Util.ProtectCloseTextWriter.Close"/> message
-            </summary>
-            <remarks>
-            <para>
-            This writer is used in special cases where it is necessary 
-            to protect a writer from being closed by a client.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-        </member>
-        <member name="M:log4net.Util.ProtectCloseTextWriter.#ctor(System.IO.TextWriter)">
-            <summary>
-            Constructor
-            </summary>
-            <param name="writer">the writer to actually write to</param>
-            <remarks>
-            <para>
-            Create a new ProtectCloseTextWriter using a writer
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.ProtectCloseTextWriter.Attach(System.IO.TextWriter)">
-            <summary>
-            Attach this instance to a different underlying <see cref="T:System.IO.TextWriter"/>
-            </summary>
-            <param name="writer">the writer to attach to</param>
-            <remarks>
-            <para>
-            Attach this instance to a different underlying <see cref="T:System.IO.TextWriter"/>
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.ProtectCloseTextWriter.Close">
-            <summary>
-            Does not close the underlying output writer.
-            </summary>
-            <remarks>
-            <para>
-            Does not close the underlying output writer.
-            This method does nothing.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Util.ReaderWriterLock">
-            <summary>
-            Defines a lock that supports single writers and multiple readers
-            </summary>
-            <remarks>
-            <para>
-            <c>ReaderWriterLock</c> is used to synchronize access to a resource. 
-            At any given time, it allows either concurrent read access for 
-            multiple threads, or write access for a single thread. In a 
-            situation where a resource is changed infrequently, a 
-            <c>ReaderWriterLock</c> provides better throughput than a simple 
-            one-at-a-time lock, such as <see cref="T:System.Threading.Monitor"/>.
-            </para>
-            <para>
-            If a platform does not support a <c>System.Threading.ReaderWriterLock</c> 
-            implementation then all readers and writers are serialized. Therefore 
-            the caller must not rely on multiple simultaneous readers.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-        </member>
-        <member name="M:log4net.Util.ReaderWriterLock.#ctor">
-            <summary>
-            Constructor
-            </summary>
-            <remarks>
-            <para>
-            Initializes a new instance of the <see cref="T:log4net.Util.ReaderWriterLock"/> class.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.ReaderWriterLock.AcquireReaderLock">
-            <summary>
-            Acquires a reader lock
-            </summary>
-            <remarks>
-            <para>
-            <see cref="M:log4net.Util.ReaderWriterLock.AcquireReaderLock"/> blocks if a different thread has the writer 
-            lock, or if at least one thread is waiting for the writer lock.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.ReaderWriterLock.ReleaseReaderLock">
-            <summary>
-            Decrements the lock count
-            </summary>
-            <remarks>
-            <para>
-            <see cref="M:log4net.Util.ReaderWriterLock.ReleaseReaderLock"/> decrements the lock count. When the count 
-            reaches zero, the lock is released.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.ReaderWriterLock.AcquireWriterLock">
-            <summary>
-            Acquires the writer lock
-            </summary>
-            <remarks>
-            <para>
-            This method blocks if another thread has a reader lock or writer lock.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.ReaderWriterLock.ReleaseWriterLock">
-            <summary>
-            Decrements the lock count on the writer lock
-            </summary>
-            <remarks>
-            <para>
-            ReleaseWriterLock decrements the writer lock count. 
-            When the count reaches zero, the writer lock is released.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Util.ReusableStringWriter">
-            <summary>
-            A <see cref="T:System.IO.StringWriter"/> that can be <see cref="M:log4net.Util.ReusableStringWriter.Reset(System.Int32,System.Int32)"/> and reused
-            </summary>
-            <remarks>
-            <para>
-            A <see cref="T:System.IO.StringWriter"/> that can be <see cref="M:log4net.Util.ReusableStringWriter.Reset(System.Int32,System.Int32)"/> and reused.
-            This uses a single buffer for string operations.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-        </member>
-        <member name="M:log4net.Util.ReusableStringWriter.#ctor(System.IFormatProvider)">
-            <summary>
-            Create an instance of <see cref="T:log4net.Util.ReusableStringWriter"/>
-            </summary>
-            <param name="formatProvider">the format provider to use</param>
-            <remarks>
-            <para>
-            Create an instance of <see cref="T:log4net.Util.ReusableStringWriter"/>
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.ReusableStringWriter.Dispose(System.Boolean)">
-            <summary>
-            Override Dispose to prevent closing of writer
-            </summary>
-            <param name="disposing">flag</param>
-            <remarks>
-            <para>
-            Override Dispose to prevent closing of writer
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.ReusableStringWriter.Reset(System.Int32,System.Int32)">
-            <summary>
-            Reset this string writer so that it can be reused.
-            </summary>
-            <param name="maxCapacity">the maximum buffer capacity before it is trimmed</param>
-            <param name="defaultSize">the default size to make the buffer</param>
-            <remarks>
-            <para>
-            Reset this string writer so that it can be reused.
-            The internal buffers are cleared and reset.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Util.SystemInfo">
-            <summary>
-            Utility class for system specific information.
-            </summary>
-            <remarks>
-            <para>
-            Utility class of static methods for system specific information.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-            <author>Alexey Solofnenko</author>
-        </member>
-        <member name="M:log4net.Util.SystemInfo.#ctor">
-            <summary>
-            Private constructor to prevent instances.
-            </summary>
-            <remarks>
-            <para>
-            Only static methods are exposed from this type.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.SystemInfo.#cctor">
-            <summary>
-            Initialize default values for private static fields.
-            </summary>
-            <remarks>
-            <para>
-            Only static methods are exposed from this type.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.SystemInfo.AssemblyLocationInfo(System.Reflection.Assembly)">
-            <summary>
-            Gets the assembly location path for the specified assembly.
-            </summary>
-            <param name="myAssembly">The assembly to get the location for.</param>
-            <returns>The location of the assembly.</returns>
-            <remarks>
-            <para>
-            This method does not guarantee to return the correct path
-            to the assembly. If only tries to give an indication as to
-            where the assembly was loaded from.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.SystemInfo.AssemblyQualifiedName(System.Type)">
-            <summary>
-            Gets the fully qualified name of the <see cref="T:System.Type"/>, including 
-            the name of the assembly from which the <see cref="T:System.Type"/> was 
-            loaded.
-            </summary>
-            <param name="type">The <see cref="T:System.Type"/> to get the fully qualified name for.</param>
-            <returns>The fully qualified name for the <see cref="T:System.Type"/>.</returns>
-            <remarks>
-            <para>
-            This is equivalent to the <c>Type.AssemblyQualifiedName</c> property,
-            but this method works on the .NET Compact Framework 1.0 as well as
-            the full .NET runtime.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.SystemInfo.AssemblyShortName(System.Reflection.Assembly)">
-            <summary>
-            Gets the short name of the <see cref="T:System.Reflection.Assembly"/>.
-            </summary>
-            <param name="myAssembly">The <see cref="T:System.Reflection.Assembly"/> to get the name for.</param>
-            <returns>The short name of the <see cref="T:System.Reflection.Assembly"/>.</returns>
-            <remarks>
-            <para>
-            The short name of the assembly is the <see cref="P:System.Reflection.Assembly.FullName"/> 
-            without the version, culture, or public key. i.e. it is just the 
-            assembly's file name without the extension.
-            </para>
-            <para>
-            Use this rather than <c>Assembly.GetName().Name</c> because that
-            is not available on the Compact Framework.
-            </para>
-            <para>
-            Because of a FileIOPermission security demand we cannot do
-            the obvious Assembly.GetName().Name. We are allowed to get
-            the <see cref="P:System.Reflection.Assembly.FullName"/> of the assembly so we 
-            start from there and strip out just the assembly name.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.SystemInfo.AssemblyFileName(System.Reflection.Assembly)">
-            <summary>
-            Gets the file name portion of the <see cref="T:System.Reflection.Assembly"/>, including the extension.
-            </summary>
-            <param name="myAssembly">The <see cref="T:System.Reflection.Assembly"/> to get the file name for.</param>
-            <returns>The file name of the assembly.</returns>
-            <remarks>
-            <para>
-            Gets the file name portion of the <see cref="T:System.Reflection.Assembly"/>, including the extension.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.SystemInfo.GetTypeFromString(System.Type,System.String,System.Boolean,System.Boolean)">
-            <summary>
-            Loads the type specified in the type string.
-            </summary>
-            <param name="relativeType">A sibling type to use to load the type.</param>
-            <param name="typeName">The name of the type to load.</param>
-            <param name="throwOnError">Flag set to <c>true</c> to throw an exception if the type cannot be loaded.</param>
-            <param name="ignoreCase"><c>true</c> to ignore the case of the type name; otherwise, <c>false</c></param>
-            <returns>The type loaded or <c>null</c> if it could not be loaded.</returns>
-            <remarks>
-            <para>
-            If the type name is fully qualified, i.e. if contains an assembly name in 
-            the type name, the type will be loaded from the system using 
-            <see cref="M:System.Type.GetType(System.String,System.Boolean)"/>.
-            </para>
-            <para>
-            If the type name is not fully qualified, it will be loaded from the assembly
-            containing the specified relative type. If the type is not found in the assembly 
-            then all the loaded assemblies will be searched for the type.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.SystemInfo.GetTypeFromString(System.String,System.Boolean,System.Boolean)">
-            <summary>
-            Loads the type specified in the type string.
-            </summary>
-            <param name="typeName">The name of the type to load.</param>
-            <param name="throwOnError">Flag set to <c>true</c> to throw an exception if the type cannot be loaded.</param>
-            <param name="ignoreCase"><c>true</c> to ignore the case of the type name; otherwise, <c>false</c></param>
-            <returns>The type loaded or <c>null</c> if it could not be loaded.</returns>		
-            <remarks>
-            <para>
-            If the type name is fully qualified, i.e. if contains an assembly name in 
-            the type name, the type will be loaded from the system using 
-            <see cref="M:System.Type.GetType(System.String,System.Boolean)"/>.
-            </para>
-            <para>
-            If the type name is not fully qualified it will be loaded from the
-            assembly that is directly calling this method. If the type is not found 
-            in the assembly then all the loaded assemblies will be searched for the type.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.SystemInfo.GetTypeFromString(System.Reflection.Assembly,System.String,System.Boolean,System.Boolean)">
-            <summary>
-            Loads the type specified in the type string.
-            </summary>
-            <param name="relativeAssembly">An assembly to load the type from.</param>
-            <param name="typeName">The name of the type to load.</param>
-            <param name="throwOnError">Flag set to <c>true</c> to throw an exception if the type cannot be loaded.</param>
-            <param name="ignoreCase"><c>true</c> to ignore the case of the type name; otherwise, <c>false</c></param>
-            <returns>The type loaded or <c>null</c> if it could not be loaded.</returns>
-            <remarks>
-            <para>
-            If the type name is fully qualified, i.e. if contains an assembly name in 
-            the type name, the type will be loaded from the system using 
-            <see cref="M:System.Type.GetType(System.String,System.Boolean)"/>.
-            </para>
-            <para>
-            If the type name is not fully qualified it will be loaded from the specified
-            assembly. If the type is not found in the assembly then all the loaded assemblies 
-            will be searched for the type.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.SystemInfo.NewGuid">
-            <summary>
-            Generate a new guid
-            </summary>
-            <returns>A new Guid</returns>
-            <remarks>
-            <para>
-            Generate a new guid
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.SystemInfo.CreateArgumentOutOfRangeException(System.String,System.Object,System.String)">
-            <summary>
-            Create an <see cref="T:System.ArgumentOutOfRangeException"/>
-            </summary>
-            <param name="parameterName">The name of the parameter that caused the exception</param>
-            <param name="actualValue">The value of the argument that causes this exception</param>
-            <param name="message">The message that describes the error</param>
-            <returns>the ArgumentOutOfRangeException object</returns>
-            <remarks>
-            <para>
-            Create a new instance of the <see cref="T:System.ArgumentOutOfRangeException"/> class 
-            with a specified error message, the parameter name, and the value 
-            of the argument.
-            </para>
-            <para>
-            The Compact Framework does not support the 3 parameter constructor for the
-            <see cref="T:System.ArgumentOutOfRangeException"/> type. This method provides an
-            implementation that works for all platforms.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.SystemInfo.TryParse(System.String,System.Int32@)">
-            <summary>
-            Parse a string into an <see cref="T:System.Int32"/> value
-            </summary>
-            <param name="s">the string to parse</param>
-            <param name="val">out param where the parsed value is placed</param>
-            <returns><c>true</c> if the string was able to be parsed into an integer</returns>
-            <remarks>
-            <para>
-            Attempts to parse the string into an integer. If the string cannot
-            be parsed then this method returns <c>false</c>. The method does not throw an exception.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.SystemInfo.TryParse(System.String,System.Int64@)">
-            <summary>
-            Parse a string into an <see cref="T:System.Int64"/> value
-            </summary>
-            <param name="s">the string to parse</param>
-            <param name="val">out param where the parsed value is placed</param>
-            <returns><c>true</c> if the string was able to be parsed into an integer</returns>
-            <remarks>
-            <para>
-            Attempts to parse the string into an integer. If the string cannot
-            be parsed then this method returns <c>false</c>. The method does not throw an exception.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.SystemInfo.GetAppSetting(System.String)">
-            <summary>
-            Lookup an application setting
-            </summary>
-            <param name="key">the application settings key to lookup</param>
-            <returns>the value for the key, or <c>null</c></returns>
-            <remarks>
-            <para>
-            Configuration APIs are not supported under the Compact Framework
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.SystemInfo.ConvertToFullPath(System.String)">
-            <summary>
-            Convert a path into a fully qualified local file path.
-            </summary>
-            <param name="path">The path to convert.</param>
-            <returns>The fully qualified path.</returns>
-            <remarks>
-            <para>
-            Converts the path specified to a fully
-            qualified path. If the path is relative it is
-            taken as relative from the application base 
-            directory.
-            </para>
-            <para>
-            The path specified must be a local file path, a URI is not supported.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.SystemInfo.CreateCaseInsensitiveHashtable">
-            <summary>
-            Creates a new case-insensitive instance of the <see cref="T:System.Collections.Hashtable"/> class with the default initial capacity. 
-            </summary>
-            <returns>A new case-insensitive instance of the <see cref="T:System.Collections.Hashtable"/> class with the default initial capacity</returns>
-            <remarks>
-            <para>
-            The new Hashtable instance uses the default load factor, the CaseInsensitiveHashCodeProvider, and the CaseInsensitiveComparer.
-            </para>
-            </remarks>
-        </member>
-        <member name="F:log4net.Util.SystemInfo.EmptyTypes">
-            <summary>
-            Gets an empty array of types.
-            </summary>
-            <remarks>
-            <para>
-            The <c>Type.EmptyTypes</c> field is not available on
-            the .NET Compact Framework 1.0.
-            </para>
-            </remarks>
-        </member>
-        <member name="F:log4net.Util.SystemInfo.s_hostName">
-            <summary>
-            Cache the host name for the current machine
-            </summary>
-        </member>
-        <member name="F:log4net.Util.SystemInfo.s_appFriendlyName">
-            <summary>
-            Cache the application friendly name
-            </summary>
-        </member>
-        <member name="F:log4net.Util.SystemInfo.s_nullText">
-            <summary>
-            Text to output when a <c>null</c> is encountered.
-            </summary>
-        </member>
-        <member name="F:log4net.Util.SystemInfo.s_notAvailableText">
-            <summary>
-            Text to output when an unsupported feature is requested.
-            </summary>
-        </member>
-        <member name="F:log4net.Util.SystemInfo.s_processStartTime">
-            <summary>
-            Start time for the current process.
-            </summary>
-        </member>
-        <member name="P:log4net.Util.SystemInfo.NewLine">
-            <summary>
-            Gets the system dependent line terminator.
-            </summary>
-            <value>
-            The system dependent line terminator.
-            </value>
-            <remarks>
-            <para>
-            Gets the system dependent line terminator.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Util.SystemInfo.ApplicationBaseDirectory">
-            <summary>
-            Gets the base directory for this <see cref="T:System.AppDomain"/>.
-            </summary>
-            <value>The base directory path for the current <see cref="T:System.AppDomain"/>.</value>
-            <remarks>
-            <para>
-            Gets the base directory for this <see cref="T:System.AppDomain"/>.
-            </para>
-            <para>
-            The value returned may be either a local file path or a URI.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Util.SystemInfo.ConfigurationFileLocation">
-            <summary>
-            Gets the path to the configuration file for the current <see cref="T:System.AppDomain"/>.
-            </summary>
-            <value>The path to the configuration file for the current <see cref="T:System.AppDomain"/>.</value>
-            <remarks>
-            <para>
-            The .NET Compact Framework 1.0 does not have a concept of a configuration
-            file. For this runtime, we use the entry assembly location as the root for
-            the configuration file name.
-            </para>
-            <para>
-            The value returned may be either a local file path or a URI.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Util.SystemInfo.EntryAssemblyLocation">
-            <summary>
-            Gets the path to the file that first executed in the current <see cref="T:System.AppDomain"/>.
-            </summary>
-            <value>The path to the entry assembly.</value>
-            <remarks>
-            <para>
-            Gets the path to the file that first executed in the current <see cref="T:System.AppDomain"/>.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Util.SystemInfo.CurrentThreadId">
-            <summary>
-            Gets the ID of the current thread.
-            </summary>
-            <value>The ID of the current thread.</value>
-            <remarks>
-            <para>
-            On the .NET framework, the <c>AppDomain.GetCurrentThreadId</c> method
-            is used to obtain the thread ID for the current thread. This is the 
-            operating system ID for the thread.
-            </para>
-            <para>
-            On the .NET Compact Framework 1.0 it is not possible to get the 
-            operating system thread ID for the current thread. The native method 
-            <c>GetCurrentThreadId</c> is implemented inline in a header file
-            and cannot be called.
-            </para>
-            <para>
-            On the .NET Framework 2.0 the <c>Thread.ManagedThreadId</c> is used as this
-            gives a stable id unrelated to the operating system thread ID which may 
-            change if the runtime is using fibers.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Util.SystemInfo.HostName">
-            <summary>
-            Get the host name or machine name for the current machine
-            </summary>
-            <value>
-            The hostname or machine name
-            </value>
-            <remarks>
-            <para>
-            Get the host name or machine name for the current machine
-            </para>
-            <para>
-            The host name (<see cref="M:System.Net.Dns.GetHostName"/>) or
-            the machine name (<c>Environment.MachineName</c>) for
-            the current machine, or if neither of these are available
-            then <c>NOT AVAILABLE</c> is returned.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Util.SystemInfo.ApplicationFriendlyName">
-            <summary>
-            Get this application's friendly name
-            </summary>
-            <value>
-            The friendly name of this application as a string
-            </value>
-            <remarks>
-            <para>
-            If available the name of the application is retrieved from
-            the <c>AppDomain</c> using <c>AppDomain.CurrentDomain.FriendlyName</c>.
-            </para>
-            <para>
-            Otherwise the file name of the entry assembly is used.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Util.SystemInfo.ProcessStartTime">
-            <summary>
-            Get the start time for the current process.
-            </summary>
-            <remarks>
-            <para>
-            This is the time at which the log4net library was loaded into the
-            AppDomain. Due to reports of a hang in the call to <c>System.Diagnostics.Process.StartTime</c>
-            this is not the start time for the current process.
-            </para>
-            <para>
-            The log4net library should be loaded by an application early during its
-            startup, therefore this start time should be a good approximation for
-            the actual start time.
-            </para>
-            <para>
-            Note that AppDomains may be loaded and unloaded within the
-            same process without the process terminating, however this start time
-            will be set per AppDomain.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Util.SystemInfo.NullText">
-            <summary>
-            Text to output when a <c>null</c> is encountered.
-            </summary>
-            <remarks>
-            <para>
-            Use this value to indicate a <c>null</c> has been encountered while
-            outputting a string representation of an item.
-            </para>
-            <para>
-            The default value is <c>(null)</c>. This value can be overridden by specifying
-            a value for the <c>log4net.NullText</c> appSetting in the application's
-            .config file.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Util.SystemInfo.NotAvailableText">
-            <summary>
-            Text to output when an unsupported feature is requested.
-            </summary>
-            <remarks>
-            <para>
-            Use this value when an unsupported feature is requested.
-            </para>
-            <para>
-            The default value is <c>NOT AVAILABLE</c>. This value can be overridden by specifying
-            a value for the <c>log4net.NotAvailableText</c> appSetting in the application's
-            .config file.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Util.SystemStringFormat">
-            <summary>
-            Utility class that represents a format string.
-            </summary>
-            <remarks>
-            <para>
-            Utility class that represents a format string.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-        </member>
-        <member name="M:log4net.Util.SystemStringFormat.#ctor(System.IFormatProvider,System.String,System.Object[])">
-            <summary>
-            Initialise the <see cref="T:log4net.Util.SystemStringFormat"/>
-            </summary>
-            <param name="provider">An <see cref="T:System.IFormatProvider"/> that supplies culture-specific formatting information.</param>
-            <param name="format">A <see cref="T:System.String"/> containing zero or more format items.</param>
-            <param name="args">An <see cref="T:System.Object"/> array containing zero or more objects to format.</param>
-        </member>
-        <member name="M:log4net.Util.SystemStringFormat.ToString">
-            <summary>
-            Format the string and arguments
-            </summary>
-            <returns>the formatted string</returns>
-        </member>
-        <member name="M:log4net.Util.SystemStringFormat.StringFormat(System.IFormatProvider,System.String,System.Object[])">
-            <summary>
-            Replaces the format item in a specified <see cref="T:System.String"/> with the text equivalent 
-            of the value of a corresponding <see cref="T:System.Object"/> instance in a specified array.
-            A specified parameter supplies culture-specific formatting information.
-            </summary>
-            <param name="provider">An <see cref="T:System.IFormatProvider"/> that supplies culture-specific formatting information.</param>
-            <param name="format">A <see cref="T:System.String"/> containing zero or more format items.</param>
-            <param name="args">An <see cref="T:System.Object"/> array containing zero or more objects to format.</param>
-            <returns>
-            A copy of format in which the format items have been replaced by the <see cref="T:System.String"/> 
-            equivalent of the corresponding instances of <see cref="T:System.Object"/> in args.
-            </returns>
-            <remarks>
-            <para>
-            This method does not throw exceptions. If an exception thrown while formatting the result the
-            exception and arguments are returned in the result string.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.SystemStringFormat.StringFormatError(System.Exception,System.String,System.Object[])">
-            <summary>
-            Process an error during StringFormat
-            </summary>
-        </member>
-        <member name="M:log4net.Util.SystemStringFormat.RenderArray(System.Array,System.Text.StringBuilder)">
-            <summary>
-            Dump the contents of an array into a string builder
-            </summary>
-        </member>
-        <member name="M:log4net.Util.SystemStringFormat.RenderObject(System.Object,System.Text.StringBuilder)">
-            <summary>
-            Dump an object to a string
-            </summary>
-        </member>
-        <member name="T:log4net.Util.ThreadContextProperties">
-            <summary>
-            Implementation of Properties collection for the <see cref="T:log4net.ThreadContext"/>
-            </summary>
-            <remarks>
-            <para>
-            Class implements a collection of properties that is specific to each thread.
-            The class is not synchronized as each thread has its own <see cref="T:log4net.Util.PropertiesDictionary"/>.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-        </member>
-        <member name="F:log4net.Util.ThreadContextProperties.s_threadLocalSlot">
-            <summary>
-            The thread local data slot to use to store a PropertiesDictionary.
-            </summary>
-        </member>
-        <member name="M:log4net.Util.ThreadContextProperties.#ctor">
-            <summary>
-            Internal constructor
-            </summary>
-            <remarks>
-            <para>
-            Initializes a new instance of the <see cref="T:log4net.Util.ThreadContextProperties"/> class.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.ThreadContextProperties.Remove(System.String)">
-            <summary>
-            Remove a property
-            </summary>
-            <param name="key">the key for the entry to remove</param>
-            <remarks>
-            <para>
-            Remove a property
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.ThreadContextProperties.Clear">
-            <summary>
-            Clear all properties
-            </summary>
-            <remarks>
-            <para>
-            Clear all properties
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.ThreadContextProperties.GetProperties(System.Boolean)">
-            <summary>
-            Get the <c>PropertiesDictionary</c> for this thread.
-            </summary>
-            <param name="create">create the dictionary if it does not exist, otherwise return null if is does not exist</param>
-            <returns>the properties for this thread</returns>
-            <remarks>
-            <para>
-            The collection returned is only to be used on the calling thread. If the
-            caller needs to share the collection between different threads then the 
-            caller must clone the collection before doing so.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Util.ThreadContextProperties.Item(System.String)">
-            <summary>
-            Gets or sets the value of a property
-            </summary>
-            <value>
-            The value for the property with the specified key
-            </value>
-            <remarks>
-            <para>
-            Gets or sets the value of a property
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Util.ThreadContextStack">
-            <summary>
-            Implementation of Stack for the <see cref="T:log4net.ThreadContext"/>
-            </summary>
-            <remarks>
-            <para>
-            Implementation of Stack for the <see cref="T:log4net.ThreadContext"/>
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-        </member>
-        <member name="F:log4net.Util.ThreadContextStack.m_stack">
-            <summary>
-            The stack store.
-            </summary>
-        </member>
-        <member name="M:log4net.Util.ThreadContextStack.#ctor">
-            <summary>
-            Internal constructor
-            </summary>
-            <remarks>
-            <para>
-            Initializes a new instance of the <see cref="T:log4net.Util.ThreadContextStack"/> class. 
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.ThreadContextStack.Clear">
-            <summary>
-            Clears all the contextual information held in this stack.
-            </summary>
-            <remarks>
-            <para>
-            Clears all the contextual information held in this stack.
-            Only call this if you think that this tread is being reused after
-            a previous call execution which may not have completed correctly.
-            You do not need to use this method if you always guarantee to call
-            the <see cref="M:System.IDisposable.Dispose"/> method of the <see cref="T:System.IDisposable"/>
-            returned from <see cref="M:log4net.Util.ThreadContextStack.Push(System.String)"/> even in exceptional circumstances,
-            for example by using the <c>using(log4net.ThreadContext.Stacks["NDC"].Push("Stack_Message"))</c> 
-            syntax.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.ThreadContextStack.Pop">
-            <summary>
-            Removes the top context from this stack.
-            </summary>
-            <returns>The message in the context that was removed from the top of this stack.</returns>
-            <remarks>
-            <para>
-            Remove the top context from this stack, and return
-            it to the caller. If this stack is empty then an
-            empty string (not <see langword="null"/>) is returned.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.ThreadContextStack.Push(System.String)">
-            <summary>
-            Pushes a new context message into this stack.
-            </summary>
-            <param name="message">The new context message.</param>
-            <returns>
-            An <see cref="T:System.IDisposable"/> that can be used to clean up the context stack.
-            </returns>
-            <remarks>
-            <para>
-            Pushes a new context onto this stack. An <see cref="T:System.IDisposable"/>
-            is returned that can be used to clean up this stack. This
-            can be easily combined with the <c>using</c> keyword to scope the
-            context.
-            </para>
-            </remarks>
-            <example>Simple example of using the <c>Push</c> method with the <c>using</c> keyword.
-            <code lang="C#">
-            using(log4net.ThreadContext.Stacks["NDC"].Push("Stack_Message"))
-            {
-            	log.Warn("This should have an ThreadContext Stack message");
-            }
-            </code>
-            </example>
-        </member>
-        <member name="M:log4net.Util.ThreadContextStack.GetFullMessage">
-            <summary>
-            Gets the current context information for this stack.
-            </summary>
-            <returns>The current context information.</returns>
-        </member>
-        <member name="M:log4net.Util.ThreadContextStack.ToString">
-            <summary>
-            Gets the current context information for this stack.
-            </summary>
-            <returns>Gets the current context information</returns>
-            <remarks>
-            <para>
-            Gets the current context information for this stack.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.ThreadContextStack.log4net#Core#IFixingRequired#GetFixedObject">
-            <summary>
-            Get a portable version of this object
-            </summary>
-            <returns>the portable instance of this object</returns>
-            <remarks>
-            <para>
-            Get a cross thread portable version of this object
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Util.ThreadContextStack.Count">
-            <summary>
-            The number of messages in the stack
-            </summary>
-            <value>
-            The current number of messages in the stack
-            </value>
-            <remarks>
-            <para>
-            The current number of messages in the stack. That is
-            the number of times <see cref="M:log4net.Util.ThreadContextStack.Push(System.String)"/> has been called
-            minus the number of times <see cref="M:log4net.Util.ThreadContextStack.Pop"/> has been called.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Util.ThreadContextStack.InternalStack">
-            <summary>
-            Gets and sets the internal stack used by this <see cref="T:log4net.Util.ThreadContextStack"/>
-            </summary>
-            <value>The internal storage stack</value>
-            <remarks>
-            <para>
-            This property is provided only to support backward compatability 
-            of the <see cref="T:log4net.NDC"/>. Tytpically the internal stack should not
-            be modified.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Util.ThreadContextStack.StackFrame">
-            <summary>
-            Inner class used to represent a single context frame in the stack.
-            </summary>
-            <remarks>
-            <para>
-            Inner class used to represent a single context frame in the stack.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.ThreadContextStack.StackFrame.#ctor(System.String,log4net.Util.ThreadContextStack.StackFrame)">
-            <summary>
-            Constructor
-            </summary>
-            <param name="message">The message for this context.</param>
-            <param name="parent">The parent context in the chain.</param>
-            <remarks>
-            <para>
-            Initializes a new instance of the <see cref="T:log4net.Util.ThreadContextStack.StackFrame"/> class
-            with the specified message and parent context.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Util.ThreadContextStack.StackFrame.Message">
-            <summary>
-            Get the message.
-            </summary>
-            <value>The message.</value>
-            <remarks>
-            <para>
-            Get the message.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Util.ThreadContextStack.StackFrame.FullMessage">
-            <summary>
-            Gets the full text of the context down to the root level.
-            </summary>
-            <value>
-            The full text of the context down to the root level.
-            </value>
-            <remarks>
-            <para>
-            Gets the full text of the context down to the root level.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Util.ThreadContextStack.AutoPopStackFrame">
-            <summary>
-            Struct returned from the <see cref="M:log4net.Util.ThreadContextStack.Push(System.String)"/> method.
-            </summary>
-            <remarks>
-            <para>
-            This struct implements the <see cref="T:System.IDisposable"/> and is designed to be used
-            with the <see langword="using"/> pattern to remove the stack frame at the end of the scope.
-            </para>
-            </remarks>
-        </member>
-        <member name="F:log4net.Util.ThreadContextStack.AutoPopStackFrame.m_frameStack">
-            <summary>
-            The ThreadContextStack internal stack
-            </summary>
-        </member>
-        <member name="F:log4net.Util.ThreadContextStack.AutoPopStackFrame.m_frameDepth">
-            <summary>
-            The depth to trim the stack to when this instance is disposed
-            </summary>
-        </member>
-        <member name="M:log4net.Util.ThreadContextStack.AutoPopStackFrame.#ctor(System.Collections.Stack,System.Int32)">
-            <summary>
-            Constructor
-            </summary>
-            <param name="frameStack">The internal stack used by the ThreadContextStack.</param>
-            <param name="frameDepth">The depth to return the stack to when this object is disposed.</param>
-            <remarks>
-            <para>
-            Initializes a new instance of the <see cref="T:log4net.Util.ThreadContextStack.AutoPopStackFrame"/> class with
-            the specified stack and return depth.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.ThreadContextStack.AutoPopStackFrame.Dispose">
-            <summary>
-            Returns the stack to the correct depth.
-            </summary>
-            <remarks>
-            <para>
-            Returns the stack to the correct depth.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Util.ThreadContextStacks">
-            <summary>
-            Implementation of Stacks collection for the <see cref="T:log4net.ThreadContext"/>
-            </summary>
-            <remarks>
-            <para>
-            Implementation of Stacks collection for the <see cref="T:log4net.ThreadContext"/>
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-        </member>
-        <member name="M:log4net.Util.ThreadContextStacks.#ctor(log4net.Util.ContextPropertiesBase)">
-            <summary>
-            Internal constructor
-            </summary>
-            <remarks>
-            <para>
-            Initializes a new instance of the <see cref="T:log4net.Util.ThreadContextStacks"/> class.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Util.ThreadContextStacks.Item(System.String)">
-            <summary>
-            Gets the named thread context stack
-            </summary>
-            <value>
-            The named stack
-            </value>
-            <remarks>
-            <para>
-            Gets the named thread context stack
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Util.Transform">
-            <summary>
-            Utility class for transforming strings.
-            </summary>
-            <remarks>
-            <para>
-            Utility class for transforming strings.
-            </para>
-            </remarks>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-        </member>
-        <member name="M:log4net.Util.Transform.#ctor">
-            <summary>
-            Initializes a new instance of the <see cref="T:log4net.Util.Transform"/> class. 
-            </summary>
-            <remarks>
-            <para>
-            Uses a private access modifier to prevent instantiation of this class.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.Transform.WriteEscapedXmlString(System.Xml.XmlWriter,System.String,System.String)">
-            <summary>
-            Write a string to an <see cref="T:System.Xml.XmlWriter"/>
-            </summary>
-            <param name="writer">the writer to write to</param>
-            <param name="textData">the string to write</param>
-            <param name="invalidCharReplacement">The string to replace non XML compliant chars with</param>
-            <remarks>
-            <para>
-            The test is escaped either using XML escape entities
-            or using CDATA sections.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.Transform.MaskXmlInvalidCharacters(System.String,System.String)">
-            <summary>
-            Replace invalid XML characters in text string
-            </summary>
-            <param name="textData">the XML text input string</param>
-            <param name="mask">the string to use in place of invalid characters</param>
-            <returns>A string that does not contain invalid XML characters.</returns>
-            <remarks>
-            <para>
-            Certain Unicode code points are not allowed in the XML InfoSet, for
-            details see: <a href="http://www.w3.org/TR/REC-xml/#charsets">http://www.w3.org/TR/REC-xml/#charsets</a>.
-            </para>
-            <para>
-            This method replaces any illegal characters in the input string
-            with the mask string specified.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.Transform.CountSubstrings(System.String,System.String)">
-            <summary>
-            Count the number of times that the substring occurs in the text
-            </summary>
-            <param name="text">the text to search</param>
-            <param name="substring">the substring to find</param>
-            <returns>the number of times the substring occurs in the text</returns>
-            <remarks>
-            <para>
-            The substring is assumed to be non repeating within itself.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Util.WindowsSecurityContext">
-            <summary>
-            Impersonate a Windows Account
-            </summary>
-            <remarks>
-            <para>
-            This <see cref="T:log4net.Core.SecurityContext"/> impersonates a Windows account.
-            </para>
-            <para>
-            How the impersonation is done depends on the value of <see cref="M:log4net.Util.WindowsSecurityContext.Impersonate(System.Object)"/>.
-            This allows the context to either impersonate a set of user credentials specified 
-            using username, domain name and password or to revert to the process credentials.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.WindowsSecurityContext.#ctor">
-            <summary>
-            Default constructor
-            </summary>
-            <remarks>
-            <para>
-            Default constructor
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.WindowsSecurityContext.ActivateOptions">
-            <summary>
-            Initialize the SecurityContext based on the options set.
-            </summary>
-            <remarks>
-            <para>
-            This is part of the <see cref="T:log4net.Core.IOptionHandler"/> delayed object
-            activation scheme. The <see cref="M:log4net.Util.WindowsSecurityContext.ActivateOptions"/> method must 
-            be called on this object after the configuration properties have
-            been set. Until <see cref="M:log4net.Util.WindowsSecurityContext.ActivateOptions"/> is called this
-            object is in an undefined state and must not be used. 
-            </para>
-            <para>
-            If any of the configuration properties are modified then 
-            <see cref="M:log4net.Util.WindowsSecurityContext.ActivateOptions"/> must be called again.
-            </para>
-            <para>
-            The security context will try to Logon the specified user account and
-            capture a primary token for impersonation.
-            </para>
-            </remarks>
-            <exception cref="T:System.ArgumentNullException">The required <see cref="P:log4net.Util.WindowsSecurityContext.UserName"/>, 
-            <see cref="P:log4net.Util.WindowsSecurityContext.DomainName"/> or <see cref="P:log4net.Util.WindowsSecurityContext.Password"/> properties were not specified.</exception>
-        </member>
-        <member name="M:log4net.Util.WindowsSecurityContext.Impersonate(System.Object)">
-            <summary>
-            Impersonate the Windows account specified by the <see cref="P:log4net.Util.WindowsSecurityContext.UserName"/> and <see cref="P:log4net.Util.WindowsSecurityContext.DomainName"/> properties.
-            </summary>
-            <param name="state">caller provided state</param>
-            <returns>
-            An <see cref="T:System.IDisposable"/> instance that will revoke the impersonation of this SecurityContext
-            </returns>
-            <remarks>
-            <para>
-            Depending on the <see cref="P:log4net.Util.WindowsSecurityContext.Credentials"/> property either
-            impersonate a user using credentials supplied or revert 
-            to the process credentials.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.WindowsSecurityContext.LogonUser(System.String,System.String,System.String)">
-            <summary>
-            Create a <see cref="T:System.Security.Principal.WindowsIdentity"/> given the userName, domainName and password.
-            </summary>
-            <param name="userName">the user name</param>
-            <param name="domainName">the domain name</param>
-            <param name="password">the password</param>
-            <returns>the <see cref="T:System.Security.Principal.WindowsIdentity"/> for the account specified</returns>
-            <remarks>
-            <para>
-            Uses the Windows API call LogonUser to get a principal token for the account. This
-            token is used to initialize the WindowsIdentity.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Util.WindowsSecurityContext.Credentials">
-            <summary>
-            Gets or sets the impersonation mode for this security context
-            </summary>
-            <value>
-            The impersonation mode for this security context
-            </value>
-            <remarks>
-            <para>
-            Impersonate either a user with user credentials or
-            revert this thread to the credentials of the process.
-            The value is one of the <see cref="T:log4net.Util.WindowsSecurityContext.ImpersonationMode"/>
-            enum.
-            </para>
-            <para>
-            The default value is <see cref="F:log4net.Util.WindowsSecurityContext.ImpersonationMode.User"/>
-            </para>
-            <para>
-            When the mode is set to <see cref="F:log4net.Util.WindowsSecurityContext.ImpersonationMode.User"/>
-            the user's credentials are established using the
-            <see cref="P:log4net.Util.WindowsSecurityContext.UserName"/>, <see cref="P:log4net.Util.WindowsSecurityContext.DomainName"/> and <see cref="P:log4net.Util.WindowsSecurityContext.Password"/>
-            values.
-            </para>
-            <para>
-            When the mode is set to <see cref="F:log4net.Util.WindowsSecurityContext.ImpersonationMode.Process"/>
-            no other properties need to be set. If the calling thread is 
-            impersonating then it will be reverted back to the process credentials.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Util.WindowsSecurityContext.UserName">
-            <summary>
-            Gets or sets the Windows username for this security context
-            </summary>
-            <value>
-            The Windows username for this security context
-            </value>
-            <remarks>
-            <para>
-            This property must be set if <see cref="P:log4net.Util.WindowsSecurityContext.Credentials"/>
-            is set to <see cref="F:log4net.Util.WindowsSecurityContext.ImpersonationMode.User"/> (the default setting).
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Util.WindowsSecurityContext.DomainName">
-            <summary>
-            Gets or sets the Windows domain name for this security context
-            </summary>
-            <value>
-            The Windows domain name for this security context
-            </value>
-            <remarks>
-            <para>
-            The default value for <see cref="P:log4net.Util.WindowsSecurityContext.DomainName"/> is the local machine name
-            taken from the <see cref="P:System.Environment.MachineName"/> property.
-            </para>
-            <para>
-            This property must be set if <see cref="P:log4net.Util.WindowsSecurityContext.Credentials"/>
-            is set to <see cref="F:log4net.Util.WindowsSecurityContext.ImpersonationMode.User"/> (the default setting).
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.Util.WindowsSecurityContext.Password">
-            <summary>
-            Sets the password for the Windows account specified by the <see cref="P:log4net.Util.WindowsSecurityContext.UserName"/> and <see cref="P:log4net.Util.WindowsSecurityContext.DomainName"/> properties.
-            </summary>
-            <value>
-            The password for the Windows account specified by the <see cref="P:log4net.Util.WindowsSecurityContext.UserName"/> and <see cref="P:log4net.Util.WindowsSecurityContext.DomainName"/> properties.
-            </value>
-            <remarks>
-            <para>
-            This property must be set if <see cref="P:log4net.Util.WindowsSecurityContext.Credentials"/>
-            is set to <see cref="F:log4net.Util.WindowsSecurityContext.ImpersonationMode.User"/> (the default setting).
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.Util.WindowsSecurityContext.ImpersonationMode">
-            <summary>
-            The impersonation modes for the <see cref="T:log4net.Util.WindowsSecurityContext"/>
-            </summary>
-            <remarks>
-            <para>
-            See the <see cref="P:log4net.Util.WindowsSecurityContext.Credentials"/> property for
-            details.
-            </para>
-            </remarks>
-        </member>
-        <member name="F:log4net.Util.WindowsSecurityContext.ImpersonationMode.User">
-            <summary>
-            Impersonate a user using the credentials supplied
-            </summary>
-        </member>
-        <member name="F:log4net.Util.WindowsSecurityContext.ImpersonationMode.Process">
-            <summary>
-            Revert this the thread to the credentials of the process
-            </summary>
-        </member>
-        <member name="T:log4net.Util.WindowsSecurityContext.DisposableImpersonationContext">
-            <summary>
-            Adds <see cref="T:System.IDisposable"/> to <see cref="T:System.Security.Principal.WindowsImpersonationContext"/>
-            </summary>
-            <remarks>
-            <para>
-            Helper class to expose the <see cref="T:System.Security.Principal.WindowsImpersonationContext"/>
-            through the <see cref="T:System.IDisposable"/> interface.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.WindowsSecurityContext.DisposableImpersonationContext.#ctor(System.Security.Principal.WindowsImpersonationContext)">
-            <summary>
-            Constructor
-            </summary>
-            <param name="impersonationContext">the impersonation context being wrapped</param>
-            <remarks>
-            <para>
-            Constructor
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.Util.WindowsSecurityContext.DisposableImpersonationContext.Dispose">
-            <summary>
-            Revert the impersonation
-            </summary>
-            <remarks>
-            <para>
-            Revert the impersonation
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.GlobalContext">
-            <summary>
-            The log4net Global Context.
-            </summary>
-            <remarks>
-            <para>
-            The <c>GlobalContext</c> provides a location for global debugging 
-            information to be stored.
-            </para>
-            <para>
-            The global context has a properties map and these properties can 
-            be included in the output of log messages. The <see cref="T:log4net.Layout.PatternLayout"/>
-            supports selecting and outputing these properties.
-            </para>
-            <para>
-            By default the <c>log4net:HostName</c> property is set to the name of 
-            the current machine.
-            </para>
-            </remarks>
-            <example>
-            <code lang="C#">
-            GlobalContext.Properties["hostname"] = Environment.MachineName;
-            </code>
-            </example>
-            <threadsafety static="true" instance="true"/>
-            <author>Nicko Cadell</author>
-        </member>
-        <member name="M:log4net.GlobalContext.#ctor">
-            <summary>
-            Private Constructor. 
-            </summary>
-            <remarks>
-            Uses a private access modifier to prevent instantiation of this class.
-            </remarks>
-        </member>
-        <member name="F:log4net.GlobalContext.s_properties">
-            <summary>
-            The global context properties instance
-            </summary>
-        </member>
-        <member name="P:log4net.GlobalContext.Properties">
-            <summary>
-            The global properties map.
-            </summary>
-            <value>
-            The global properties map.
-            </value>
-            <remarks>
-            <para>
-            The global properties map.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.LogicalThreadContext">
-            <summary>
-            The log4net Logical Thread Context.
-            </summary>
-            <remarks>
-            <para>
-            The <c>LogicalThreadContext</c> provides a location for <see cref="T:System.Runtime.Remoting.Messaging.CallContext"/> specific debugging 
-            information to be stored.
-            The <c>LogicalThreadContext</c> properties override any <see cref="T:log4net.ThreadContext"/> or <see cref="T:log4net.GlobalContext"/>
-            properties with the same name.
-            </para>
-            <para>
-            The Logical Thread Context has a properties map and a stack.
-            The properties and stack can 
-            be included in the output of log messages. The <see cref="T:log4net.Layout.PatternLayout"/>
-            supports selecting and outputting these properties.
-            </para>
-            <para>
-            The Logical Thread Context provides a diagnostic context for the current call context. 
-            This is an instrument for distinguishing interleaved log
-            output from different sources. Log output is typically interleaved
-            when a server handles multiple clients near-simultaneously.
-            </para>
-            <para>
-            The Logical Thread Context is managed on a per <see cref="T:System.Runtime.Remoting.Messaging.CallContext"/> basis.
-            </para>
-            </remarks>
-            <example>Example of using the thread context properties to store a username.
-            <code lang="C#">
-            LogicalThreadContext.Properties["user"] = userName;
-            log.Info("This log message has a LogicalThreadContext Property called 'user'");
-            </code>
-            </example>
-            <example>Example of how to push a message into the context stack
-            <code lang="C#">
-            using(LogicalThreadContext.Stacks["LDC"].Push("my context message"))
-            {
-            	log.Info("This log message has a LogicalThreadContext Stack message that includes 'my context message'");
-            
-            } // at the end of the using block the message is automatically popped 
-            </code>
-            </example>
-            <threadsafety static="true" instance="true"/>
-            <author>Nicko Cadell</author>
-        </member>
-        <member name="M:log4net.LogicalThreadContext.#ctor">
-            <summary>
-            Private Constructor. 
-            </summary>
-            <remarks>
-            <para>
-            Uses a private access modifier to prevent instantiation of this class.
-            </para>
-            </remarks>
-        </member>
-        <member name="F:log4net.LogicalThreadContext.s_properties">
-            <summary>
-            The thread context properties instance
-            </summary>
-        </member>
-        <member name="F:log4net.LogicalThreadContext.s_stacks">
-            <summary>
-            The thread context stacks instance
-            </summary>
-        </member>
-        <member name="P:log4net.LogicalThreadContext.Properties">
-            <summary>
-            The thread properties map
-            </summary>
-            <value>
-            The thread properties map
-            </value>
-            <remarks>
-            <para>
-            The <c>LogicalThreadContext</c> properties override any <see cref="T:log4net.ThreadContext"/> 
-            or <see cref="T:log4net.GlobalContext"/> properties with the same name.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.LogicalThreadContext.Stacks">
-            <summary>
-            The thread stacks
-            </summary>
-            <value>
-            stack map
-            </value>
-            <remarks>
-            <para>
-            The logical thread stacks.
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.LogManager">
-            <summary>
-            This class is used by client applications to request logger instances.
-            </summary>
-            <remarks>
-            <para>
-            This class has static methods that are used by a client to request
-            a logger instance. The <see cref="M:log4net.LogManager.GetLogger(System.String)"/> method is 
-            used to retrieve a logger.
-            </para>
-            <para>
-            See the <see cref="T:log4net.ILog"/> interface for more details.
-            </para>
-            </remarks>
-            <example>Simple example of logging messages
-            <code lang="C#">
-            ILog log = LogManager.GetLogger("application-log");
-            
-            log.Info("Application Start");
-            log.Debug("This is a debug message");
-            
-            if (log.IsDebugEnabled)
-            {
-            	log.Debug("This is another debug message");
-            }
-            </code>
-            </example>
-            <threadsafety static="true" instance="true"/>
-            <seealso cref="T:log4net.ILog"/>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-        </member>
-        <member name="M:log4net.LogManager.#ctor">
-            <summary>
-            Initializes a new instance of the <see cref="T:log4net.LogManager"/> class. 
-            </summary>
-            <remarks>
-            Uses a private access modifier to prevent instantiation of this class.
-            </remarks>
-        </member>
-        <member name="M:log4net.LogManager.Exists(System.String)">
-            <overloads>Returns the named logger if it exists.</overloads>
-            <summary>
-            Returns the named logger if it exists.
-            </summary>
-            <remarks>
-            <para>
-            If the named logger exists (in the default repository) then it
-            returns a reference to the logger, otherwise it returns <c>null</c>.
-            </para>
-            </remarks>
-            <param name="name">The fully qualified logger name to look for.</param>
-            <returns>The logger found, or <c>null</c> if no logger could be found.</returns>
-        </member>
-        <member name="M:log4net.LogManager.Exists(System.String,System.String)">
-            <summary>
-            Returns the named logger if it exists.
-            </summary>
-            <remarks>
-            <para>
-            If the named logger exists (in the specified repository) then it
-            returns a reference to the logger, otherwise it returns
-            <c>null</c>.
-            </para>
-            </remarks>
-            <param name="repository">The repository to lookup in.</param>
-            <param name="name">The fully qualified logger name to look for.</param>
-            <returns>
-            The logger found, or <c>null</c> if the logger doesn't exist in the specified 
-            repository.
-            </returns>
-        </member>
-        <member name="M:log4net.LogManager.Exists(System.Reflection.Assembly,System.String)">
-            <summary>
-            Returns the named logger if it exists.
-            </summary>
-            <remarks>
-            <para>
-            If the named logger exists (in the repository for the specified assembly) then it
-            returns a reference to the logger, otherwise it returns
-            <c>null</c>.
-            </para>
-            </remarks>
-            <param name="repositoryAssembly">The assembly to use to lookup the repository.</param>
-            <param name="name">The fully qualified logger name to look for.</param>
-            <returns>
-            The logger, or <c>null</c> if the logger doesn't exist in the specified
-            assembly's repository.
-            </returns>
-        </member>
-        <member name="M:log4net.LogManager.GetCurrentLoggers">
-            <overloads>Get the currently defined loggers.</overloads>
-            <summary>
-            Returns all the currently defined loggers in the default repository.
-            </summary>
-            <remarks>
-            <para>The root logger is <b>not</b> included in the returned array.</para>
-            </remarks>
-            <returns>All the defined loggers.</returns>
-        </member>
-        <member name="M:log4net.LogManager.GetCurrentLoggers(System.String)">
-            <summary>
-            Returns all the currently defined loggers in the specified repository.
-            </summary>
-            <param name="repository">The repository to lookup in.</param>
-            <remarks>
-            The root logger is <b>not</b> included in the returned array.
-            </remarks>
-            <returns>All the defined loggers.</returns>
-        </member>
-        <member name="M:log4net.LogManager.GetCurrentLoggers(System.Reflection.Assembly)">
-            <summary>
-            Returns all the currently defined loggers in the specified assembly's repository.
-            </summary>
-            <param name="repositoryAssembly">The assembly to use to lookup the repository.</param>
-            <remarks>
-            The root logger is <b>not</b> included in the returned array.
-            </remarks>
-            <returns>All the defined loggers.</returns>
-        </member>
-        <member name="M:log4net.LogManager.GetLogger(System.String)">
-            <overloads>Get or create a logger.</overloads>
-            <summary>
-            Retrieves or creates a named logger.
-            </summary>
-            <remarks>
-            <para>
-            Retrieves a logger named as the <paramref name="name"/>
-            parameter. If the named logger already exists, then the
-            existing instance will be returned. Otherwise, a new instance is
-            created.
-            </para>
-            <para>By default, loggers do not have a set level but inherit
-            it from the hierarchy. This is one of the central features of
-            log4net.
-            </para>
-            </remarks>
-            <param name="name">The name of the logger to retrieve.</param>
-            <returns>The logger with the name specified.</returns>
-        </member>
-        <member name="M:log4net.LogManager.GetLogger(System.String,System.String)">
-            <summary>
-            Retrieves or creates a named logger.
-            </summary>
-            <remarks>
-            <para>
-            Retrieve a logger named as the <paramref name="name"/>
-            parameter. If the named logger already exists, then the
-            existing instance will be returned. Otherwise, a new instance is
-            created.
-            </para>
-            <para>
-            By default, loggers do not have a set level but inherit
-            it from the hierarchy. This is one of the central features of
-            log4net.
-            </para>
-            </remarks>
-            <param name="repository">The repository to lookup in.</param>
-            <param name="name">The name of the logger to retrieve.</param>
-            <returns>The logger with the name specified.</returns>
-        </member>
-        <member name="M:log4net.LogManager.GetLogger(System.Reflection.Assembly,System.String)">
-            <summary>
-            Retrieves or creates a named logger.
-            </summary>
-            <remarks>
-            <para>
-            Retrieve a logger named as the <paramref name="name"/>
-            parameter. If the named logger already exists, then the
-            existing instance will be returned. Otherwise, a new instance is
-            created.
-            </para>
-            <para>
-            By default, loggers do not have a set level but inherit
-            it from the hierarchy. This is one of the central features of
-            log4net.
-            </para>
-            </remarks>
-            <param name="repositoryAssembly">The assembly to use to lookup the repository.</param>
-            <param name="name">The name of the logger to retrieve.</param>
-            <returns>The logger with the name specified.</returns>
-        </member>
-        <member name="M:log4net.LogManager.GetLogger(System.Type)">
-            <summary>
-            Shorthand for <see cref="M:log4net.LogManager.GetLogger(System.String)"/>.
-            </summary>
-            <remarks>
-            Get the logger for the fully qualified name of the type specified.
-            </remarks>
-            <param name="type">The full name of <paramref name="type"/> will be used as the name of the logger to retrieve.</param>
-            <returns>The logger with the name specified.</returns>
-        </member>
-        <member name="M:log4net.LogManager.GetLogger(System.String,System.Type)">
-            <summary>
-            Shorthand for <see cref="M:log4net.LogManager.GetLogger(System.String)"/>.
-            </summary>
-            <remarks>
-            Gets the logger for the fully qualified name of the type specified.
-            </remarks>
-            <param name="repository">The repository to lookup in.</param>
-            <param name="type">The full name of <paramref name="type"/> will be used as the name of the logger to retrieve.</param>
-            <returns>The logger with the name specified.</returns>
-        </member>
-        <member name="M:log4net.LogManager.GetLogger(System.Reflection.Assembly,System.Type)">
-            <summary>
-            Shorthand for <see cref="M:log4net.LogManager.GetLogger(System.String)"/>.
-            </summary>
-            <remarks>
-            Gets the logger for the fully qualified name of the type specified.
-            </remarks>
-            <param name="repositoryAssembly">The assembly to use to lookup the repository.</param>
-            <param name="type">The full name of <paramref name="type"/> will be used as the name of the logger to retrieve.</param>
-            <returns>The logger with the name specified.</returns>
-        </member>
-        <member name="M:log4net.LogManager.Shutdown">
-            <summary>
-            Shuts down the log4net system.
-            </summary>
-            <remarks>
-            <para>
-            Calling this method will <b>safely</b> close and remove all
-            appenders in all the loggers including root contained in all the
-            default repositories.
-            </para>
-            <para>
-            Some appenders need to be closed before the application exists. 
-            Otherwise, pending logging events might be lost.
-            </para>
-            <para>The <c>shutdown</c> method is careful to close nested
-            appenders before closing regular appenders. This is allows
-            configurations where a regular appender is attached to a logger
-            and again to a nested appender.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.LogManager.ShutdownRepository">
-            <overloads>Shutdown a logger repository.</overloads>
-            <summary>
-            Shuts down the default repository.
-            </summary>
-            <remarks>
-            <para>
-            Calling this method will <b>safely</b> close and remove all
-            appenders in all the loggers including root contained in the
-            default repository.
-            </para>
-            <para>Some appenders need to be closed before the application exists. 
-            Otherwise, pending logging events might be lost.
-            </para>
-            <para>The <c>shutdown</c> method is careful to close nested
-            appenders before closing regular appenders. This is allows
-            configurations where a regular appender is attached to a logger
-            and again to a nested appender.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.LogManager.ShutdownRepository(System.String)">
-            <summary>
-            Shuts down the repository for the repository specified.
-            </summary>
-            <remarks>
-            <para>
-            Calling this method will <b>safely</b> close and remove all
-            appenders in all the loggers including root contained in the
-            <paramref name="repository"/> specified.
-            </para>
-            <para>
-            Some appenders need to be closed before the application exists. 
-            Otherwise, pending logging events might be lost.
-            </para>
-            <para>The <c>shutdown</c> method is careful to close nested
-            appenders before closing regular appenders. This is allows
-            configurations where a regular appender is attached to a logger
-            and again to a nested appender.
-            </para>
-            </remarks>
-            <param name="repository">The repository to shutdown.</param>
-        </member>
-        <member name="M:log4net.LogManager.ShutdownRepository(System.Reflection.Assembly)">
-            <summary>
-            Shuts down the repository specified.
-            </summary>
-            <remarks>
-            <para>
-            Calling this method will <b>safely</b> close and remove all
-            appenders in all the loggers including root contained in the
-            repository. The repository is looked up using
-            the <paramref name="repositoryAssembly"/> specified.
-            </para>
-            <para>
-            Some appenders need to be closed before the application exists. 
-            Otherwise, pending logging events might be lost.
-            </para>
-            <para>
-            The <c>shutdown</c> method is careful to close nested
-            appenders before closing regular appenders. This is allows
-            configurations where a regular appender is attached to a logger
-            and again to a nested appender.
-            </para>
-            </remarks>
-            <param name="repositoryAssembly">The assembly to use to lookup the repository.</param>
-        </member>
-        <member name="M:log4net.LogManager.ResetConfiguration">
-            <overloads>Reset the configuration of a repository</overloads>
-            <summary>
-            Resets all values contained in this repository instance to their defaults.
-            </summary>
-            <remarks>
-            <para>
-            Resets all values contained in the repository instance to their
-            defaults.  This removes all appenders from all loggers, sets
-            the level of all non-root loggers to <c>null</c>,
-            sets their additivity flag to <c>true</c> and sets the level
-            of the root logger to <see cref="F:log4net.Core.Level.Debug"/>. Moreover,
-            message disabling is set to its default "off" value.
-            </para>		
-            </remarks>
-        </member>
-        <member name="M:log4net.LogManager.ResetConfiguration(System.String)">
-            <summary>
-            Resets all values contained in this repository instance to their defaults.
-            </summary>
-            <remarks>
-            <para>
-            Reset all values contained in the repository instance to their
-            defaults.  This removes all appenders from all loggers, sets
-            the level of all non-root loggers to <c>null</c>,
-            sets their additivity flag to <c>true</c> and sets the level
-            of the root logger to <see cref="F:log4net.Core.Level.Debug"/>. Moreover,
-            message disabling is set to its default "off" value.
-            </para>		
-            </remarks>
-            <param name="repository">The repository to reset.</param>
-        </member>
-        <member name="M:log4net.LogManager.ResetConfiguration(System.Reflection.Assembly)">
-            <summary>
-            Resets all values contained in this repository instance to their defaults.
-            </summary>
-            <remarks>
-            <para>
-            Reset all values contained in the repository instance to their
-            defaults.  This removes all appenders from all loggers, sets
-            the level of all non-root loggers to <c>null</c>,
-            sets their additivity flag to <c>true</c> and sets the level
-            of the root logger to <see cref="F:log4net.Core.Level.Debug"/>. Moreover,
-            message disabling is set to its default "off" value.
-            </para>		
-            </remarks>
-            <param name="repositoryAssembly">The assembly to use to lookup the repository to reset.</param>
-        </member>
-        <member name="M:log4net.LogManager.GetLoggerRepository">
-            <overloads>Get the logger repository.</overloads>
-            <summary>
-            Returns the default <see cref="T:log4net.Repository.ILoggerRepository"/> instance.
-            </summary>
-            <remarks>
-            <para>
-            Gets the <see cref="T:log4net.Repository.ILoggerRepository"/> for the repository specified
-            by the callers assembly (<see cref="M:System.Reflection.Assembly.GetCallingAssembly"/>).
-            </para>
-            </remarks>
-            <returns>The <see cref="T:log4net.Repository.ILoggerRepository"/> instance for the default repository.</returns>
-        </member>
-        <member name="M:log4net.LogManager.GetLoggerRepository(System.String)">
-            <summary>
-            Returns the default <see cref="T:log4net.Repository.ILoggerRepository"/> instance.
-            </summary>
-            <returns>The default <see cref="T:log4net.Repository.ILoggerRepository"/> instance.</returns>
-            <remarks>
-            <para>
-            Gets the <see cref="T:log4net.Repository.ILoggerRepository"/> for the repository specified
-            by the <paramref name="repository"/> argument.
-            </para>
-            </remarks>
-            <param name="repository">The repository to lookup in.</param>
-        </member>
-        <member name="M:log4net.LogManager.GetLoggerRepository(System.Reflection.Assembly)">
-            <summary>
-            Returns the default <see cref="T:log4net.Repository.ILoggerRepository"/> instance.
-            </summary>
-            <returns>The default <see cref="T:log4net.Repository.ILoggerRepository"/> instance.</returns>
-            <remarks>
-            <para>
-            Gets the <see cref="T:log4net.Repository.ILoggerRepository"/> for the repository specified
-            by the <paramref name="repositoryAssembly"/> argument.
-            </para>
-            </remarks>
-            <param name="repositoryAssembly">The assembly to use to lookup the repository.</param>
-        </member>
-        <member name="M:log4net.LogManager.GetRepository">
-            <overloads>Get a logger repository.</overloads>
-            <summary>
-            Returns the default <see cref="T:log4net.Repository.ILoggerRepository"/> instance.
-            </summary>
-            <remarks>
-            <para>
-            Gets the <see cref="T:log4net.Repository.ILoggerRepository"/> for the repository specified
-            by the callers assembly (<see cref="M:System.Reflection.Assembly.GetCallingAssembly"/>).
-            </para>
-            </remarks>
-            <returns>The <see cref="T:log4net.Repository.ILoggerRepository"/> instance for the default repository.</returns>
-        </member>
-        <member name="M:log4net.LogManager.GetRepository(System.String)">
-            <summary>
-            Returns the default <see cref="T:log4net.Repository.ILoggerRepository"/> instance.
-            </summary>
-            <returns>The default <see cref="T:log4net.Repository.ILoggerRepository"/> instance.</returns>
-            <remarks>
-            <para>
-            Gets the <see cref="T:log4net.Repository.ILoggerRepository"/> for the repository specified
-            by the <paramref name="repository"/> argument.
-            </para>
-            </remarks>
-            <param name="repository">The repository to lookup in.</param>
-        </member>
-        <member name="M:log4net.LogManager.GetRepository(System.Reflection.Assembly)">
-            <summary>
-            Returns the default <see cref="T:log4net.Repository.ILoggerRepository"/> instance.
-            </summary>
-            <returns>The default <see cref="T:log4net.Repository.ILoggerRepository"/> instance.</returns>
-            <remarks>
-            <para>
-            Gets the <see cref="T:log4net.Repository.ILoggerRepository"/> for the repository specified
-            by the <paramref name="repositoryAssembly"/> argument.
-            </para>
-            </remarks>
-            <param name="repositoryAssembly">The assembly to use to lookup the repository.</param>
-        </member>
-        <member name="M:log4net.LogManager.CreateDomain(System.Type)">
-            <overloads>Create a domain</overloads>
-            <summary>
-            Creates a repository with the specified repository type.
-            </summary>
-            <remarks>
-            <para>
-            <b>CreateDomain is obsolete. Use CreateRepository instead of CreateDomain.</b>
-            </para>
-            <para>
-            The <see cref="T:log4net.Repository.ILoggerRepository"/> created will be associated with the repository
-            specified such that a call to <see cref="M:log4net.LogManager.GetRepository"/> will return 
-            the same repository instance.
-            </para>
-            </remarks>
-            <param name="repositoryType">A <see cref="T:System.Type"/> that implements <see cref="T:log4net.Repository.ILoggerRepository"/>
-            and has a no arg constructor. An instance of this type will be created to act
-            as the <see cref="T:log4net.Repository.ILoggerRepository"/> for the repository specified.</param>
-            <returns>The <see cref="T:log4net.Repository.ILoggerRepository"/> created for the repository.</returns>
-        </member>
-        <member name="M:log4net.LogManager.CreateRepository(System.Type)">
-            <overloads>Create a logger repository.</overloads>
-            <summary>
-            Creates a repository with the specified repository type.
-            </summary>
-            <param name="repositoryType">A <see cref="T:System.Type"/> that implements <see cref="T:log4net.Repository.ILoggerRepository"/>
-            and has a no arg constructor. An instance of this type will be created to act
-            as the <see cref="T:log4net.Repository.ILoggerRepository"/> for the repository specified.</param>
-            <returns>The <see cref="T:log4net.Repository.ILoggerRepository"/> created for the repository.</returns>
-            <remarks>
-            <para>
-            The <see cref="T:log4net.Repository.ILoggerRepository"/> created will be associated with the repository
-            specified such that a call to <see cref="M:log4net.LogManager.GetRepository"/> will return 
-            the same repository instance.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.LogManager.CreateDomain(System.String)">
-            <summary>
-            Creates a repository with the specified name.
-            </summary>
-            <remarks>
-            <para>
-            <b>CreateDomain is obsolete. Use CreateRepository instead of CreateDomain.</b>
-            </para>
-            <para>
-            Creates the default type of <see cref="T:log4net.Repository.ILoggerRepository"/> which is a
-            <see cref="T:log4net.Repository.Hierarchy.Hierarchy"/> object.
-            </para>
-            <para>
-            The <paramref name="repository"/> name must be unique. Repositories cannot be redefined.
-            An <see cref="T:System.Exception"/> will be thrown if the repository already exists.
-            </para>
-            </remarks>
-            <param name="repository">The name of the repository, this must be unique amongst repositories.</param>
-            <returns>The <see cref="T:log4net.Repository.ILoggerRepository"/> created for the repository.</returns>
-            <exception cref="T:log4net.Core.LogException">The specified repository already exists.</exception>
-        </member>
-        <member name="M:log4net.LogManager.CreateRepository(System.String)">
-            <summary>
-            Creates a repository with the specified name.
-            </summary>
-            <remarks>
-            <para>
-            Creates the default type of <see cref="T:log4net.Repository.ILoggerRepository"/> which is a
-            <see cref="T:log4net.Repository.Hierarchy.Hierarchy"/> object.
-            </para>
-            <para>
-            The <paramref name="repository"/> name must be unique. Repositories cannot be redefined.
-            An <see cref="T:System.Exception"/> will be thrown if the repository already exists.
-            </para>
-            </remarks>
-            <param name="repository">The name of the repository, this must be unique amongst repositories.</param>
-            <returns>The <see cref="T:log4net.Repository.ILoggerRepository"/> created for the repository.</returns>
-            <exception cref="T:log4net.Core.LogException">The specified repository already exists.</exception>
-        </member>
-        <member name="M:log4net.LogManager.CreateDomain(System.String,System.Type)">
-            <summary>
-            Creates a repository with the specified name and repository type.
-            </summary>
-            <remarks>
-            <para>
-            <b>CreateDomain is obsolete. Use CreateRepository instead of CreateDomain.</b>
-            </para>
-            <para>
-            The <paramref name="repository"/> name must be unique. Repositories cannot be redefined.
-            An <see cref="T:System.Exception"/> will be thrown if the repository already exists.
-            </para>
-            </remarks>
-            <param name="repository">The name of the repository, this must be unique to the repository.</param>
-            <param name="repositoryType">A <see cref="T:System.Type"/> that implements <see cref="T:log4net.Repository.ILoggerRepository"/>
-            and has a no arg constructor. An instance of this type will be created to act
-            as the <see cref="T:log4net.Repository.ILoggerRepository"/> for the repository specified.</param>
-            <returns>The <see cref="T:log4net.Repository.ILoggerRepository"/> created for the repository.</returns>
-            <exception cref="T:log4net.Core.LogException">The specified repository already exists.</exception>
-        </member>
-        <member name="M:log4net.LogManager.CreateRepository(System.String,System.Type)">
-            <summary>
-            Creates a repository with the specified name and repository type.
-            </summary>
-            <remarks>
-            <para>
-            The <paramref name="repository"/> name must be unique. Repositories cannot be redefined.
-            An <see cref="T:System.Exception"/> will be thrown if the repository already exists.
-            </para>
-            </remarks>
-            <param name="repository">The name of the repository, this must be unique to the repository.</param>
-            <param name="repositoryType">A <see cref="T:System.Type"/> that implements <see cref="T:log4net.Repository.ILoggerRepository"/>
-            and has a no arg constructor. An instance of this type will be created to act
-            as the <see cref="T:log4net.Repository.ILoggerRepository"/> for the repository specified.</param>
-            <returns>The <see cref="T:log4net.Repository.ILoggerRepository"/> created for the repository.</returns>
-            <exception cref="T:log4net.Core.LogException">The specified repository already exists.</exception>
-        </member>
-        <member name="M:log4net.LogManager.CreateDomain(System.Reflection.Assembly,System.Type)">
-            <summary>
-            Creates a repository for the specified assembly and repository type.
-            </summary>
-            <remarks>
-            <para>
-            <b>CreateDomain is obsolete. Use CreateRepository instead of CreateDomain.</b>
-            </para>
-            <para>
-            The <see cref="T:log4net.Repository.ILoggerRepository"/> created will be associated with the repository
-            specified such that a call to <see cref="M:log4net.LogManager.GetRepository(System.Reflection.Assembly)"/> with the
-            same assembly specified will return the same repository instance.
-            </para>
-            </remarks>
-            <param name="repositoryAssembly">The assembly to use to get the name of the repository.</param>
-            <param name="repositoryType">A <see cref="T:System.Type"/> that implements <see cref="T:log4net.Repository.ILoggerRepository"/>
-            and has a no arg constructor. An instance of this type will be created to act
-            as the <see cref="T:log4net.Repository.ILoggerRepository"/> for the repository specified.</param>
-            <returns>The <see cref="T:log4net.Repository.ILoggerRepository"/> created for the repository.</returns>
-        </member>
-        <member name="M:log4net.LogManager.CreateRepository(System.Reflection.Assembly,System.Type)">
-            <summary>
-            Creates a repository for the specified assembly and repository type.
-            </summary>
-            <remarks>
-            <para>
-            The <see cref="T:log4net.Repository.ILoggerRepository"/> created will be associated with the repository
-            specified such that a call to <see cref="M:log4net.LogManager.GetRepository(System.Reflection.Assembly)"/> with the
-            same assembly specified will return the same repository instance.
-            </para>
-            </remarks>
-            <param name="repositoryAssembly">The assembly to use to get the name of the repository.</param>
-            <param name="repositoryType">A <see cref="T:System.Type"/> that implements <see cref="T:log4net.Repository.ILoggerRepository"/>
-            and has a no arg constructor. An instance of this type will be created to act
-            as the <see cref="T:log4net.Repository.ILoggerRepository"/> for the repository specified.</param>
-            <returns>The <see cref="T:log4net.Repository.ILoggerRepository"/> created for the repository.</returns>
-        </member>
-        <member name="M:log4net.LogManager.GetAllRepositories">
-            <summary>
-            Gets the list of currently defined repositories.
-            </summary>
-            <remarks>
-            <para>
-            Get an array of all the <see cref="T:log4net.Repository.ILoggerRepository"/> objects that have been created.
-            </para>
-            </remarks>
-            <returns>An array of all the known <see cref="T:log4net.Repository.ILoggerRepository"/> objects.</returns>
-        </member>
-        <member name="M:log4net.LogManager.WrapLogger(log4net.Core.ILogger)">
-            <summary>
-            Looks up the wrapper object for the logger specified.
-            </summary>
-            <param name="logger">The logger to get the wrapper for.</param>
-            <returns>The wrapper for the logger specified.</returns>
-        </member>
-        <member name="M:log4net.LogManager.WrapLoggers(log4net.Core.ILogger[])">
-            <summary>
-            Looks up the wrapper objects for the loggers specified.
-            </summary>
-            <param name="loggers">The loggers to get the wrappers for.</param>
-            <returns>The wrapper objects for the loggers specified.</returns>
-        </member>
-        <member name="M:log4net.LogManager.WrapperCreationHandler(log4net.Core.ILogger)">
-            <summary>
-            Create the <see cref="T:log4net.Core.ILoggerWrapper"/> objects used by
-            this manager.
-            </summary>
-            <param name="logger">The logger to wrap.</param>
-            <returns>The wrapper for the logger specified.</returns>
-        </member>
-        <member name="F:log4net.LogManager.s_wrapperMap">
-            <summary>
-            The wrapper map to use to hold the <see cref="T:log4net.Core.LogImpl"/> objects.
-            </summary>
-        </member>
-        <member name="T:log4net.MDC">
-            <summary>
-            Implementation of Mapped Diagnostic Contexts.
-            </summary>
-            <remarks>
-            <note>
-            <para>
-            The MDC is deprecated and has been replaced by the <see cref="P:log4net.ThreadContext.Properties"/>.
-            The current MDC implementation forwards to the <c>ThreadContext.Properties</c>.
-            </para>
-            </note>
-            <para>
-            The MDC class is similar to the <see cref="T:log4net.NDC"/> class except that it is
-            based on a map instead of a stack. It provides <i>mapped
-            diagnostic contexts</i>. A <i>Mapped Diagnostic Context</i>, or
-            MDC in short, is an instrument for distinguishing interleaved log
-            output from different sources. Log output is typically interleaved
-            when a server handles multiple clients near-simultaneously.
-            </para>
-            <para>
-            The MDC is managed on a per thread basis.
-            </para>
-            </remarks>
-            <threadsafety static="true" instance="true"/>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-        </member>
-        <member name="M:log4net.MDC.#ctor">
-            <summary>
-            Initializes a new instance of the <see cref="T:log4net.MDC"/> class. 
-            </summary>
-            <remarks>
-            Uses a private access modifier to prevent instantiation of this class.
-            </remarks>
-        </member>
-        <member name="M:log4net.MDC.Get(System.String)">
-            <summary>
-            Gets the context value identified by the <paramref name="key"/> parameter.
-            </summary>
-            <param name="key">The key to lookup in the MDC.</param>
-            <returns>The string value held for the key, or a <c>null</c> reference if no corresponding value is found.</returns>
-            <remarks>
-            <note>
-            <para>
-            The MDC is deprecated and has been replaced by the <see cref="P:log4net.ThreadContext.Properties"/>.
-            The current MDC implementation forwards to the <c>ThreadContext.Properties</c>.
-            </para>
-            </note>
-            <para>
-            If the <paramref name="key"/> parameter does not look up to a
-            previously defined context then <c>null</c> will be returned.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.MDC.Set(System.String,System.String)">
-            <summary>
-            Add an entry to the MDC
-            </summary>
-            <param name="key">The key to store the value under.</param>
-            <param name="value">The value to store.</param>
-            <remarks>
-            <note>
-            <para>
-            The MDC is deprecated and has been replaced by the <see cref="P:log4net.ThreadContext.Properties"/>.
-            The current MDC implementation forwards to the <c>ThreadContext.Properties</c>.
-            </para>
-            </note>
-            <para>
-            Puts a context value (the <paramref name="val"/> parameter) as identified
-            with the <paramref name="key"/> parameter into the current thread's
-            context map.
-            </para>
-            <para>
-            If a value is already defined for the <paramref name="key"/>
-            specified then the value will be replaced. If the <paramref name="val"/> 
-            is specified as <c>null</c> then the key value mapping will be removed.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.MDC.Remove(System.String)">
-            <summary>
-            Removes the key value mapping for the key specified.
-            </summary>
-            <param name="key">The key to remove.</param>
-            <remarks>
-            <note>
-            <para>
-            The MDC is deprecated and has been replaced by the <see cref="P:log4net.ThreadContext.Properties"/>.
-            The current MDC implementation forwards to the <c>ThreadContext.Properties</c>.
-            </para>
-            </note>
-            <para>
-            Remove the specified entry from this thread's MDC
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.MDC.Clear">
-            <summary>
-            Clear all entries in the MDC
-            </summary>
-            <remarks>
-            <note>
-            <para>
-            The MDC is deprecated and has been replaced by the <see cref="P:log4net.ThreadContext.Properties"/>.
-            The current MDC implementation forwards to the <c>ThreadContext.Properties</c>.
-            </para>
-            </note>
-            <para>
-            Remove all the entries from this thread's MDC
-            </para>
-            </remarks>
-        </member>
-        <member name="T:log4net.NDC">
-            <summary>
-            Implementation of Nested Diagnostic Contexts.
-            </summary>
-            <remarks>
-            <note>
-            <para>
-            The NDC is deprecated and has been replaced by the <see cref="P:log4net.ThreadContext.Stacks"/>.
-            The current NDC implementation forwards to the <c>ThreadContext.Stacks["NDC"]</c>.
-            </para>
-            </note>
-            <para>
-            A Nested Diagnostic Context, or NDC in short, is an instrument
-            to distinguish interleaved log output from different sources. Log
-            output is typically interleaved when a server handles multiple
-            clients near-simultaneously.
-            </para>
-            <para>
-            Interleaved log output can still be meaningful if each log entry
-            from different contexts had a distinctive stamp. This is where NDCs
-            come into play.
-            </para>
-            <para>
-            Note that NDCs are managed on a per thread basis. The NDC class
-            is made up of static methods that operate on the context of the
-            calling thread.
-            </para>
-            </remarks>
-            <example>How to push a message into the context
-            <code lang="C#">
-            using(NDC.Push("my context message"))
-            {
-            	... all log calls will have 'my context message' included ...
-            
-            } // at the end of the using block the message is automatically removed 
-            </code>
-            </example>
-            <threadsafety static="true" instance="true"/>
-            <author>Nicko Cadell</author>
-            <author>Gert Driesen</author>
-        </member>
-        <member name="M:log4net.NDC.#ctor">
-            <summary>
-            Initializes a new instance of the <see cref="T:log4net.NDC"/> class. 
-            </summary>
-            <remarks>
-            Uses a private access modifier to prevent instantiation of this class.
-            </remarks>
-        </member>
-        <member name="M:log4net.NDC.Clear">
-            <summary>
-            Clears all the contextual information held on the current thread.
-            </summary>
-            <remarks>
-            <note>
-            <para>
-            The NDC is deprecated and has been replaced by the <see cref="P:log4net.ThreadContext.Stacks"/>.
-            The current NDC implementation forwards to the <c>ThreadContext.Stacks["NDC"]</c>.
-            </para>
-            </note>
-            <para>
-            Clears the stack of NDC data held on the current thread.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.NDC.CloneStack">
-            <summary>
-            Creates a clone of the stack of context information.
-            </summary>
-            <returns>A clone of the context info for this thread.</returns>
-            <remarks>
-            <note>
-            <para>
-            The NDC is deprecated and has been replaced by the <see cref="P:log4net.ThreadContext.Stacks"/>.
-            The current NDC implementation forwards to the <c>ThreadContext.Stacks["NDC"]</c>.
-            </para>
-            </note>
-            <para>
-            The results of this method can be passed to the <see cref="M:log4net.NDC.Inherit(System.Collections.Stack)"/> 
-            method to allow child threads to inherit the context of their 
-            parent thread.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.NDC.Inherit(System.Collections.Stack)">
-            <summary>
-            Inherits the contextual information from another thread.
-            </summary>
-            <param name="stack">The context stack to inherit.</param>
-            <remarks>
-            <note>
-            <para>
-            The NDC is deprecated and has been replaced by the <see cref="P:log4net.ThreadContext.Stacks"/>.
-            The current NDC implementation forwards to the <c>ThreadContext.Stacks["NDC"]</c>.
-            </para>
-            </note>
-            <para>
-            This thread will use the context information from the stack
-            supplied. This can be used to initialize child threads with
-            the same contextual information as their parent threads. These
-            contexts will <b>NOT</b> be shared. Any further contexts that
-            are pushed onto the stack will not be visible to the other.
-            Call <see cref="M:log4net.NDC.CloneStack"/> to obtain a stack to pass to
-            this method.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.NDC.Pop">
-            <summary>
-            Removes the top context from the stack.
-            </summary>
-            <returns>
-            The message in the context that was removed from the top 
-            of the stack.
-            </returns>
-            <remarks>
-            <note>
-            <para>
-            The NDC is deprecated and has been replaced by the <see cref="P:log4net.ThreadContext.Stacks"/>.
-            The current NDC implementation forwards to the <c>ThreadContext.Stacks["NDC"]</c>.
-            </para>
-            </note>
-            <para>
-            Remove the top context from the stack, and return
-            it to the caller. If the stack is empty then an
-            empty string (not <c>null</c>) is returned.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.NDC.Push(System.String)">
-            <summary>
-            Pushes a new context message.
-            </summary>
-            <param name="message">The new context message.</param>
-            <returns>
-            An <see cref="T:System.IDisposable"/> that can be used to clean up 
-            the context stack.
-            </returns>
-            <remarks>
-            <note>
-            <para>
-            The NDC is deprecated and has been replaced by the <see cref="P:log4net.ThreadContext.Stacks"/>.
-            The current NDC implementation forwards to the <c>ThreadContext.Stacks["NDC"]</c>.
-            </para>
-            </note>
-            <para>
-            Pushes a new context onto the context stack. An <see cref="T:System.IDisposable"/>
-            is returned that can be used to clean up the context stack. This
-            can be easily combined with the <c>using</c> keyword to scope the
-            context.
-            </para>
-            </remarks>
-            <example>Simple example of using the <c>Push</c> method with the <c>using</c> keyword.
-            <code lang="C#">
-            using(log4net.NDC.Push("NDC_Message"))
-            {
-            	log.Warn("This should have an NDC message");
-            }
-            </code>
-            </example>
-        </member>
-        <member name="M:log4net.NDC.Remove">
-            <summary>
-            Removes the context information for this thread. It is
-            not required to call this method.
-            </summary>
-            <remarks>
-            <note>
-            <para>
-            The NDC is deprecated and has been replaced by the <see cref="P:log4net.ThreadContext.Stacks"/>.
-            The current NDC implementation forwards to the <c>ThreadContext.Stacks["NDC"]</c>.
-            </para>
-            </note>
-            <para>
-            This method is not implemented.
-            </para>
-            </remarks>
-        </member>
-        <member name="M:log4net.NDC.SetMaxDepth(System.Int32)">
-            <summary>
-            Forces the stack depth to be at most <paramref name="maxDepth"/>.
-            </summary>
-            <param name="maxDepth">The maximum depth of the stack</param>
-            <remarks>
-            <note>
-            <para>
-            The NDC is deprecated and has been replaced by the <see cref="P:log4net.ThreadContext.Stacks"/>.
-            The current NDC implementation forwards to the <c>ThreadContext.Stacks["NDC"]</c>.
-            </para>
-            </note>
-            <para>
-            Forces the stack depth to be at most <paramref name="maxDepth"/>.
-            This may truncate the head of the stack. This only affects the 
-            stack in the current thread. Also it does not prevent it from
-            growing, it only sets the maximum depth at the time of the
-            call. This can be used to return to a known context depth.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.NDC.Depth">
-            <summary>
-            Gets the current context depth.
-            </summary>
-            <value>The current context depth.</value>
-            <remarks>
-            <note>
-            <para>
-            The NDC is deprecated and has been replaced by the <see cref="P:log4net.ThreadContext.Stacks"/>.
-            The current NDC implementation forwards to the <c>ThreadContext.Stacks["NDC"]</c>.
-            </para>
-            </note>
-            <para>
-            The number of context values pushed onto the context stack.
-            </para>
-            <para>
-            Used to record the current depth of the context. This can then 
-            be restored using the <see cref="M:log4net.NDC.SetMaxDepth(System.Int32)"/> method.
-            </para>
-            </remarks>
-            <seealso cref="M:log4net.NDC.SetMaxDepth(System.Int32)"/>
-        </member>
-        <member name="T:log4net.ThreadContext">
-            <summary>
-            The log4net Thread Context.
-            </summary>
-            <remarks>
-            <para>
-            The <c>ThreadContext</c> provides a location for thread specific debugging 
-            information to be stored.
-            The <c>ThreadContext</c> properties override any <see cref="T:log4net.GlobalContext"/>
-            properties with the same name.
-            </para>
-            <para>
-            The thread context has a properties map and a stack.
-            The properties and stack can 
-            be included in the output of log messages. The <see cref="T:log4net.Layout.PatternLayout"/>
-            supports selecting and outputting these properties.
-            </para>
-            <para>
-            The Thread Context provides a diagnostic context for the current thread. 
-            This is an instrument for distinguishing interleaved log
-            output from different sources. Log output is typically interleaved
-            when a server handles multiple clients near-simultaneously.
-            </para>
-            <para>
-            The Thread Context is managed on a per thread basis.
-            </para>
-            </remarks>
-            <example>Example of using the thread context properties to store a username.
-            <code lang="C#">
-            ThreadContext.Properties["user"] = userName;
-            log.Info("This log message has a ThreadContext Property called 'user'");
-            </code>
-            </example>
-            <example>Example of how to push a message into the context stack
-            <code lang="C#">
-            using(ThreadContext.Stacks["NDC"].Push("my context message"))
-            {
-            	log.Info("This log message has a ThreadContext Stack message that includes 'my context message'");
-            
-            } // at the end of the using block the message is automatically popped 
-            </code>
-            </example>
-            <threadsafety static="true" instance="true"/>
-            <author>Nicko Cadell</author>
-        </member>
-        <member name="M:log4net.ThreadContext.#ctor">
-            <summary>
-            Private Constructor. 
-            </summary>
-            <remarks>
-            <para>
-            Uses a private access modifier to prevent instantiation of this class.
-            </para>
-            </remarks>
-        </member>
-        <member name="F:log4net.ThreadContext.s_properties">
-            <summary>
-            The thread context properties instance
-            </summary>
-        </member>
-        <member name="F:log4net.ThreadContext.s_stacks">
-            <summary>
-            The thread context stacks instance
-            </summary>
-        </member>
-        <member name="P:log4net.ThreadContext.Properties">
-            <summary>
-            The thread properties map
-            </summary>
-            <value>
-            The thread properties map
-            </value>
-            <remarks>
-            <para>
-            The <c>ThreadContext</c> properties override any <see cref="T:log4net.GlobalContext"/>
-            properties with the same name.
-            </para>
-            </remarks>
-        </member>
-        <member name="P:log4net.ThreadContext.Stacks">
-            <summary>
-            The thread stacks
-            </summary>
-            <value>
-            stack map
-            </value>
-            <remarks>
-            <para>
-            The thread local stacks.
-            </para>
-            </remarks>
-        </member>
-    </members>
-</doc>
diff --git a/qpid/dotnet/Qpid.Common/lib/saxon/saxon-licence.txt b/qpid/dotnet/Qpid.Common/lib/saxon/saxon-licence.txt
deleted file mode 100644
index 1bf2b1279d..0000000000
--- a/qpid/dotnet/Qpid.Common/lib/saxon/saxon-licence.txt
+++ /dev/null
@@ -1,471 +0,0 @@
-                          MOZILLA PUBLIC LICENSE
-                                Version 1.1
-
-                              ---------------
-
-1. Definitions.
-
-     1.0.1. "Commercial Use" means distribution or otherwise making the
-     Covered Code available to a third party.
-
-     1.1. "Contributor" means each entity that creates or contributes to
-     the creation of Modifications.
-
-     1.2. "Contributor Version" means the combination of the Original
-     Code, prior Modifications used by a Contributor, and the Modifications
-     made by that particular Contributor.
-
-     1.3. "Covered Code" means the Original Code or Modifications or the
-     combination of the Original Code and Modifications, in each case
-     including portions thereof.
-
-     1.4. "Electronic Distribution Mechanism" means a mechanism generally
-     accepted in the software development community for the electronic
-     transfer of data.
-
-     1.5. "Executable" means Covered Code in any form other than Source
-     Code.
-
-     1.6. "Initial Developer" means the individual or entity identified
-     as the Initial Developer in the Source Code notice required by Exhibit
-     A.
-
-     1.7. "Larger Work" means a work which combines Covered Code or
-     portions thereof with code not governed by the terms of this License.
-
-     1.8. "License" means this document.
-
-     1.8.1. "Licensable" means having the right to grant, to the maximum
-     extent possible, whether at the time of the initial grant or
-     subsequently acquired, any and all of the rights conveyed herein.
-
-     1.9. "Modifications" means any addition to or deletion from the
-     substance or structure of either the Original Code or any previous
-     Modifications. When Covered Code is released as a series of files, a
-     Modification is:
-          A. Any addition to or deletion from the contents of a file
-          containing Original Code or previous Modifications.
-
-          B. Any new file that contains any part of the Original Code or
-          previous Modifications.
-
-     1.10. "Original Code" means Source Code of computer software code
-     which is described in the Source Code notice required by Exhibit A as
-     Original Code, and which, at the time of its release under this
-     License is not already Covered Code governed by this License.
-
-     1.10.1. "Patent Claims" means any patent claim(s), now owned or
-     hereafter acquired, including without limitation,  method, process,
-     and apparatus claims, in any patent Licensable by grantor.
-
-     1.11. "Source Code" means the preferred form of the Covered Code for
-     making modifications to it, including all modules it contains, plus
-     any associated interface definition files, scripts used to control
-     compilation and installation of an Executable, or source code
-     differential comparisons against either the Original Code or another
-     well known, available Covered Code of the Contributor's choice. The
-     Source Code can be in a compressed or archival form, provided the
-     appropriate decompression or de-archiving software is widely available
-     for no charge.
-
-     1.12. "You" (or "Your")  means an individual or a legal entity
-     exercising rights under, and complying with all of the terms of, this
-     License or a future version of this License issued under Section 6.1.
-     For legal entities, "You" includes any entity which controls, is
-     controlled by, or is under common control with You. For purposes of
-     this definition, "control" means (a) the power, direct or indirect,
-     to cause the direction or management of such entity, whether by
-     contract or otherwise, or (b) ownership of more than fifty percent
-     (50%) of the outstanding shares or beneficial ownership of such
-     entity.
-
-2. Source Code License.
-
-     2.1. The Initial Developer Grant.
-     The Initial Developer hereby grants You a world-wide, royalty-free,
-     non-exclusive license, subject to third party intellectual property
-     claims:
-          (a)  under intellectual property rights (other than patent or
-          trademark) Licensable by Initial Developer to use, reproduce,
-          modify, display, perform, sublicense and distribute the Original
-          Code (or portions thereof) with or without Modifications, and/or
-          as part of a Larger Work; and
-
-          (b) under Patents Claims infringed by the making, using or
-          selling of Original Code, to make, have made, use, practice,
-          sell, and offer for sale, and/or otherwise dispose of the
-          Original Code (or portions thereof).
-
-          (c) the licenses granted in this Section 2.1(a) and (b) are
-          effective on the date Initial Developer first distributes
-          Original Code under the terms of this License.
-
-          (d) Notwithstanding Section 2.1(b) above, no patent license is
-          granted: 1) for code that You delete from the Original Code; 2)
-          separate from the Original Code;  or 3) for infringements caused
-          by: i) the modification of the Original Code or ii) the
-          combination of the Original Code with other software or devices.
-
-     2.2. Contributor Grant.
-     Subject to third party intellectual property claims, each Contributor
-     hereby grants You a world-wide, royalty-free, non-exclusive license
-
-          (a)  under intellectual property rights (other than patent or
-          trademark) Licensable by Contributor, to use, reproduce, modify,
-          display, perform, sublicense and distribute the Modifications
-          created by such Contributor (or portions thereof) either on an
-          unmodified basis, with other Modifications, as Covered Code
-          and/or as part of a Larger Work; and
-
-          (b) under Patent Claims infringed by the making, using, or
-          selling of  Modifications made by that Contributor either alone
-          and/or in combination with its Contributor Version (or portions
-          of such combination), to make, use, sell, offer for sale, have
-          made, and/or otherwise dispose of: 1) Modifications made by that
-          Contributor (or portions thereof); and 2) the combination of
-          Modifications made by that Contributor with its Contributor
-          Version (or portions of such combination).
-
-          (c) the licenses granted in Sections 2.2(a) and 2.2(b) are
-          effective on the date Contributor first makes Commercial Use of
-          the Covered Code.
-
-          (d)    Notwithstanding Section 2.2(b) above, no patent license is
-          granted: 1) for any code that Contributor has deleted from the
-          Contributor Version; 2)  separate from the Contributor Version;
-          3)  for infringements caused by: i) third party modifications of
-          Contributor Version or ii)  the combination of Modifications made
-          by that Contributor with other software  (except as part of the
-          Contributor Version) or other devices; or 4) under Patent Claims
-          infringed by Covered Code in the absence of Modifications made by
-          that Contributor.
-
-3. Distribution Obligations.
-
-     3.1. Application of License.
-     The Modifications which You create or to which You contribute are
-     governed by the terms of this License, including without limitation
-     Section 2.2. The Source Code version of Covered Code may be
-     distributed only under the terms of this License or a future version
-     of this License released under Section 6.1, and You must include a
-     copy of this License with every copy of the Source Code You
-     distribute. You may not offer or impose any terms on any Source Code
-     version that alters or restricts the applicable version of this
-     License or the recipients' rights hereunder. However, You may include
-     an additional document offering the additional rights described in
-     Section 3.5.
-
-     3.2. Availability of Source Code.
-     Any Modification which You create or to which You contribute must be
-     made available in Source Code form under the terms of this License
-     either on the same media as an Executable version or via an accepted
-     Electronic Distribution Mechanism to anyone to whom you made an
-     Executable version available; and if made available via Electronic
-     Distribution Mechanism, must remain available for at least twelve (12)
-     months after the date it initially became available, or at least six
-     (6) months after a subsequent version of that particular Modification
-     has been made available to such recipients. You are responsible for
-     ensuring that the Source Code version remains available even if the
-     Electronic Distribution Mechanism is maintained by a third party.
-
-     3.3. Description of Modifications.
-     You must cause all Covered Code to which You contribute to contain a
-     file documenting the changes You made to create that Covered Code and
-     the date of any change. You must include a prominent statement that
-     the Modification is derived, directly or indirectly, from Original
-     Code provided by the Initial Developer and including the name of the
-     Initial Developer in (a) the Source Code, and (b) in any notice in an
-     Executable version or related documentation in which You describe the
-     origin or ownership of the Covered Code.
-
-     3.4. Intellectual Property Matters
-          (a) Third Party Claims.
-          If Contributor has knowledge that a license under a third party's
-          intellectual property rights is required to exercise the rights
-          granted by such Contributor under Sections 2.1 or 2.2,
-          Contributor must include a text file with the Source Code
-          distribution titled "LEGAL" which describes the claim and the
-          party making the claim in sufficient detail that a recipient will
-          know whom to contact. If Contributor obtains such knowledge after
-          the Modification is made available as described in Section 3.2,
-          Contributor shall promptly modify the LEGAL file in all copies
-          Contributor makes available thereafter and shall take other steps
-          (such as notifying appropriate mailing lists or newsgroups)
-          reasonably calculated to inform those who received the Covered
-          Code that new knowledge has been obtained.
-
-          (b) Contributor APIs.
-          If Contributor's Modifications include an application programming
-          interface and Contributor has knowledge of patent licenses which
-          are reasonably necessary to implement that API, Contributor must
-          also include this information in the LEGAL file.
-
-               (c)    Representations.
-          Contributor represents that, except as disclosed pursuant to
-          Section 3.4(a) above, Contributor believes that Contributor's
-          Modifications are Contributor's original creation(s) and/or
-          Contributor has sufficient rights to grant the rights conveyed by
-          this License.
-
-     3.5. Required Notices.
-     You must duplicate the notice in Exhibit A in each file of the Source
-     Code.  If it is not possible to put such notice in a particular Source
-     Code file due to its structure, then You must include such notice in a
-     location (such as a relevant directory) where a user would be likely
-     to look for such a notice.  If You created one or more Modification(s)
-     You may add your name as a Contributor to the notice described in
-     Exhibit A.  You must also duplicate this License in any documentation
-     for the Source Code where You describe recipients' rights or ownership
-     rights relating to Covered Code.  You may choose to offer, and to
-     charge a fee for, warranty, support, indemnity or liability
-     obligations to one or more recipients of Covered Code. However, You
-     may do so only on Your own behalf, and not on behalf of the Initial
-     Developer or any Contributor. You must make it absolutely clear than
-     any such warranty, support, indemnity or liability obligation is
-     offered by You alone, and You hereby agree to indemnify the Initial
-     Developer and every Contributor for any liability incurred by the
-     Initial Developer or such Contributor as a result of warranty,
-     support, indemnity or liability terms You offer.
-
-     3.6. Distribution of Executable Versions.
-     You may distribute Covered Code in Executable form only if the
-     requirements of Section 3.1-3.5 have been met for that Covered Code,
-     and if You include a notice stating that the Source Code version of
-     the Covered Code is available under the terms of this License,
-     including a description of how and where You have fulfilled the
-     obligations of Section 3.2. The notice must be conspicuously included
-     in any notice in an Executable version, related documentation or
-     collateral in which You describe recipients' rights relating to the
-     Covered Code. You may distribute the Executable version of Covered
-     Code or ownership rights under a license of Your choice, which may
-     contain terms different from this License, provided that You are in
-     compliance with the terms of this License and that the license for the
-     Executable version does not attempt to limit or alter the recipient's
-     rights in the Source Code version from the rights set forth in this
-     License. If You distribute the Executable version under a different
-     license You must make it absolutely clear that any terms which differ
-     from this License are offered by You alone, not by the Initial
-     Developer or any Contributor. You hereby agree to indemnify the
-     Initial Developer and every Contributor for any liability incurred by
-     the Initial Developer or such Contributor as a result of any such
-     terms You offer.
-
-     3.7. Larger Works.
-     You may create a Larger Work by combining Covered Code with other code
-     not governed by the terms of this License and distribute the Larger
-     Work as a single product. In such a case, You must make sure the
-     requirements of this License are fulfilled for the Covered Code.
-
-4. Inability to Comply Due to Statute or Regulation.
-
-     If it is impossible for You to comply with any of the terms of this
-     License with respect to some or all of the Covered Code due to
-     statute, judicial order, or regulation then You must: (a) comply with
-     the terms of this License to the maximum extent possible; and (b)
-     describe the limitations and the code they affect. Such description
-     must be included in the LEGAL file described in Section 3.4 and must
-     be included with all distributions of the Source Code. Except to the
-     extent prohibited by statute or regulation, such description must be
-     sufficiently detailed for a recipient of ordinary skill to be able to
-     understand it.
-
-5. Application of this License.
-
-     This License applies to code to which the Initial Developer has
-     attached the notice in Exhibit A and to related Covered Code.
-
-6. Versions of the License.
-
-     6.1. New Versions.
-     Netscape Communications Corporation ("Netscape") may publish revised
-     and/or new versions of the License from time to time. Each version
-     will be given a distinguishing version number.
-
-     6.2. Effect of New Versions.
-     Once Covered Code has been published under a particular version of the
-     License, You may always continue to use it under the terms of that
-     version. You may also choose to use such Covered Code under the terms
-     of any subsequent version of the License published by Netscape. No one
-     other than Netscape has the right to modify the terms applicable to
-     Covered Code created under this License.
-
-     6.3. Derivative Works.
-     If You create or use a modified version of this License (which you may
-     only do in order to apply it to code which is not already Covered Code
-     governed by this License), You must (a) rename Your license so that
-     the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape",
-     "MPL", "NPL" or any confusingly similar phrase do not appear in your
-     license (except to note that your license differs from this License)
-     and (b) otherwise make it clear that Your version of the license
-     contains terms which differ from the Mozilla Public License and
-     Netscape Public License. (Filling in the name of the Initial
-     Developer, Original Code or Contributor in the notice described in
-     Exhibit A shall not of themselves be deemed to be modifications of
-     this License.)
-
-7. DISCLAIMER OF WARRANTY.
-
-     COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS,
-     WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-     WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF
-     DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING.
-     THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE
-     IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT,
-     YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE
-     COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER
-     OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
-     ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
-
-8. TERMINATION.
-
-     8.1.  This License and the rights granted hereunder will terminate
-     automatically if You fail to comply with terms herein and fail to cure
-     such breach within 30 days of becoming aware of the breach. All
-     sublicenses to the Covered Code which are properly granted shall
-     survive any termination of this License. Provisions which, by their
-     nature, must remain in effect beyond the termination of this License
-     shall survive.
-
-     8.2.  If You initiate litigation by asserting a patent infringement
-     claim (excluding declatory judgment actions) against Initial Developer
-     or a Contributor (the Initial Developer or Contributor against whom
-     You file such action is referred to as "Participant")  alleging that:
-
-     (a)  such Participant's Contributor Version directly or indirectly
-     infringes any patent, then any and all rights granted by such
-     Participant to You under Sections 2.1 and/or 2.2 of this License
-     shall, upon 60 days notice from Participant terminate prospectively,
-     unless if within 60 days after receipt of notice You either: (i)
-     agree in writing to pay Participant a mutually agreeable reasonable
-     royalty for Your past and future use of Modifications made by such
-     Participant, or (ii) withdraw Your litigation claim with respect to
-     the Contributor Version against such Participant.  If within 60 days
-     of notice, a reasonable royalty and payment arrangement are not
-     mutually agreed upon in writing by the parties or the litigation claim
-     is not withdrawn, the rights granted by Participant to You under
-     Sections 2.1 and/or 2.2 automatically terminate at the expiration of
-     the 60 day notice period specified above.
-
-     (b)  any software, hardware, or device, other than such Participant's
-     Contributor Version, directly or indirectly infringes any patent, then
-     any rights granted to You by such Participant under Sections 2.1(b)
-     and 2.2(b) are revoked effective as of the date You first made, used,
-     sold, distributed, or had made, Modifications made by that
-     Participant.
-
-     8.3.  If You assert a patent infringement claim against Participant
-     alleging that such Participant's Contributor Version directly or
-     indirectly infringes any patent where such claim is resolved (such as
-     by license or settlement) prior to the initiation of patent
-     infringement litigation, then the reasonable value of the licenses
-     granted by such Participant under Sections 2.1 or 2.2 shall be taken
-     into account in determining the amount or value of any payment or
-     license.
-
-     8.4.  In the event of termination under Sections 8.1 or 8.2 above,
-     all end user license agreements (excluding distributors and resellers)
-     which have been validly granted by You or any distributor hereunder
-     prior to termination shall survive termination.
-
-9. LIMITATION OF LIABILITY.
-
-     UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
-     (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL
-     DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE,
-     OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR
-     ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY
-     CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL,
-     WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
-     COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
-     INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
-     LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY
-     RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW
-     PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE
-     EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO
-     THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
-
-10. U.S. GOVERNMENT END USERS.
-
-     The Covered Code is a "commercial item," as that term is defined in
-     48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer
-     software" and "commercial computer software documentation," as such
-     terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48
-     C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995),
-     all U.S. Government End Users acquire Covered Code with only those
-     rights set forth herein.
-
-11. MISCELLANEOUS.
-
-     This License represents the complete agreement concerning subject
-     matter hereof. If any provision of this License is held to be
-     unenforceable, such provision shall be reformed only to the extent
-     necessary to make it enforceable. This License shall be governed by
-     California law provisions (except to the extent applicable law, if
-     any, provides otherwise), excluding its conflict-of-law provisions.
-     With respect to disputes in which at least one party is a citizen of,
-     or an entity chartered or registered to do business in the United
-     States of America, any litigation relating to this License shall be
-     subject to the jurisdiction of the Federal Courts of the Northern
-     District of California, with venue lying in Santa Clara County,
-     California, with the losing party responsible for costs, including
-     without limitation, court costs and reasonable attorneys' fees and
-     expenses. The application of the United Nations Convention on
-     Contracts for the International Sale of Goods is expressly excluded.
-     Any law or regulation which provides that the language of a contract
-     shall be construed against the drafter shall not apply to this
-     License.
-
-12. RESPONSIBILITY FOR CLAIMS.
-
-     As between Initial Developer and the Contributors, each party is
-     responsible for claims and damages arising, directly or indirectly,
-     out of its utilization of rights under this License and You agree to
-     work with Initial Developer and Contributors to distribute such
-     responsibility on an equitable basis. Nothing herein is intended or
-     shall be deemed to constitute any admission of liability.
-
-13. MULTIPLE-LICENSED CODE.
-
-     Initial Developer may designate portions of the Covered Code as
-     "Multiple-Licensed".  "Multiple-Licensed" means that the Initial
-     Developer permits you to utilize portions of the Covered Code under
-     Your choice of the NPL or the alternative licenses, if any, specified
-     by the Initial Developer in the file described in Exhibit A.
-
-EXHIBIT A -Mozilla Public License.
-
-     ``The contents of this file are subject to the Mozilla Public License
-     Version 1.1 (the "License"); you may not use this file except in
-     compliance with the License. You may obtain a copy of the License at
-     http://www.mozilla.org/MPL/
-
-     Software distributed under the License is distributed on an "AS IS"
-     basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
-     License for the specific language governing rights and limitations
-     under the License.
-
-     The Original Code is ______________________________________.
-
-     The Initial Developer of the Original Code is ________________________.
-     Portions created by ______________________ are Copyright (C) ______
-     _______________________. All Rights Reserved.
-
-     Contributor(s): ______________________________________.
-
-     Alternatively, the contents of this file may be used under the terms
-     of the _____ license (the  "[___] License"), in which case the
-     provisions of [______] License are applicable instead of those
-     above.  If you wish to allow use of your version of this file only
-     under the terms of the [____] License and not to allow others to use
-     your version of this file under the MPL, indicate your decision by
-     deleting  the provisions above and replace  them with the notice and
-     other provisions required by the [___] License.  If you do not delete
-     the provisions above, a recipient may use your version of this file
-     under either the MPL or the [___] License."
-
-     [NOTE: The text of this Exhibit A may differ slightly from the text of
-     the notices in the Source Code files of the Original Code. You should
-     use the text of this Exhibit A rather than the text found in the
-     Original Code Source Code for Your Modifications.]
-
-
diff --git a/qpid/dotnet/Qpid.Common/lib/saxon/saxon8.jar b/qpid/dotnet/Qpid.Common/lib/saxon/saxon8.jar
deleted file mode 100644
index 197ce75c5b..0000000000
--- a/qpid/dotnet/Qpid.Common/lib/saxon/saxon8.jar
+++ /dev/null
diff --git a/qpid/dotnet/Qpid.Common/lib/seclib-1.0.0/Org.Mentalis.Security.dll b/qpid/dotnet/Qpid.Common/lib/seclib-1.0.0/Org.Mentalis.Security.dll
deleted file mode 100644
index c3b95d71ba..0000000000
--- a/qpid/dotnet/Qpid.Common/lib/seclib-1.0.0/Org.Mentalis.Security.dll
+++ /dev/null
diff --git a/qpid/dotnet/Qpid.Common/lib/seclib-1.0.0/seclib-license.txt b/qpid/dotnet/Qpid.Common/lib/seclib-1.0.0/seclib-license.txt
deleted file mode 100644
index e837183135..0000000000
--- a/qpid/dotnet/Qpid.Common/lib/seclib-1.0.0/seclib-license.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-Source Code License

-

-Copyright © 2002-2006, The Mentalis.org Team

-All rights reserved.

-http://www.mentalis.org/

-

-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

-

-- Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.

-

-- Neither the name of the Mentalis.org Team, nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.

-

-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

diff --git a/qpid/dotnet/Qpid.Common/resources/registry.template b/qpid/dotnet/Qpid.Common/resources/registry.template
deleted file mode 100644
index 1c0a695f10..0000000000
--- a/qpid/dotnet/Qpid.Common/resources/registry.template
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0"?>
-<registries>
-    <registry name="MainRegistry"/>
-</registries>
diff --git a/qpid/dotnet/Qpid.Common/stylesheets/csharp.xsl b/qpid/dotnet/Qpid.Common/stylesheets/csharp.xsl
deleted file mode 100644
index 674c971559..0000000000
--- a/qpid/dotnet/Qpid.Common/stylesheets/csharp.xsl
+++ /dev/null
@@ -1,230 +0,0 @@
-<?xml version='1.0'?> 
-<xsl:stylesheet version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:amq="http://amq.org"> 
-
-<!-- this class contains the templates for generating C# source code for a given framing model -->
-<xsl:import href="utils.xsl"/>
-<xsl:output method="text" indent="yes" name="textFormat"/> 
-
-<xsl:param name="registry_name"/>
-
-<xsl:template match="/"> 
-    <xsl:apply-templates mode="generate-multi" select="frames"/>
-    <xsl:apply-templates mode="generate-registry" select="frames"/>
-</xsl:template>
-
-<!-- processes all frames outputting the classes in a single stream -->
-<!-- (useful for debugging etc) -->
-<xsl:template match="frame" mode="generate-single"> 
-    <xsl:call-template name="generate-class">
-        <xsl:with-param name="f" select="."/>
-    </xsl:call-template>
-</xsl:template>
-
-<!-- generates seperate file for each class/frame -->
-<xsl:template match="frame" mode="generate-multi"> 
-    <xsl:variable name="uri" select="concat(@name, '.cs')"/> 
-    wrote <xsl:value-of select="$uri"/> 
-    <xsl:result-document href="{$uri}" format="textFormat"> 
-    <xsl:call-template name="generate-class">
-        <xsl:with-param name="f" select="."/>
-    </xsl:call-template>
-    </xsl:result-document> 
-</xsl:template> 
-
-<!-- main class generation template -->
-<xsl:template name="generate-class"> 
-    <xsl:param name="f"/>
-using Apache.Qpid.Buffer;
-using System.Text;
-
-namespace Apache.Qpid.Framing
-{
-  ///
-  /// <summary>This class is autogenerated
-  /// Do not modify.
-  ///</summary>
-  /// @author Code Generator Script by robert.j.greig@jpmorgan.com
-  public class <xsl:value-of select="$f/@name"/> : AMQMethodBody , IEncodableAMQDataBlock
-  {
-    public const int CLASS_ID = <xsl:value-of select="$f/@class-id"/>; 	
-    public const int METHOD_ID = <xsl:value-of select="$f/@method-id"/>; 	
-
-    <xsl:for-each select="$f/field"> 
-        <xsl:text>public </xsl:text><xsl:value-of select="@csharp-type"/>
-        <xsl:text> </xsl:text>
-        <xsl:value-of select="@name"/>;    
-    </xsl:for-each> 
-
-    protected override ushort Clazz
-    {
-        get
-        {
-            return <xsl:value-of select="$f/@class-id"/>;
-        }
-    }
-   
-    protected override ushort Method
-    {
-        get
-        {
-            return <xsl:value-of select="$f/@method-id"/>;
-        }
-    }
-
-    protected override uint BodySize
-    {
-    get
-    {
-        <xsl:choose> 
-        <xsl:when test="$f/field">
-        return (uint)
-        <xsl:for-each select="$f/field">
-            <xsl:if test="position() != 1">+
-            </xsl:if>
-            <xsl:value-of select="amq:field-length(.)"/>
-        </xsl:for-each>		 
-        ;
-        </xsl:when>
-        <xsl:otherwise>return 0;</xsl:otherwise>
-        </xsl:choose> 
-    }
-    }
-
-    protected override void WriteMethodPayload(ByteBuffer buffer)
-    {
-        <xsl:for-each select="$f/field">
-            <xsl:if test="@type != 'bit'">
-                <xsl:value-of select="amq:encoder(.)"/>;
-            </xsl:if>
-            <xsl:if test="@type = 'bit' and @boolean-index = 1">
-                <xsl:text>EncodingUtils.WriteBooleans(buffer, new bool[]{</xsl:text>
-                <xsl:value-of select="$f/field[@type='bit']/@name" separator=", "/>});
-            </xsl:if>
-        </xsl:for-each>		 
-    }
-
-    protected override void PopulateMethodBodyFromBuffer(ByteBuffer buffer)
-    {
-        <xsl:for-each select="$f/field">
-            <xsl:value-of select="amq:decoder(.)"/>;
-        </xsl:for-each>		 
-    }
-
-    public override string ToString()
-    {
-        StringBuilder buf = new StringBuilder(base.ToString());
-        <xsl:for-each select="$f/field">
-            <xsl:text>buf.Append(" </xsl:text><xsl:value-of select="@name"/>: ").Append(<xsl:value-of select="@name"/>);
-        </xsl:for-each> 
-        return buf.ToString();
-    }
-
-    public static AMQFrame CreateAMQFrame(ushort channelId<xsl:if test="$f/field">, </xsl:if><xsl:value-of select="$f/field/concat(@csharp-type, ' ', @name)" separator=", "/>)
-    {
-        <xsl:value-of select="@name"/> body = new <xsl:value-of select="@name"/>();
-        <xsl:for-each select="$f/field">
-            <xsl:value-of select="concat('body.', @name, ' = ', @name)"/>;
-        </xsl:for-each>		 
-        AMQFrame frame = new AMQFrame();
-        frame.Channel = channelId;
-        frame.BodyFrame = body;
-        return frame;
-    }
-} 
-}
-</xsl:template> 
-
-<xsl:template match="/" mode="generate-registry">
-     <xsl:text>Matching root for registry mode!</xsl:text>
-     <xsl:value-of select="."/> 
-     <xsl:apply-templates select="frames" mode="generate-registry"/>
-</xsl:template>
-
-<xsl:template match="registries" mode="generate-registry">
-Wrote MethodBodyDecoderRegistry.cs
-    <xsl:result-document href="MethodBodyDecoderRegistry.cs" format="textFormat">
-using System;
-using System.Collections;
-using log4net;
-
-namespace Apache.Qpid.Framing
-{
-
-
-  ///
-  /// <summary>This class is autogenerated
-  /// Do not modify.
-  /// </summary>
-  /// @author Code Generator Script by robert.j.greig@jpmorgan.com
-
-  public class MethodBodyDecoderRegistry
-  {
-    private static readonly ILog _log = LogManager.GetLogger(typeof(MethodBodyDecoderRegistry));
-
-    private static readonly Hashtable _classMethodProductToMethodBodyMap = new Hashtable();
-
-    static MethodBodyDecoderRegistry()
-    {
-      <xsl:for-each select="registry">
-            <xsl:value-of select="concat(@name, '.Register(_classMethodProductToMethodBodyMap)')"/>;         
-        </xsl:for-each>
-      }
-
-      public static AMQMethodBody Get(int clazz, int method) 
-      {
-      Type bodyClass = (Type) _classMethodProductToMethodBodyMap[clazz * 1000 + method];
-      if (bodyClass != null)
-      {
-        try
-        {
-          return (AMQMethodBody) Activator.CreateInstance(bodyClass);
-        }
-        catch (Exception e)
-        {
-          throw new AMQFrameDecodingException(_log, "Unable to instantiate body class for class " + clazz + " and method " + method + ": " + e, e);
-        }
-      }
-      else
-      {
-        throw new AMQFrameDecodingException(_log, "Unable to find a suitable decoder for class " + clazz + " and method " + method);
-      }
-    }
-  }
-  }
-    </xsl:result-document>
-</xsl:template>
-
-<xsl:template match="frames" mode="list-registry">	
-    <xsl:if test="$registry_name">
-
-    <xsl:variable name="file" select="concat($registry_name, '.cs')"/> 
-    wrote <xsl:value-of select="$file"/> 
-    <xsl:result-document href="{$file}" format="textFormat">
-
-using System.Collections;
-namespace Apache.Qpid.Framing
-{
-  /**
-   * This class is autogenerated, do not modify. [From <xsl:value-of select="@protocol"/>]
-   */
-  class <xsl:value-of select="$registry_name"/>
-  {
-    internal static void Register(Hashtable map)
-    {
-        <xsl:for-each select="frame">
-            <xsl:text>map[</xsl:text>
-            <xsl:value-of select="@class-id"/>         
-	    <xsl:text> * 1000 + </xsl:text> 
-            <xsl:value-of select="@method-id"/>         
-	    <xsl:text>] = typeof(</xsl:text> 
-            <xsl:value-of select="@name"/>);
-        </xsl:for-each>
-    }
-}
-}
-    </xsl:result-document>
-
-    </xsl:if>
-</xsl:template>
-
-</xsl:stylesheet>
diff --git a/qpid/dotnet/Qpid.Common/stylesheets/framing.xsl b/qpid/dotnet/Qpid.Common/stylesheets/framing.xsl
deleted file mode 100644
index e015d4c40b..0000000000
--- a/qpid/dotnet/Qpid.Common/stylesheets/framing.xsl
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version='1.0'?> 
-<xsl:stylesheet version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:amq="http://amq.org"> 
-
-<xsl:import href="prepare1.xsl"/>
-<xsl:import href="prepare2.xsl"/>
-<xsl:import href="prepare3.xsl"/>
-<xsl:import href="csharp.xsl"/>
-
-<xsl:output indent="yes"/> 
-<xsl:output method="text" indent="yes" name="textFormat"/> 
-
-<xsl:template match="/">
-    <xsl:variable name="prepare1">
-        <xsl:apply-templates mode="prepare1" select="."/>
-    </xsl:variable>
-
-    <xsl:variable name="prepare2">
-        <xsl:apply-templates mode="prepare2" select="$prepare1"/>
-    </xsl:variable>
-
-    <xsl:variable name="model">
-        <xsl:apply-templates mode="prepare3" select="$prepare2"/>
-    </xsl:variable>
-
-    <xsl:apply-templates mode="generate-multi" select="$model"/>
-    <xsl:apply-templates mode="list-registry" select="$model"/>
-
-    <!-- dump out the intermediary files for debugging -->
-    <!-- 
-    <xsl:result-document href="prepare1.out">
-        <xsl:copy-of select="$prepare1"/> 
-    </xsl:result-document>
-
-    <xsl:result-document href="prepare2.out">
-        <xsl:copy-of select="$prepare2"/> 
-    </xsl:result-document>
-
-    <xsl:result-document href="model.out">
-        <xsl:copy-of select="$model"/> 
-    </xsl:result-document>
-    -->
-</xsl:template>
-
-</xsl:stylesheet> 
diff --git a/qpid/dotnet/Qpid.Common/stylesheets/java.xsl b/qpid/dotnet/Qpid.Common/stylesheets/java.xsl
deleted file mode 100644
index f9904c9e94..0000000000
--- a/qpid/dotnet/Qpid.Common/stylesheets/java.xsl
+++ /dev/null
@@ -1,209 +0,0 @@
-<?xml version='1.0'?> 
-<xsl:stylesheet version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:amq="http://amq.org"> 
-
-<!-- this class contains the templates for generating java source code for a given framing model -->
-<xsl:import href="utils.xsl"/>
-<xsl:output method="text" indent="yes" name="textFormat"/> 
-
-<xsl:param name="registry_name"/>
-
-<xsl:template match="/"> 
-    <xsl:apply-templates mode="generate-multi" select="frames"/>
-    <xsl:apply-templates mode="generate-registry" select="frames"/>
-</xsl:template>
-
-<!-- processes all frames outputting the classes in a single stream -->
-<!-- (useful for debugging etc) -->
-<xsl:template match="frame" mode="generate-single"> 
-    <xsl:call-template name="generate-class">
-        <xsl:with-param name="f" select="."/>
-    </xsl:call-template>
-</xsl:template>
-
-<!-- generates seperate file for each class/frame -->
-<xsl:template match="frame" mode="generate-multi"> 
-    <xsl:variable name="uri" select="concat(@name, '.java')"/> 
-    wrote <xsl:value-of select="$uri"/> 
-    <xsl:result-document href="{$uri}" format="textFormat"> 
-    <xsl:call-template name="generate-class">
-        <xsl:with-param name="f" select="."/>
-    </xsl:call-template>
-    </xsl:result-document> 
-</xsl:template> 
-
-<!-- main class generation template -->
-<xsl:template name="generate-class"> 
-    <xsl:param name="f"/>
-package org.openamq.framing;
-
-import org.apache.mina.common.ByteBuffer;
-
-/**
- * This class is autogenerated, do not modify. [From <xsl:value-of select="$f/parent::frames/@protocol"/>]
- */
-public class <xsl:value-of select="$f/@name"/> extends AMQMethodBody implements EncodableAMQDataBlock
-{ 
-    public static final int CLASS_ID = <xsl:value-of select="$f/@class-id"/>; 	
-    public static final int METHOD_ID = <xsl:value-of select="$f/@method-id"/>; 	
-
-    <xsl:for-each select="$f/field"> 
-        <xsl:text>public </xsl:text><xsl:value-of select="@java-type"/>
-        <xsl:text> </xsl:text>
-        <xsl:value-of select="@name"/>;    
-    </xsl:for-each> 
-
-    protected int getClazz()
-    {
-        return <xsl:value-of select="$f/@class-id"/>;
-    }
-   
-    protected int getMethod()
-    {
-        return <xsl:value-of select="$f/@method-id"/>;
-    }
-
-    protected int getBodySize()
-    {
-        <xsl:choose> 
-        <xsl:when test="$f/field">
-        return
-        <xsl:for-each select="$f/field">
-            <xsl:if test="position() != 1">+
-            </xsl:if>
-            <xsl:value-of select="amq:field-length(.)"/>
-        </xsl:for-each>		 
-        ;
-        </xsl:when>
-        <xsl:otherwise>return 0;</xsl:otherwise>
-        </xsl:choose> 
-    }
-
-    protected void writeMethodPayload(ByteBuffer buffer)
-    {
-        <xsl:for-each select="$f/field">
-            <xsl:if test="@type != 'bit'">
-                <xsl:value-of select="amq:encoder(.)"/>;
-            </xsl:if>
-            <xsl:if test="@type = 'bit' and @boolean-index = 1">
-                <xsl:text>EncodingUtils.writeBooleans(buffer, new boolean[]{</xsl:text>
-                <xsl:value-of select="$f/field[@type='bit']/@name" separator=", "/>});
-            </xsl:if>
-        </xsl:for-each>		 
-    }
-
-    public void populateMethodBodyFromBuffer(ByteBuffer buffer) throws AMQFrameDecodingException
-    {
-        <xsl:for-each select="$f/field">
-            <xsl:value-of select="amq:decoder(.)"/>;
-        </xsl:for-each>		 
-    }
-
-    public String toString()
-    {
-        StringBuffer buf = new StringBuffer(super.toString());
-        <xsl:for-each select="$f/field">
-            <xsl:text>buf.append(" </xsl:text><xsl:value-of select="@name"/>: ").append(<xsl:value-of select="@name"/>);
-        </xsl:for-each> 
-        return buf.toString();
-    }
-
-    public static AMQFrame createAMQFrame(int channelId<xsl:if test="$f/field">, </xsl:if><xsl:value-of select="$f/field/concat(@java-type, ' ', @name)" separator=", "/>)
-    {
-        <xsl:value-of select="@name"/> body = new <xsl:value-of select="@name"/>();
-        <xsl:for-each select="$f/field">
-            <xsl:value-of select="concat('body.', @name, ' = ', @name)"/>;
-        </xsl:for-each>		 
-        AMQFrame frame = new AMQFrame();
-        frame.channel = channelId;
-        frame.bodyFrame = body;
-        return frame;
-    }
-} 
-</xsl:template> 
-
-<xsl:template match="/" mode="generate-registry">
-     <xsl:text>Matching root for registry mode!</xsl:text>
-     <xsl:value-of select="."/> 
-     <xsl:apply-templates select="frames" mode="generate-registry"/>
-</xsl:template>
-
-<xsl:template match="registries" mode="generate-registry">
-Wrote MethodBodyDecoderRegistry.java
-    <xsl:result-document href="MethodBodyDecoderRegistry.java" format="textFormat">package org.openamq.framing;
-
-import java.util.Map;
-import java.util.HashMap;
-import org.apache.log4j.Logger;
-import org.openamq.AMQException;
-
-/**
- * This class is autogenerated, do not modify.
- */
-public final class MethodBodyDecoderRegistry
-{
-    private static final Logger _log = Logger.getLogger(MethodBodyDecoderRegistry.class);
-
-    private static final Map _classMethodProductToMethodBodyMap = new HashMap();
-
-    static
-    {
-        <xsl:for-each select="registry">
-            <xsl:value-of select="concat(@name, '.register(_classMethodProductToMethodBodyMap)')"/>;         
-        </xsl:for-each>
-    }
-
-    public static AMQMethodBody get(int clazz, int method) throws AMQFrameDecodingException
-    {
-	Class bodyClass = (Class) _classMethodProductToMethodBodyMap.get(new Integer(clazz * 1000 + method));
-	if (bodyClass != null)
-	{
-	    try
-	    {
-	        return (AMQMethodBody) bodyClass.newInstance();
-	    }
-	    catch (Exception e)
-	    {
-	    	throw new AMQFrameDecodingException(_log, "Unable to instantiate body class for class " + clazz + " and method " + method + ": " + e, e);
-	    }
-	}
-	else
-	{
-	    throw new AMQFrameDecodingException(_log, "Unable to find a suitable decoder for class " + clazz + " and method " + method);
-	}    
-    }
-}
-</xsl:result-document>
-</xsl:template>
-
-<xsl:template match="frames" mode="list-registry">	
-    <xsl:if test="$registry_name">
-
-    <xsl:variable name="file" select="concat($registry_name, '.java')"/> 
-    wrote <xsl:value-of select="$file"/> 
-    <xsl:result-document href="{$file}" format="textFormat">package org.openamq.framing;
-
-import java.util.Map;
-
-/**
- * This class is autogenerated, do not modify. [From <xsl:value-of select="@protocol"/>]
- */
-class <xsl:value-of select="$registry_name"/>
-{
-    static void register(Map map)
-    {
-        <xsl:for-each select="frame">
-            <xsl:text>map.put(new Integer(</xsl:text>
-            <xsl:value-of select="@class-id"/>         
-	    <xsl:text> * 1000 + </xsl:text> 
-            <xsl:value-of select="@method-id"/>         
-	    <xsl:text>), </xsl:text> 
-            <xsl:value-of select="concat(@name, '.class')"/>);         
-        </xsl:for-each>
-    }
-}
-    </xsl:result-document>
-
-    </xsl:if>
-</xsl:template>
-
-</xsl:stylesheet>
diff --git a/qpid/dotnet/Qpid.Common/stylesheets/prepare1.xsl b/qpid/dotnet/Qpid.Common/stylesheets/prepare1.xsl
deleted file mode 100644
index 9661fb47f6..0000000000
--- a/qpid/dotnet/Qpid.Common/stylesheets/prepare1.xsl
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version='1.0'?> 
-<xsl:stylesheet version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:amq="http://amq.org"> 
-
-<xsl:import href="utils.xsl"/>
-
-<xsl:output indent="yes"/> 
-<xsl:param name="asl_base"/>
-
-<!-- pre-process, phase 1 -->
-
-<xsl:template match="/">
-    <xsl:apply-templates select="protocol" mode="prepare1"/> 
-</xsl:template> 
-
-<xsl:template match="amqp"  mode="prepare1"> 
-    <frames>
-        <xsl:attribute name="protocol">
-            <xsl:value-of select="@comment"/>
-            <xsl:text> (</xsl:text>
-                <xsl:text>major=</xsl:text><xsl:value-of select="option[@name='protocol_major']/@value"/>
-                <xsl:text>, minor=</xsl:text><xsl:value-of select="option[@name='protocol_minor']/@value"/> 
-            <xsl:text>)</xsl:text>
-        </xsl:attribute>  
-        <xsl:apply-templates mode="prepare1" select="inherit"/> 
-        <xsl:apply-templates mode="prepare1" select="include"/> 
-        <xsl:apply-templates mode="prepare1" select="domain"/> 
-        <xsl:apply-templates mode="prepare1" select="class"/> 
-    </frames> 
-</xsl:template> 
-
-<xsl:template match="include" mode="prepare1"> 
-    <xsl:if test="@filename != 'asl_constants.asl'">
-        <!-- skip asl_constants.asl, we don't need it and it is not well formed so causes error warnings -->   
-        <xsl:apply-templates select="document(@filename)" mode="prepare1"/> 
-    </xsl:if> 
-</xsl:template> 
-
-<xsl:template match="inherit" mode="prepare1"> 
-    <xsl:variable name="ibase" select="concat('file:///', $asl_base, '/', @name, '.asl')"/>
-    <xsl:choose>
-        <xsl:when test="document($ibase)">  
-            <xsl:apply-templates select="document($ibase)" mode="prepare1"/>         
-        </xsl:when> 
-        <xsl:otherwise>
-            <xsl:message>
-            Could not inherit from <xsl:value-of select="$ibase"/>; file not found.
-            </xsl:message>
-        </xsl:otherwise>
-    </xsl:choose>
-</xsl:template> 
-
-<xsl:template match="class[@index]" mode="prepare1"> 
-    <xsl:apply-templates select="method" mode="prepare1"/> 
-</xsl:template> 
-
-<xsl:template match="method" mode="prepare1">
-    <xsl:if test="parent::class[@index]"><!-- there is a template class that has no index, which we want to skip -->
-    <frame>
-        <xsl:attribute name="name"><xsl:value-of select="amq:class-name(parent::class/@name, @name)"/></xsl:attribute>
-        <xsl:attribute name="class-id"><xsl:value-of select="parent::class/@index"/></xsl:attribute>
-        <xsl:if test="@index">
-            <xsl:attribute name="method-id"><xsl:value-of select="@index"/></xsl:attribute>
-        </xsl:if>
-        <xsl:if test="not(@index)">
-            <xsl:attribute name="method-id"><xsl:number count="method"/></xsl:attribute>
-        </xsl:if>
-
-        <xsl:apply-templates select="field" mode="prepare1"/>
-    </frame>
-    </xsl:if>
-</xsl:template>
-
-<xsl:template match="domain" mode="prepare1"> 
-    <domain> 
-        <name><xsl:value-of select="@name"/></name> 
-        <type><xsl:value-of select="@type"/></type> 
-    </domain> 
-</xsl:template> 
-
-<xsl:template match="field" mode="prepare1">
-    <field>
-        <xsl:copy-of select="@name"/>
-        <xsl:copy-of select="@type"/>
-        <xsl:copy-of select="@domain"/>
-    </field>
-</xsl:template>
-
-</xsl:stylesheet> 
diff --git a/qpid/dotnet/Qpid.Common/stylesheets/prepare2.xsl b/qpid/dotnet/Qpid.Common/stylesheets/prepare2.xsl
deleted file mode 100644
index d98365d1f3..0000000000
--- a/qpid/dotnet/Qpid.Common/stylesheets/prepare2.xsl
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version='1.0'?> 
-<xsl:stylesheet version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:amq="http://amq.org"> 
-
-<xsl:import href="utils.xsl"/>
-
-<xsl:output indent="yes"/> 
-
-<!-- pre-process, phase 2 -->
-
-<xsl:key name="domain-lookup" match="domain" use="name"/>
-
-<xsl:template match="/"> 
-    <xsl:apply-templates mode="prepare2" select="frames"/> 
-</xsl:template> 
-
-<xsl:template match="field[@domain]" mode="prepare2">
-     <field> 
-         <xsl:variable name="t1" select="key('domain-lookup', @domain)/type"/>
-         <xsl:attribute name="name"><xsl:value-of select="amq:field-name(@name)"/></xsl:attribute>
-         <xsl:attribute name="type"><xsl:value-of select="$t1"/></xsl:attribute>
-     </field> 
-</xsl:template> 
-
-<xsl:template match="field[@type]" mode="prepare2">
-     <field> 
-         <xsl:attribute name="name"><xsl:value-of select="amq:field-name(@name)"/></xsl:attribute>
-         <xsl:attribute name="type"><xsl:value-of select="@type"/></xsl:attribute>
-     </field> 
-</xsl:template> 
-
-<xsl:template match="frames" mode="prepare2">
-    <frames>
-        <xsl:copy-of select="@protocol"/>
-        <xsl:apply-templates mode="prepare2"/>
-    </frames>
-</xsl:template>
-
-<xsl:template match="frame" mode="prepare2">
-    <xsl:element name="{name()}">
-        <xsl:copy-of select="@*"/>
-        <xsl:apply-templates mode="prepare2" select="field"/>  
-    </xsl:element>
-</xsl:template>
-
-<xsl:template match="domain" mode="prepare2"></xsl:template> 
-
-</xsl:stylesheet> 
diff --git a/qpid/dotnet/Qpid.Common/stylesheets/prepare3.xsl b/qpid/dotnet/Qpid.Common/stylesheets/prepare3.xsl
deleted file mode 100644
index 92a2648cd6..0000000000
--- a/qpid/dotnet/Qpid.Common/stylesheets/prepare3.xsl
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version='1.0'?> 
-<xsl:stylesheet version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:amq="http://amq.org"> 
-
-<xsl:import href="utils.xsl"/>
-
-<xsl:output indent="yes"/> 
-
-<!-- final preparation of the model -->
-
-<xsl:template match="/">
-    <xsl:apply-templates mode="prepare3"/>
-</xsl:template>
-
-<xsl:template match="frames" mode="prepare3">
-    <frames>
-        <xsl:copy-of select="@protocol"/>
-        <xsl:apply-templates mode="prepare3"/>
-    </frames>
-</xsl:template>
-
-<xsl:template match="frame" mode="prepare3">
-    <xsl:element name="frame">
-        <xsl:copy-of select="@*"/>
-	<xsl:if test="field[@type='bit']"><xsl:attribute name="has-bit-field">true</xsl:attribute></xsl:if>
-        <xsl:apply-templates mode="prepare3"/>
-    </xsl:element>
-</xsl:template>
-
-
-<xsl:template match="field" mode="prepare3">
-     <field>
-         <xsl:attribute name="type"><xsl:value-of select="@type"/></xsl:attribute>
-         <!-- ensure the field name is processed to be a valid java name -->
-         <xsl:attribute name="name"><xsl:value-of select="amq:field-name(@name)"/></xsl:attribute>
-         <!-- add some attributes to make code generation easier -->
-         <xsl:attribute name="csharp-type"><xsl:value-of select="amq:csharp-type(@type)"/></xsl:attribute>
-         <xsl:if test="@type='bit'">
-             <xsl:attribute name="boolean-index"><xsl:number count="field[@type='bit']"/></xsl:attribute>
-         </xsl:if>
-     </field>
-</xsl:template>
-
-</xsl:stylesheet> 
diff --git a/qpid/dotnet/Qpid.Common/stylesheets/readme.txt b/qpid/dotnet/Qpid.Common/stylesheets/readme.txt
deleted file mode 100644
index c2f98050a6..0000000000
--- a/qpid/dotnet/Qpid.Common/stylesheets/readme.txt
+++ /dev/null
@@ -1,52 +0,0 @@
-This directory contains the xsl stylesheets used to generate the code from the
-OpenAMQ protocol specification. They require an XSLT2.0 processor, currently 
-Saxon 8 is used.
-
-The generation process is controlled by the framing.xsl stylesheet. This performs
-several phases of transformation, using the other stylesheets. The transformation
-in each phase is defined in a separate file, and these are designed to also allow
-then to be run individually. 
-
-The generation takes the amq.asl as input, it also requires that the path to the 
-directory where the base asl definitions reside (those definitions that the main
-amq.asl defintion inherits from) be passed in via a paramter called asl_base.
-
-The files involved are as follows:
-
-    framing.xsl    The control file for the entire generation process
-
-    prepare1.xsl   Resolves the separate files that make up the protocol 
-                   definition, building a single tree containing all the
-                   information as a set of 'frame' elements, each of which
-                   has attributes for its name, and ids for the class and
-                   method it refers to and contains zero or more field 
-                   elements. 
-
-                   A method id is generated based on the order of the 
-                   method elements within the class elements in the original
-                   specification. The class id is taken from the enclosing
-                   class element.  
-
-    prepare2.xsl   Resolves domains into their corresponding types. (This is
-                   much easier when all the information is in a single tree, 
-                   hence the separate frame). 
-
-    prepare3.xsl   Converts names into valid java names and augments the
-                   tree to include information that makes the subsequent
-                   generation phase simpler e.g. the index of boolean 
-                   fields as several boolean flags are combined into a
-                   single byte. (This is easier once the domains have been
-                   resolved, hence the separate phase).
-
-    java.xsl       Generates java classes for each frame, and a registry of 
-                   all the frames to a 'magic' number generated from their 
-                   class and method id.
-
-    utils.xsl      Contains some utility methods for e.g. producing valid
-                   java names.
-
-For debugging the framing.xsl can output the intermediary files. This can be
-enabled by uncommenting the relevant lines (a comment explaining this is
-provided inline).     
- 
- 
\ No newline at end of file
diff --git a/qpid/dotnet/Qpid.Common/stylesheets/registry.xsl b/qpid/dotnet/Qpid.Common/stylesheets/registry.xsl
deleted file mode 100644
index ae2a25a792..0000000000
--- a/qpid/dotnet/Qpid.Common/stylesheets/registry.xsl
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version='1.0'?> 
-<xsl:stylesheet version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:amq="http://amq.org"> 
-
-<xsl:import href="csharp.xsl"/>
-
-<xsl:output method="text" indent="yes" name="textFormat"/> 
-
-<xsl:template match="/">
-    <xsl:apply-templates mode="generate-registry" select="registries"/>
-</xsl:template>
-
-</xsl:stylesheet> 
diff --git a/qpid/dotnet/Qpid.Common/stylesheets/utils.xsl b/qpid/dotnet/Qpid.Common/stylesheets/utils.xsl
deleted file mode 100644
index 422b757b5c..0000000000
--- a/qpid/dotnet/Qpid.Common/stylesheets/utils.xsl
+++ /dev/null
@@ -1,164 +0,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:amq="http://amq.org">
-
-<!-- This file contains functions that are used in the generation of the java classes for framing -->
-
-<!-- retrieve the java type of a given amq type -->
-<xsl:function name="amq:csharp-type">
-    <xsl:param name="t"/>
-    <xsl:choose>
-	 <xsl:when test="$t='char'">char</xsl:when> 		 		 
-	 <xsl:when test="$t='octet'">byte</xsl:when> 		 		 
-	 <xsl:when test="$t='short'">ushort</xsl:when> 		 		 
-	 <xsl:when test="$t='shortstr'">string</xsl:when> 		 		 
-	 <xsl:when test="$t='longstr'">byte[]</xsl:when> 		 		 
-	 <xsl:when test="$t='bit'">bool</xsl:when> 		 		 
-	 <xsl:when test="$t='long'">uint</xsl:when> 		 		 
-	 <xsl:when test="$t='longlong'">ulong</xsl:when> 		 		 
-	 <xsl:when test="$t='table'">FieldTable</xsl:when> 		 		 
-         <xsl:otherwise>Object /*WARNING: undefined type*/</xsl:otherwise>
-    </xsl:choose>
-</xsl:function>
-
-<!-- retrieve the code to get the field size of a given amq type -->
-<xsl:function name="amq:field-length">
-    <xsl:param name="f"/>
-    <xsl:choose>
-        <xsl:when test="$f/@type='bit' and $f/@boolean-index=1">
-            <xsl:value-of select="concat('1 /*', $f/@name, '*/')"/>
-        </xsl:when>
-        <xsl:when test="$f/@type='bit' and $f/@boolean-index &gt; 1">
-            <xsl:value-of select="concat('0 /*', $f/@name, '*/')"/>
-        </xsl:when>
-        <xsl:when test="$f/@type='char'">
-            <xsl:value-of select="concat('1 /*', $f/@name, '*/')"/>
-        </xsl:when>
-        <xsl:when test="$f/@type='octet'">
-            <xsl:value-of select="concat('1 /*', $f/@name, '*/')"/>
-        </xsl:when>
-	<xsl:when test="$f/@type='short'">
-            <xsl:value-of select="concat('2 /*', $f/@name, '*/')"/>
-        </xsl:when>
-        <xsl:when test="$f/@type='long'">
-            <xsl:value-of select="concat('4 /*', $f/@name, '*/')"/>
-        </xsl:when>
-        <xsl:when test="$f/@type='longlong'">
-            <xsl:value-of select="concat('8 /*', $f/@name, '*/')"/>
-        </xsl:when>
-	<xsl:when test="$f/@type='shortstr'">
-            <xsl:value-of select="concat('(uint)EncodingUtils.EncodedShortStringLength(', $f/@name, ')')"/>
-        </xsl:when> 		 		 
-	<xsl:when test="$f/@type='longstr'">
-            <xsl:value-of select="concat('4 + (uint) (', $f/@name, ' == null ? 0 : ', $f/@name, '.Length)')"/>
-        </xsl:when> 		 		 
-	<xsl:when test="$f/@type='table'">
-            <xsl:value-of select="concat('(uint)EncodingUtils.EncodedFieldTableLength(', $f/@name, ')')"/>
-        </xsl:when> 		 		 
-        <xsl:otherwise><xsl:text>/* WARNING: COULD NOT DETERMINE FIELD SIZE */</xsl:text></xsl:otherwise>
-    </xsl:choose>    
-</xsl:function>
-
-<!-- retrieve the code to encode a field of a given amq type -->
-<!-- Note:
-     This method will not provide an encoder for a bit field. 
-     Bit fields should be encoded together separately. -->
-
-<xsl:function name="amq:encoder">
-    <xsl:param name="f"/>
-    <xsl:choose>
-        <xsl:when test="$f/@type='char'">
-            <xsl:value-of select="concat('buffer.Put(', $f/@name, ')')"/>
-        </xsl:when>
-        <xsl:when test="$f/@type='octet'">
-            <xsl:value-of select="concat('buffer.Put(', $f/@name, ')')"/>
-        </xsl:when>
-	<xsl:when test="$f/@type='short'">
-            <xsl:value-of select="concat('buffer.Put(', $f/@name, ')')"/>
-        </xsl:when>
-        <xsl:when test="$f/@type='long'">
-            <xsl:value-of select="concat('buffer.Put(', $f/@name, ')')"/>
-        </xsl:when>
-        <xsl:when test="$f/@type='longlong'">
-            <xsl:value-of select="concat('buffer.Put(', $f/@name, ')')"/>
-        </xsl:when>
-	<xsl:when test="$f/@type='shortstr'">
-            <xsl:value-of select="concat('EncodingUtils.WriteShortStringBytes(buffer, ', $f/@name, ')')"/>
-        </xsl:when> 		 		 
-	<xsl:when test="$f/@type='longstr'">
-            <xsl:value-of select="concat('EncodingUtils.WriteLongstr(buffer, ', $f/@name, ')')"/>
-        </xsl:when> 		 		 
-	<xsl:when test="$f/@type='table'">
-            <xsl:value-of select="concat('EncodingUtils.WriteFieldTableBytes(buffer, ', $f/@name, ')')"/>
-        </xsl:when> 		 		 
-        <xsl:otherwise><xsl:text>/* WARNING: COULD NOT DETERMINE ENCODER */</xsl:text></xsl:otherwise>
-    </xsl:choose>    
-</xsl:function>
-
-<!-- retrieve the code to decode a field of a given amq type -->
-<xsl:function name="amq:decoder">
-    <xsl:param name="f"/>
-    <xsl:choose>
-        <xsl:when test="$f/@type='bit'">
-            <xsl:if test="$f/@boolean-index = 1">
-                <xsl:text>bool[] bools = EncodingUtils.ReadBooleans(buffer);</xsl:text>
-            </xsl:if>
-            <xsl:value-of select="concat($f/@name, ' = bools[', $f/@boolean-index - 1 , ']')"/>
-        </xsl:when>
-        <xsl:when test="$f/@type='char'">
-            <xsl:value-of select="concat($f/@name, ' = buffer.GetChar()')"/>
-        </xsl:when>
-        <xsl:when test="$f/@type='octet'">
-            <xsl:value-of select="concat($f/@name, ' = buffer.GetByte()')"/>
-        </xsl:when>
-        <xsl:when test="$f/@type='short'">
-            <xsl:value-of select="concat($f/@name, ' = buffer.GetUInt16()')"/>
-        </xsl:when>
-        <xsl:when test="$f/@type='long'">
-            <xsl:value-of select="concat($f/@name, ' = buffer.GetUInt32()')"/>
-        </xsl:when>
-        <xsl:when test="$f/@type='longlong'">
-            <xsl:value-of select="concat($f/@name, ' = buffer.GetUInt64()')"/>
-        </xsl:when>
-        <xsl:when test="$f/@type='shortstr'">
-            <xsl:value-of select="concat($f/@name, ' = EncodingUtils.ReadShortString(buffer)')"/>
-        </xsl:when>
-        <xsl:when test="$f/@type='longstr'">
-            <xsl:value-of select="concat($f/@name, ' = EncodingUtils.ReadLongstr(buffer)')"/>
-        </xsl:when>
-        <xsl:when test="$f/@type='table'">
-            <xsl:value-of select="concat($f/@name, ' = EncodingUtils.ReadFieldTable(buffer)')"/>
-        </xsl:when>
-        <xsl:otherwise><xsl:text>/* WARNING: COULD NOT DETERMINE DECODER */</xsl:text></xsl:otherwise>
-    </xsl:choose>    
-</xsl:function>
-
-<!-- create the class name for a frame, based on class and method (passed in) -->
-<xsl:function name="amq:class-name">
-    <xsl:param name="class"/>
-    <xsl:param name="method"/>
-    <xsl:value-of select="concat(amq:upper-first($class),amq:upper-first(amq:field-name($method)), 'Body')"/>
-</xsl:function>
-
-<!-- get a valid field name, processing spaces and '-'s where appropriate -->
-<xsl:function name="amq:field-name">
-    <xsl:param name="name"/>
-    <xsl:choose>
-        <xsl:when test="contains($name, ' ')">
-            <xsl:value-of select="amq:upper-first(concat(substring-before($name, ' '), amq:upper-first(substring-after($name, ' '))))"/>
-        </xsl:when>
-        <xsl:when test="contains($name, '-')">
-            <xsl:value-of select="amq:upper-first(concat(substring-before($name, '-'), amq:upper-first(substring-after($name, '-'))))"/>
-        </xsl:when>
-        <xsl:otherwise>
-            <xsl:value-of select="amq:upper-first($name)"/>
-        </xsl:otherwise>
-    </xsl:choose>
-</xsl:function>
-
-<!-- convert the first character of the input to upper-case -->
-<xsl:function name="amq:upper-first">
-    <xsl:param name="in"/>
-    <xsl:value-of select="concat(upper-case(substring($in, 1, 1)), substring($in, 2))"/>
-</xsl:function>
-
-</xsl:stylesheet>
diff --git a/qpid/dotnet/Qpid.Messaging/AcknowledgeMode.cs b/qpid/dotnet/Qpid.Messaging/AcknowledgeMode.cs
deleted file mode 100644
index 4896b64f68..0000000000
--- a/qpid/dotnet/Qpid.Messaging/AcknowledgeMode.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-namespace Apache.Qpid.Messaging
-{
-    public enum AcknowledgeMode
-    {
-        AutoAcknowledge,
-        ClientAcknowledge,
-        DupsOkAcknowledge,
-        SessionTransacted,
-
-        /// <summary>
-        /// Indicates that no client acknowledgements are required. Broker assumes that once it has 
-        /// delivered a message packet successfully it is acknowledged.
-        /// </summary>
-        NoAcknowledge,
-
-        /// <summary>
-        /// Pre acknowledge means that an ack is sent per message but sent before user code has processed
-        /// the message (i.e. before the onMessage() call or the receive() method has returned).
-        /// </summary>
-        PreAcknowledge
-    }
-}
diff --git a/qpid/dotnet/Qpid.Messaging/ChannelLimitReachedException.cs b/qpid/dotnet/Qpid.Messaging/ChannelLimitReachedException.cs
deleted file mode 100644
index 8b43422f5c..0000000000
--- a/qpid/dotnet/Qpid.Messaging/ChannelLimitReachedException.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-using System;
-using System.Runtime.Serialization;
-
-namespace Apache.Qpid.Messaging
-{
-    [Serializable]
-    public class ChannelLimitReachedException : ResourceAllocationException
-    {
-        private long _limit;
-
-        public ChannelLimitReachedException(long limit)
-            : base("Unable to create session since maximum number of sessions per connection is " +
-                   limit + ". Either close one or more sessions or increase the " +
-                   "maximum number of sessions per connection (or contact your OpenAMQ administrator.")
-        {            
-            _limit = limit;
-        }
-
-        protected ChannelLimitReachedException(SerializationInfo info, StreamingContext ctxt)
-           : base(info, ctxt)
-        {
-           _limit = info.GetInt64("Limit");
-        }
-
-        public long Limit
-        {
-            get
-            {
-                return _limit;
-            }
-        }
-
-        public override void GetObjectData(SerializationInfo info, StreamingContext context)
-        {
-           base.GetObjectData(info, context);
-           info.AddValue("Limit", _limit);
-        }
-    }
-}
diff --git a/qpid/dotnet/Qpid.Messaging/DeliveryMode.cs b/qpid/dotnet/Qpid.Messaging/DeliveryMode.cs
deleted file mode 100644
index 3c4713ee2a..0000000000
--- a/qpid/dotnet/Qpid.Messaging/DeliveryMode.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-namespace Apache.Qpid.Messaging
-{
-    public enum DeliveryMode
-    {
-        NonPersistent,
-        Persistent
-    }
-}
diff --git a/qpid/dotnet/Qpid.Messaging/ExchangeClassConstants.cs b/qpid/dotnet/Qpid.Messaging/ExchangeClassConstants.cs
deleted file mode 100644
index 984e8b0f17..0000000000
--- a/qpid/dotnet/Qpid.Messaging/ExchangeClassConstants.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-namespace Apache.Qpid.Messaging
-{
-    public class ExchangeClassConstants
-    {
-        public readonly static string TOPIC = "topic";
-        public readonly static string DIRECT = "direct";
-        public readonly static string HEADERS = "headers";
-    }
-}
diff --git a/qpid/dotnet/Qpid.Messaging/ExchangeNameDefaults.cs b/qpid/dotnet/Qpid.Messaging/ExchangeNameDefaults.cs
deleted file mode 100644
index cda92d6b55..0000000000
--- a/qpid/dotnet/Qpid.Messaging/ExchangeNameDefaults.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-namespace Apache.Qpid.Messaging
-{
-    public class ExchangeNameDefaults
-    {
-        public readonly static string TOPIC = "amq.topic";
-        public readonly static string DIRECT = "amq.direct";
-        public readonly static string HEADERS = "amq.match";        
-    }
-}
diff --git a/qpid/dotnet/Qpid.Messaging/IBytesMessage.cs b/qpid/dotnet/Qpid.Messaging/IBytesMessage.cs
deleted file mode 100644
index 5be942423d..0000000000
--- a/qpid/dotnet/Qpid.Messaging/IBytesMessage.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-namespace Apache.Qpid.Messaging
-{
-    public interface IBytesMessage : IMessage
-    {
-        long BodyLength { get; }
-
-        bool ReadBoolean();
-        void WriteBoolean(bool value);
-        
-        byte ReadByte();
-        int ReadBytes(byte[] array);
-        int ReadBytes(byte[] array, int length);
-        void WriteByte(byte value);
-        void WriteBytes(byte[] value);
-        void WriteBytes(byte[] value, int offset, int length);
-
-        char ReadChar();
-        void WriteChar(char value);
-        
-        double ReadDouble();
-        void WriteDouble(double value);
-
-        float ReadFloat();
-        void WriteFloat(float value);
-
-        int ReadInt();
-        void WriteInt(int value);
-
-        long ReadLong();
-        void WriteLong(long value);
-
-        short ReadShort();
-        void WriteShort(short value);
-
-        short ReadSignedByte();
-        void WriteSignedByte(short value);
-
-        string ReadUTF();
-        void WriteUTF(string value);
-
-        void Reset();
-    }
-}
diff --git a/qpid/dotnet/Qpid.Messaging/IChannel.cs b/qpid/dotnet/Qpid.Messaging/IChannel.cs
deleted file mode 100644
index 4da41a773d..0000000000
--- a/qpid/dotnet/Qpid.Messaging/IChannel.cs
+++ /dev/null
@@ -1,231 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using System;
-
-namespace Apache.Qpid.Messaging
-{
-    public delegate void MessageReceivedDelegate(IMessage msg);
-    
-    /// <summary>
-    /// Interface used to manipulate an AMQP channel. 
-    /// </summary>
-    /// <remarks>
-    /// You can create a channel by using the CreateChannel() method
-    /// of the connection object.
-    /// </remarks>
-    public interface IChannel : IDisposable
-    {
-        /// <summary>
-        /// Acknowledge mode for messages received
-        /// </summary>
-        AcknowledgeMode AcknowledgeMode { get; }
-        /// <summary>
-        /// True if the channel should use transactions
-        /// </summary>
-        bool Transacted { get; }
-
-        /// <summary>
-        /// Prefetch value to be used as the default for 
-        /// consumers created on this channel.
-        /// </summary>
-        int DefaultPrefetch { get; }
-
-        /// <summary>
-        /// Prefetch low value to be used as the default for 
-        /// consumers created on this channel.
-        /// </summary>
-        int DefaultPrefetchLow { get; }
-
-        /// <summary>
-        /// Prefetch high value to be used as the default for 
-        /// consumers created on this channel.
-        /// </summary>
-        int DefaultPrefetchHigh { get; }
-
-        /// <summary>
-        /// Declare a new exchange
-        /// </summary>
-        /// <param name="exchangeName">Name of the exchange</param>
-        /// <param name="exchangeClass">Class of the exchange, from <see cref="ExchangeClassConstants"/></param>
-        void DeclareExchange(string exchangeName, string exchangeClass);
-        /// <summary>
-        /// Declare a new exchange using the default exchange class
-        /// </summary>
-        /// <param name="exchangeName">Name of the exchange</param>
-        void DeleteExchange(string exchangeName);
-
-        /// <summary>
-        /// Declare a new queue with the specified set of arguments
-        /// </summary>
-        /// <param name="queueName">Name of the queue</param>
-        /// <param name="isDurable">True if the queue should be durable</param>
-        /// <param name="isExclusive">True if the queue should be exclusive to this channel</param>
-        /// <param name="isAutoDelete">True if the queue should be deleted when the channel closes</param>
-        void DeclareQueue(string queueName, bool isDurable, bool isExclusive, bool isAutoDelete);
-        /// <summary>
-        /// Delete a queue with the specifies arguments
-        /// </summary>
-        /// <param name="queueName">Name of the queue to delete</param>
-        /// <param name="ifUnused">If true, the queue will not deleted if it has no consumers</param>
-        /// <param name="ifEmpty">If true, the queue will not deleted if it has no messages</param>
-        /// <param name="noWait">If true, the server will not respond to the method</param>
-        void DeleteQueue(string queueName, bool ifUnused, bool ifEmpty, bool noWait);
-        /// <summary>
-        /// Generate a new Unique name to use for a queue
-        /// </summary>
-        /// <returns>A unique name to this channel</returns>
-        string GenerateUniqueName();
-
-        /// <summary>
-        /// Removes all messages from a queue
-        /// </summary>
-        /// <param name="queueName">Name of the queue to delete</param>
-        /// <param name="noWait">If true, the server will not respond to the method</param>
-        void PurgeQueue(string queueName, bool noWait);
-        
-        /// <summary>
-        /// Bind a queue to the specified exchange
-        /// </summary>
-        /// <param name="queueName">Name of queue to bind</param>
-        /// <param name="exchangeName">Name of exchange to bind to</param>
-        /// <param name="routingKey">Routing key</param>
-        void Bind(string queueName, string exchangeName, string routingKey);
-        /// <summary>
-        /// Bind a queue to the specified exchange
-        /// </summary>
-        /// <param name="queueName">Name of queue to bind</param>
-        /// <param name="exchangeName">Name of exchange to bind to</param>
-        /// <param name="routingKey">Routing key</param>
-        /// <param name="args">Table of arguments for the binding. Used to bind with a Headers Exchange</param>
-        void Bind(string queueName, string exchangeName, string routingKey, IFieldTable args);
-
-        /// <summary>
-        /// Create a new empty message with no body
-        /// </summary>
-        /// <returns>The new message</returns>
-        IMessage CreateMessage();
-        /// <summary>
-        /// Create a new message of the specified MIME type
-        /// </summary>
-        /// <param name="mimeType">The mime type to create</param>
-        /// <returns>The new message</returns>
-        IMessage CreateMessage(string mimeType);
-        /// <summary>
-        /// Creates a new message for bytes (application/octet-stream)
-        /// </summary>
-        /// <returns>The new message</returns>
-        IBytesMessage CreateBytesMessage();
-        /// <summary>
-        /// Creates a new text message (text/plain) with empty content
-        /// </summary>
-        /// <returns>The new message</returns>
-        ITextMessage CreateTextMessage();
-        /// <summary>
-        /// Creates a new text message (text/plain) with a body
-        /// </summary>
-        /// <param name="initialValue">Initial body of the message</param>
-        /// <returns>The new message</returns>
-        ITextMessage CreateTextMessage(string initialValue);
-
-        #region Consuming
-        
-        /// <summary>
-        /// Creates a new Consumer using the builder pattern
-        /// </summary>
-        /// <param name="queueName">Name of queue to receive messages from</param>
-        /// <returns>The builder object</returns>
-        MessageConsumerBuilder CreateConsumerBuilder(string queueName);
-
-        /// <summary>
-        /// Creates a new consumer
-        /// </summary>
-        /// <param name="queueName">Name of queue to receive messages from</param>
-        /// <param name="prefetchLow">Low prefetch value</param>
-        /// <param name="prefetchHigh">High prefetch value</param>
-        /// <param name="noLocal">If true, messages sent on this channel will not be received by this consumer</param>
-        /// <param name="exclusive">If true, the consumer opens the queue in exclusive mode</param>
-        /// <param name="durable">If true, create a durable subscription</param>
-        /// <param name="subscriptionName">Subscription name</param>
-        /// <returns>The new consumer</returns>
-        IMessageConsumer CreateConsumer(string queueName,
-                                        int prefetchLow, 
-                                        int prefetchHigh,
-                                        bool noLocal,
-                                        bool exclusive,
-                                        bool durable,
-                                        string subscriptionName);
-        
-        /// <summary>
-        /// Unsubscribe from a queue
-        /// </summary>
-        /// <param name="subscriptionName">Subscription name</param>
-        void Unsubscribe(string subscriptionName);
-
-        #endregion
-
-        #region Publishing
-
-        /// <summary>
-        /// Create a new message publisher using the builder pattern
-        /// </summary>
-        /// <returns>The builder object</returns>
-        MessagePublisherBuilder CreatePublisherBuilder();
-        
-        /// <summary>
-        /// Create a new message publisher
-        /// </summary>
-        /// <param name="exchangeName">Name of exchange to publish to</param>
-        /// <param name="routingKey">Routing key</param>
-        /// <param name="deliveryMode">Default delivery mode</param>
-        /// <param name="timeToLive">Default TTL time of messages</param>
-        /// <param name="immediate">If true, sent immediately</param>
-        /// <param name="mandatory">If true, the broker will return an error 
-        /// (as a connection exception) if the message cannot be delivered</param>
-        /// <param name="priority">Default message priority</param>
-        /// <returns>The new message publisher</returns>
-        IMessagePublisher CreatePublisher(string exchangeName,
-                                        string routingKey,
-                                        DeliveryMode deliveryMode,
-                                        long timeToLive,
-                                        bool immediate,
-                                        bool mandatory,
-                                        int priority);
-
-        #endregion
-
-        #region Transactions
-        
-        /// <summary>
-        /// Recover after transaction failure
-        /// </summary>
-        void Recover();
-        /// <summary>
-        /// Commit the transaction
-        /// </summary>
-        void Commit();
-        /// <summary>
-        /// Rollback the transaction
-        /// </summary>
-        void Rollback();
-
-        #endregion
-    }
-}
diff --git a/qpid/dotnet/Qpid.Messaging/IConnection.cs b/qpid/dotnet/Qpid.Messaging/IConnection.cs
deleted file mode 100644
index 420228fa8e..0000000000
--- a/qpid/dotnet/Qpid.Messaging/IConnection.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using System;
-
-namespace Apache.Qpid.Messaging
-{
-    public delegate void ExceptionListenerDelegate(Exception ex);
-
-    public interface IConnection : IDisposable
-    {
-        /// <summary>
-        /// The connection listener that has been registered with this connection.
-        /// </summary>
-        IConnectionListener ConnectionListener
-        {
-            get;
-            set;
-        }
-
-        ExceptionListenerDelegate ExceptionListener { get; set; }
-
-        string ClientID { get; set; }
-
-        /// <return>the maximum number of sessions supported by this Connection</return>     
-        int MaximumChannelCount
-        {
-            get;
-        }
-
-        IChannel CreateChannel(bool transacted, AcknowledgeMode acknowledgeMode);
-        IChannel CreateChannel(bool transacted, AcknowledgeMode acknowledgeMode, int prefetch);
-        IChannel CreateChannel(bool transacted, AcknowledgeMode acknowledgeMode, int prefetchHigh, int prefetchLow);
-
-        void Start();
-        void Stop();
-    }
-}
diff --git a/qpid/dotnet/Qpid.Messaging/IConnectionFactory.cs b/qpid/dotnet/Qpid.Messaging/IConnectionFactory.cs
deleted file mode 100644
index f141d509be..0000000000
--- a/qpid/dotnet/Qpid.Messaging/IConnectionFactory.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-namespace Apache.Qpid.Messaging
-{
-    public interface IConnectionFactory
-    {
-        IConnection CreateConnection();
-        IConnection CreateConnection(string userId, string password);
-    }
-}
diff --git a/qpid/dotnet/Qpid.Messaging/IConnectionListener.cs b/qpid/dotnet/Qpid.Messaging/IConnectionListener.cs
deleted file mode 100644
index 02d9eb38da..0000000000
--- a/qpid/dotnet/Qpid.Messaging/IConnectionListener.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-namespace Apache.Qpid.Messaging
-{
-    public interface IConnectionListener
-    {
-        /// <summary>
-        /// Called when bytes have been transmitted to the server
-        /// </summary>
-        /// <param>count the number of bytes sent in total since the connection was opened</param>     
-        void BytesSent(long count);
-
-        /// <summary>
-        /// Called when some bytes have been received on a connection
-        /// </summary>
-        /// <param>count the number of bytes received in total since the connection was opened</param>         
-        void BytesReceived(long count);
-
-        /// <summary>
-        /// Called after the infrastructure has detected that failover is required but before attempting failover.
-        /// </summary>
-        /// <param>redirect true if the broker requested redirect. false if failover is occurring due to a connection error.</param>
-        /// <return>true to continue failing over, false to veto failover and raise a connection exception</return>         
-        bool PreFailover(bool redirect);
-
-        /// <summary>
-        /// Called after connection has been made to another broker after failover has been started but before
-        /// any resubscription has been done.
-        /// <return> true to continue with resubscription, false to prevent automatic resubscription. This is useful in
-        /// cases where the application wants to handle resubscription. Note that in the latter case all sessions, producers
-        /// and consumers are invalidated.
-        /// </return
-        bool PreResubscribe();
-
-        /// <summary>
-        /// Called once failover has completed successfully. This is called irrespective of whether the client has
-        /// vetoed automatic resubscription.
-        /// </summary>
-        void FailoverComplete();
-    }
-}
diff --git a/qpid/dotnet/Qpid.Messaging/IFieldTable.cs b/qpid/dotnet/Qpid.Messaging/IFieldTable.cs
deleted file mode 100644
index 730ce399d4..0000000000
--- a/qpid/dotnet/Qpid.Messaging/IFieldTable.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using System.Collections;
-
-namespace Apache.Qpid.Messaging
-{
-    public interface IFieldTable : IEnumerable
-    {
-        int Count { get; }
-
-        object this[string key] { get; set; }
-
-        /// <summary>
-        /// Adds all the items from another field table in this one. 
-        /// Will overwrite any items in the current table with the same key.
-        /// </summary>
-        /// <param name="source">the source field table</param>
-        void AddAll(IFieldTable source);
-
-        bool Contains(string s);
-        void Clear();
-        void Remove(string key);
-    }
-}
diff --git a/qpid/dotnet/Qpid.Messaging/IHeaders.cs b/qpid/dotnet/Qpid.Messaging/IHeaders.cs
deleted file mode 100644
index 7fdf26ebda..0000000000
--- a/qpid/dotnet/Qpid.Messaging/IHeaders.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-namespace Apache.Qpid.Messaging
-{
-    /// <summary>
-    /// IHeaders represents the header fields of an AMQ message and provides methods to access those fields. There are accessor methods to
-    /// get and set each header field for each supported header field data type.
-    /// 
-    /// <para/><table id="crc"><caption>CRC Card</caption>
-    /// <tr><th>Responsibilities</th></tr>
-    /// <tr><td>Provide accessors for all supported header field types.</td></tr>
-    /// <tr><td>Check if a set of headers contains a named property.</td></tr>
-    /// </table>
-    /// 
-    /// </summary>
-    public interface IHeaders
-    {
-        bool Contains(string name);
-
-        object this[string name] { get; set; }
-        
-        bool GetBoolean(string name);
-        void SetBoolean(string name, bool value);
-
-        byte GetByte(string name);
-        void SetByte(string name, byte value);
-
-        //sbyte GetSByte(string name);
-        //void SetSByte(string name, sbyte value);
-
-        short GetShort(string name);
-        void SetShort(string name, short value);
-
-        int GetInt(string name);
-        void SetInt(string name, int value);
-
-        long GetLong(string name);
-        void SetLong(string name, long value);
-
-        float GetFloat(string name);
-        void SetFloat(string name, float value);
-
-        double GetDouble(string name);
-        void SetDouble(string name, double value);
-
-        string GetString(string name);
-        void SetString(string name, string value);
-    }
-}
diff --git a/qpid/dotnet/Qpid.Messaging/IMessage.cs b/qpid/dotnet/Qpid.Messaging/IMessage.cs
deleted file mode 100644
index 20ae5ee130..0000000000
--- a/qpid/dotnet/Qpid.Messaging/IMessage.cs
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-namespace Apache.Qpid.Messaging
-{   
-    public interface IMessage
-    {
-       /// <summary>
-       /// The MIME Content Type
-       /// </summary>
-       string ContentType { get; set;}
-       /// <summary>
-       /// The MIME Content Encoding
-       /// </summary>
-       string ContentEncoding { get; set; }
-       /// <summary>
-       /// The application correlation identifier
-       /// </summary>
-       string CorrelationId { get; set; }
-       /// <summary>
-       /// The application correlation identifier, as an array of bytes
-       /// </summary>
-       byte[] CorrelationIdAsBytes { get; set; }
-       /// <summary>
-       /// Non-persistent (1) or persistent (2)
-       /// </summary>
-       DeliveryMode DeliveryMode { get; set; }
-       /// <summary>
-       /// Message expiration specification
-       /// </summary>
-       long Expiration { get; set; }
-       /// <summary>
-       /// The application message identifier
-       /// </summary>
-       string MessageId { get; set; }
-       /// <summary>
-       /// The message priority, 0 to 9
-       /// </summary>
-       byte Priority { get; set; }
-       /// <summary>
-       /// True if the message has been redelivered
-       /// </summary>
-        bool Redelivered { get; set; }
-        /// <summary>
-        /// Exchange name of the reply-to address
-        /// </summary>
-        string ReplyToExchangeName { get; set; }
-        /// <summary>
-        /// Routing key of the reply-to address
-        /// </summary>
-        string ReplyToRoutingKey { get; set; }
-        /// <summary>
-        /// The message timestamp
-        /// </summary>
-        long Timestamp { get; set; }
-        /// <summary>
-        /// The message type name
-        /// </summary>
-        string Type { get; set; }
-        /// <summary>
-        /// Message headers
-        /// </summary>
-        IHeaders Headers { get; }
-        /// <summary>
-        /// The creating user id
-        /// </summary>
-        string UserId { get; set; }
-        /// <summary>
-        /// The creating application id
-        /// </summary>
-        string AppId { get; set; }
-        /// <summary>
-        /// Intra-cluster routing identifier
-        /// </summary>
-        string ClusterId { get; set; }
-        
-        void Acknowledge();
-        void ClearBody();
-    }
-}
diff --git a/qpid/dotnet/Qpid.Messaging/IMessageConsumer.cs b/qpid/dotnet/Qpid.Messaging/IMessageConsumer.cs
deleted file mode 100644
index 82d697bf61..0000000000
--- a/qpid/dotnet/Qpid.Messaging/IMessageConsumer.cs
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using System;
-
-namespace Apache.Qpid.Messaging
-{
-   /// <summary>
-   /// Describes an object that can be used to receive (consume)
-   /// messages from an AMQP queue.
-   /// </summary>
-   /// <remarks>
-   /// Consumers are created using either 
-   /// <see cref="IChannel.CreateConsumer"/> or using 
-   /// the builder pattern (preferred) with 
-   /// <see cref="IChannel.CreateConsumerBuilder"/>.
-   /// 
-   /// <para>
-   /// Consumers offer two different ways of receiving messages:
-   /// You can attach a delegate to the <see cref="OnMessage"/>
-   /// event and be notified when a message arrives, or you can
-   /// use the <see cref="Receive"/> and <see cref="ReceiveNoWait"/>
-   /// methods to control when you receive messages. Be aware that you can use 
-   /// one or the other, but not both at the same time.
-   /// </para>
-   /// <para>
-   /// Regardless of which method you choose, the prefetch settings
-   /// specified when creating the channel will still control when messages
-   /// are actually received from the AMQP broker. Any messages that arrive
-   /// between the prefetch window will be queued by the channel
-   /// until they can be delivered to the consumer (either though the event
-   /// or until the consumer actively calls <see cref="Receive"/>).
-   /// </para>
-   /// </remarks>
-   public interface IMessageConsumer : IDisposable
-   {
-      /// <summary>
-      /// Fired when a message is received from the broker by the consumer
-      /// </summary>
-      MessageReceivedDelegate OnMessage { get; set; }
-
-      /// <summary>
-      /// Wait infinitely for a message to be received from the broker
-      /// </summary>
-      /// <returns>The message received</returns>
-      IMessage Receive();
-      /// <summary>
-      /// Wait the specified time until a message is receive from the broker
-      /// </summary>
-      /// <param name="delay">Maximum number of milliseconds to wait for a message</param>
-      /// <returns>The message received, or null if the timeout expires</returns>
-      IMessage Receive(long delay);
-      /// <summary>
-      /// Return a message if one is already available in the channel. 
-      /// Does not wait for one to be received from the broker.
-      /// </summary>
-      /// <returns>The message, if it was available, otherwise null</returns>
-      IMessage ReceiveNoWait();
-   }
-}
diff --git a/qpid/dotnet/Qpid.Messaging/IMessagePublisher.cs b/qpid/dotnet/Qpid.Messaging/IMessagePublisher.cs
deleted file mode 100644
index fab0df0c2b..0000000000
--- a/qpid/dotnet/Qpid.Messaging/IMessagePublisher.cs
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using System;
-
-namespace Apache.Qpid.Messaging
-{
-   /// <summary>
-   /// Defines an object capable of publishing messages
-   /// to an AMQP broker. 
-   /// </summary>
-   /// <remarks>
-   /// A publisher can be created using either 
-   /// <see cref="IChannel.CreatePublisher"/> or 
-   /// using the builder pattern (preferred) with 
-   /// <see cref="IChannel.CreatePublisherBuilder"/>
-   /// </remarks>
-   public interface IMessagePublisher : IDisposable
-   {
-      /// <summary>
-      /// Default delivery mode to use with this publisher
-      /// </summary>
-      DeliveryMode DeliveryMode { get; set; }
-      /// <summary>
-      /// Name of exchange messages are published to
-      /// </summary>
-      string ExchangeName { get; }
-      /// <summary>
-      /// Routing key used when publishing messages
-      /// </summary>
-      string RoutingKey { get; }
-      /// <summary>
-      /// If true, a message ID will not be generated by the publisher
-      /// when sending the message
-      /// </summary>
-      bool DisableMessageID { get; set; }
-      /// <summary>
-      /// If true, no timestamp will be added to the message
-      /// when publishing it
-      /// </summary>
-      bool DisableMessageTimestamp { get; set; }
-      /// <summary>
-      /// Default priority used when publishing messages
-      /// </summary>
-      int Priority { get; set; }
-      /// <summary>
-      /// Default time to live used when publishing messages
-      /// </summary>
-      long TimeToLive { get; set; }
-      /// <summary>
-      /// Set the default MIME type for messages produced by this producer. 
-      /// This reduces the overhead of each message.
-      /// </summary>
-      string MimeType { get; set; }
-      /// <summary>
-      /// Set the default encoding for messages produced by this producer. 
-      /// This reduces the overhead of each message.
-      /// </summary>        
-      string Encoding { get; set; }
-
-      /// <summary>
-      /// Publish a message, using any default values configured
-      /// </summary>
-      /// <param name="msg">Message to publish</param>
-      void Send(IMessage msg);
-      /// <summary>
-      /// Publish a message with the specified options
-      /// </summary>
-      /// <param name="msg">Message to publish</param>
-      /// <param name="deliveryMode">Delivery mode to use</param>
-      /// <param name="priority">Priority of the message</param>
-      /// <param name="timeToLive">Time to live of the message</param>
-      void Send(IMessage msg, DeliveryMode deliveryMode, int priority, long timeToLive);
-   }
-}
diff --git a/qpid/dotnet/Qpid.Messaging/ITextMessage.cs b/qpid/dotnet/Qpid.Messaging/ITextMessage.cs
deleted file mode 100644
index 902beb70f8..0000000000
--- a/qpid/dotnet/Qpid.Messaging/ITextMessage.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-namespace Apache.Qpid.Messaging
-{
-    public interface ITextMessage : IMessage
-    {
-        string Text { get; set; }
-    }
-}
diff --git a/qpid/dotnet/Qpid.Messaging/MessageConsumerBuilder.cs b/qpid/dotnet/Qpid.Messaging/MessageConsumerBuilder.cs
deleted file mode 100644
index 2d6f76d639..0000000000
--- a/qpid/dotnet/Qpid.Messaging/MessageConsumerBuilder.cs
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-namespace Apache.Qpid.Messaging
-{
-    public class MessageConsumerBuilder
-    {
-        private bool _noLocal = false;
-        private bool _exclusive = false;
-        private bool _durable = false;
-        private string _subscriptionName = null;
-        private IChannel _channel;
-        private readonly string _queueName;
-        private int _prefetchLow;
-        private int _prefetchHigh;
-
-        public MessageConsumerBuilder(IChannel channel, string queueName)
-        {
-            _channel = channel;
-            _queueName = queueName;
-            _prefetchHigh = _channel.DefaultPrefetchHigh;
-            _prefetchLow = _channel.DefaultPrefetchLow;
-        }
-
-        public MessageConsumerBuilder WithPrefetchLow(int prefetchLow)
-        {
-            _prefetchLow = prefetchLow;
-            return this;
-        }
-
-        public MessageConsumerBuilder WithPrefetchHigh(int prefetchHigh)
-        {
-            _prefetchHigh = prefetchHigh;
-            return this;
-        }
-
-        public MessageConsumerBuilder WithNoLocal(bool noLocal)
-        {
-            _noLocal = noLocal;
-            return this;
-        }
-
-        public MessageConsumerBuilder WithExclusive(bool exclusive)
-        {
-            _exclusive = exclusive;
-            return this;
-        }
-
-        public MessageConsumerBuilder WithDurable(bool durable)
-        {
-            _durable = durable;
-            return this;
-        }
-
-        public MessageConsumerBuilder WithSubscriptionName(string subscriptionName)
-        {
-            _subscriptionName = subscriptionName;
-            return this;
-        }
-
-        public IMessageConsumer Create()
-        {
-            return _channel.CreateConsumer(_queueName, _prefetchLow, _prefetchHigh, _noLocal, _exclusive, _durable, _subscriptionName);
-        }
-    }
-}
diff --git a/qpid/dotnet/Qpid.Messaging/MessageNotReadableException.cs b/qpid/dotnet/Qpid.Messaging/MessageNotReadableException.cs
deleted file mode 100644
index 2afcffd531..0000000000
--- a/qpid/dotnet/Qpid.Messaging/MessageNotReadableException.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-using System;
-using System.Runtime.Serialization;
-
-namespace Apache.Qpid.Messaging
-{
-    [Serializable]
-    public class MessageNotReadableException : QpidException
-    {
-        public MessageNotReadableException(string reason) : base(reason)
-        {
-        }
-
-        protected MessageNotReadableException(SerializationInfo info, StreamingContext ctxt)
-           : base(info, ctxt)
-        {
-        }
-    }
-}
diff --git a/qpid/dotnet/Qpid.Messaging/MessageNotWritableException.cs b/qpid/dotnet/Qpid.Messaging/MessageNotWritableException.cs
deleted file mode 100644
index 9b00f01948..0000000000
--- a/qpid/dotnet/Qpid.Messaging/MessageNotWritableException.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using System;
-using System.Runtime.Serialization;
-
-namespace Apache.Qpid.Messaging
-{
-    [Serializable]
-    public class MessageNotWriteableException : QpidException
-    {
-        public MessageNotWriteableException(string reason) : base(reason)
-        {
-        }
-
-        protected MessageNotWriteableException(SerializationInfo info, StreamingContext ctxt)
-           : base(info, ctxt)
-        {
-        }
-    }
-}
diff --git a/qpid/dotnet/Qpid.Messaging/MessagePublisherBuilder.cs b/qpid/dotnet/Qpid.Messaging/MessagePublisherBuilder.cs
deleted file mode 100644
index 79c7575d0a..0000000000
--- a/qpid/dotnet/Qpid.Messaging/MessagePublisherBuilder.cs
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-namespace Apache.Qpid.Messaging
-{
-    public class MessagePublisherBuilder
-    {
-        /// <summary>
-        /// Default value for immediate flag is false, i.e. a consumer does not need to be attached to a queue
-        /// </summary>
-        const bool DEFAULT_IMMEDIATE = false;
-
-        /// <summary>
-        /// Default value for mandatory flag is true, i.e. server will not silently drop messages where no queue is
-        /// connected to the exchange for the message
-        /// </summary>
-        const bool DEFAULT_MANDATORY = true;
-
-        IChannel _channel;
-        string _exchangeName = null;
-        string _routingKey = null;
-        DeliveryMode _deliveryMode = DeliveryMode.Persistent;
-        long _timeToLive;
-        bool _immediate = DEFAULT_IMMEDIATE;
-        bool _mandatory = DEFAULT_MANDATORY;
-        int _priority = 0;
-
-        public MessagePublisherBuilder(IChannel channel)
-        {
-            _channel = channel;
-        }
-
-        public MessagePublisherBuilder WithRoutingKey(string routingKey)
-        {
-            _routingKey = routingKey;
-            return this;
-        }
-
-        public MessagePublisherBuilder WithExchangeName(string exchangeName)
-        {
-            _exchangeName = exchangeName;
-            return this;
-        }
-
-        public MessagePublisherBuilder WithDeliveryMode(DeliveryMode deliveryMode)
-        {
-            _deliveryMode = deliveryMode;
-            return this;
-        }
-
-        public MessagePublisherBuilder WithTimeToLive(long timeToLive)
-        {
-            _timeToLive = timeToLive;
-            return this;
-        }
-
-        public MessagePublisherBuilder WithImmediate(bool immediate)
-        {
-            _immediate = immediate;
-            return this;
-        }
-
-        public MessagePublisherBuilder WithMandatory(bool mandatory)
-        {
-            _mandatory = mandatory;
-            return this;
-        }
-
-        public IMessagePublisher Create()
-        {
-            return _channel.CreatePublisher(_exchangeName, _routingKey, _deliveryMode, _timeToLive, _immediate, _mandatory, _priority);
-        }
-    }
-}
diff --git a/qpid/dotnet/Qpid.Messaging/Properties/AssemblyInfo.cs b/qpid/dotnet/Qpid.Messaging/Properties/AssemblyInfo.cs
deleted file mode 100644
index 8683ad08b2..0000000000
--- a/qpid/dotnet/Qpid.Messaging/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using System;
-using System.Reflection;
-using System.Runtime.InteropServices;
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("Apache.Qpid.Messaging")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Apache Qpid")]
-[assembly: AssemblyProduct("Apache.Qpid.Messaging")]
-[assembly: AssemblyCopyright("Copyright (c) 2006 The Apache Software Foundation")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("e74f1805-b355-42e0-ba70-afc7c8570f03")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Revision and Build Numbers 
-// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
-
-[assembly: CLSCompliant(true)]
diff --git a/qpid/dotnet/Qpid.Messaging/Qpid.Messaging.csproj b/qpid/dotnet/Qpid.Messaging/Qpid.Messaging.csproj
deleted file mode 100644
index 90354bece6..0000000000
--- a/qpid/dotnet/Qpid.Messaging/Qpid.Messaging.csproj
+++ /dev/null
@@ -1,69 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <PropertyGroup>

-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ProductVersion>8.0.50727</ProductVersion>

-    <SchemaVersion>2.0</SchemaVersion>

-    <ProjectGuid>{6688F826-C58E-4C1B-AA1F-22AFAB4B7D07}</ProjectGuid>

-    <OutputType>Library</OutputType>

-    <AppDesignerFolder>Properties</AppDesignerFolder>

-    <RootNamespace>Apache.Qpid.Messaging</RootNamespace>

-    <AssemblyName>Apache.Qpid.Messaging</AssemblyName>

-    <SignAssembly>true</SignAssembly>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

-    <DebugSymbols>true</DebugSymbols>

-    <DebugType>full</DebugType>

-    <Optimize>false</Optimize>

-    <OutputPath>..\bin\net-2.0\debug\</OutputPath>

-    <DefineConstants>DEBUG;TRACE</DefineConstants>

-    <ErrorReport>prompt</ErrorReport>

-    <WarningLevel>4</WarningLevel>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

-    <DebugType>pdbonly</DebugType>

-    <Optimize>true</Optimize>

-    <OutputPath>..\bin\net-2.0\release\</OutputPath>

-    <DefineConstants>TRACE</DefineConstants>

-    <ErrorReport>prompt</ErrorReport>

-    <WarningLevel>4</WarningLevel>

-  </PropertyGroup>

-  <ItemGroup>

-    <Reference Include="System" />

-    <Reference Include="System.Data" />

-    <Reference Include="System.Xml" />

-  </ItemGroup>

-  <ItemGroup>

-    <Compile Include="AcknowledgeMode.cs" />

-    <Compile Include="ChannelLimitReachedException.cs" />

-    <Compile Include="DeliveryMode.cs" />

-    <Compile Include="ExchangeClassConstants.cs" />

-    <Compile Include="ExchangeNameDefaults.cs" />

-    <Compile Include="IBytesMessage.cs" />

-    <Compile Include="IConnection.cs" />

-    <Compile Include="IConnectionFactory.cs" />

-    <Compile Include="IConnectionListener.cs" />

-    <Compile Include="IFieldTable.cs" />

-    <Compile Include="IHeaders.cs" />

-    <Compile Include="IMessage.cs" />

-    <Compile Include="IMessageConsumer.cs" />

-    <Compile Include="IMessagePublisher.cs" />

-    <Compile Include="IChannel.cs" />

-    <Compile Include="ITextMessage.cs" />

-    <Compile Include="MessageConsumerBuilder.cs" />

-    <Compile Include="MessageNotReadableException.cs" />

-    <Compile Include="MessageNotWritableException.cs" />

-    <Compile Include="MessagePublisherBuilder.cs" />

-    <Compile Include="Properties\AssemblyInfo.cs" />

-    <Compile Include="QpidException.cs" />

-    <Compile Include="ResourceAllocationException.cs" />

-  </ItemGroup>

-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

-       Other similar extension points exist, see Microsoft.Common.targets.

-  <Target Name="BeforeBuild">

-  </Target>

-  <Target Name="AfterBuild">

-  </Target>

-  -->

-</Project>

diff --git a/qpid/dotnet/Qpid.Messaging/QpidException.cs b/qpid/dotnet/Qpid.Messaging/QpidException.cs
deleted file mode 100644
index 3e39f2293d..0000000000
--- a/qpid/dotnet/Qpid.Messaging/QpidException.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-using System;
-using System.Runtime.Serialization;
-
-namespace Apache.Qpid.Messaging
-{   
-    [Serializable]
-    public class QpidException : Exception
-    {
-        public QpidException(string reason) : base(reason)
-        {
-        }
-
-        public QpidException(string reason, Exception e)
-            : base(reason, e)
-        {
-        }
-
-        protected QpidException(SerializationInfo info, StreamingContext ctxt)
-           : base(info, ctxt)
-        {
-        }
-    }
-}
diff --git a/qpid/dotnet/Qpid.Messaging/ResourceAllocationException.cs b/qpid/dotnet/Qpid.Messaging/ResourceAllocationException.cs
deleted file mode 100644
index 954dcdd94c..0000000000
--- a/qpid/dotnet/Qpid.Messaging/ResourceAllocationException.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-using System;
-using System.Runtime.Serialization;
-
-namespace Apache.Qpid.Messaging
-{
-    [Serializable]
-    public class ResourceAllocationException : QpidException
-    {
-        public ResourceAllocationException(string reason) : base(reason)
-        {
-        }
-
-        protected ResourceAllocationException(SerializationInfo info, StreamingContext ctxt)
-           : base(info, ctxt)
-        {
-        }
-    }
-}
diff --git a/qpid/dotnet/Qpid.Messaging/default.build b/qpid/dotnet/Qpid.Messaging/default.build
deleted file mode 100644
index 789258bfad..0000000000
--- a/qpid/dotnet/Qpid.Messaging/default.build
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>

-<project name="Apache.Qpid.Messaging" default="build">

-    <!--

-		Properties that come from master build file

-		- build.dir: root directory for build

-		- build.debug: true if building debug release

-		- build.defines: variables to define during build

-    -->

-

-    <target name="build">

-        <csc target="library" 

-				define="${build.defines}" 

-				debug="${build.debug}" 

-            output="${build.dir}/${project::get-name()}.dll">

-			

-			<sources>

-			   <include name="**/*.cs" />

-         </sources>

-         <references>

-         </references>

-        </csc>

-    </target>

-</project>

-

diff --git a/qpid/dotnet/Qpid.NET.FxCop b/qpid/dotnet/Qpid.NET.FxCop
deleted file mode 100644
index cfc5445e40..0000000000
--- a/qpid/dotnet/Qpid.NET.FxCop
+++ /dev/null
@@ -1,16755 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<FxCopProject Version="1.35" Name="My FxCop Project">

- <ProjectOptions>

-  <SharedProject>True</SharedProject>

-  <Stylesheet Apply="False">http://www.gotdotnet.com/team/fxcop//xsl/1.35/FxCopReport.xsl</Stylesheet>

-  <SaveMessages>

-   <Project Status="Active, Excluded" NewOnly="False" />

-   <Report Status="Active" NewOnly="False" />

-  </SaveMessages>

-  <ProjectFile Compress="True" DefaultTargetCheck="True" DefaultRuleCheck="True" SaveByRuleGroup="" Deterministic="True" />

-  <EnableMultithreadedLoad>True</EnableMultithreadedLoad>

-  <EnableMultithreadedAnalysis>True</EnableMultithreadedAnalysis>

-  <SourceLookup>True</SourceLookup>

-  <AnalysisExceptionsThreshold>10</AnalysisExceptionsThreshold>

-  <RuleExceptionsThreshold>1</RuleExceptionsThreshold>

-  <Spelling Locale="en-us" />

-  <VersionAware>False</VersionAware>

-  <OverrideRuleVisibilities>False</OverrideRuleVisibilities>

-  <CustomDictionaries SearchFxCopDir="True" SearchUserProfile="True" SearchProjectDir="True" />

-  <SearchGlobalAssemblyCache>False</SearchGlobalAssemblyCache>

-  <DeadlockDetectionTimeout>120</DeadlockDetectionTimeout>

- </ProjectOptions>

- <Targets>

-  <Target Name="$(ProjectDir)/Qpid.Client.Tests/bin/Debug/Qpid.Buffer.dll" Analyze="True" AnalyzeAllChildren="True" />

-  <Target Name="$(ProjectDir)/Qpid.Client.Tests/bin/Debug/Qpid.Client.dll" Analyze="True" AnalyzeAllChildren="True" />

-  <Target Name="$(ProjectDir)/Qpid.Client.Tests/bin/Debug/Qpid.Client.Tests.dll" Analyze="True" AnalyzeAllChildren="True" />

-  <Target Name="$(ProjectDir)/Qpid.Client.Tests/bin/Debug/Qpid.Client.Transport.Socket.Blocking.dll" Analyze="True" AnalyzeAllChildren="True" />

-  <Target Name="$(ProjectDir)/Qpid.Client.Tests/bin/Debug/Qpid.Codec.dll" Analyze="True" AnalyzeAllChildren="True" />

-  <Target Name="$(ProjectDir)/Qpid.Client.Tests/bin/Debug/Qpid.Common.dll" Analyze="True" AnalyzeAllChildren="True" />

-  <Target Name="$(ProjectDir)/Qpid.Client.Tests/bin/Debug/Qpid.Messaging.dll" Analyze="True" AnalyzeAllChildren="True" />

- </Targets>

- <Rules>

-  <RuleFiles>

-   <RuleFile Name="$(FxCopDir)\Rules\DesignRules.dll" Enabled="True" AllRulesEnabled="True" />

-   <RuleFile Name="$(FxCopDir)\Rules\GlobalizationRules.dll" Enabled="True" AllRulesEnabled="True" />

-   <RuleFile Name="$(FxCopDir)\Rules\InteroperabilityRules.dll" Enabled="True" AllRulesEnabled="True" />

-   <RuleFile Name="$(FxCopDir)\Rules\MobilityRules.dll" Enabled="True" AllRulesEnabled="True" />

-   <RuleFile Name="$(FxCopDir)\Rules\NamingRules.dll" Enabled="True" AllRulesEnabled="True" />

-   <RuleFile Name="$(FxCopDir)\Rules\PerformanceRules.dll" Enabled="True" AllRulesEnabled="True" />

-   <RuleFile Name="$(FxCopDir)\Rules\PortabilityRules.dll" Enabled="True" AllRulesEnabled="True" />

-   <RuleFile Name="$(FxCopDir)\Rules\SecurityRules.dll" Enabled="True" AllRulesEnabled="True" />

-   <RuleFile Name="$(FxCopDir)\Rules\UsageRules.dll" Enabled="True" AllRulesEnabled="True" />

-  </RuleFiles>

-  <Groups />

-  <Settings />

- </Rules>

- <FxCopReport Version="1.35">

-  <Namespaces>

-   <Namespace Name="Qpid">

-    <Messages>

-     <Message Id="Qpid" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-      <Issue Name="Namespace">

-       <Item>Qpid</Item>

-       <Item>Qpid</Item>

-      </Issue>

-     </Message>

-    </Messages>

-   </Namespace>

-   <Namespace Name="Qpid.Buffer">

-    <Messages>

-     <Message Id="Qpid" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-      <Issue Name="Namespace">

-       <Item>Qpid</Item>

-       <Item>Qpid.Buffer</Item>

-      </Issue>

-     </Message>

-    </Messages>

-   </Namespace>

-   <Namespace Name="Qpid.Client">

-    <Messages>

-     <Message Id="Qpid" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-      <Issue Name="Namespace">

-       <Item>Qpid</Item>

-       <Item>Qpid.Client</Item>

-      </Issue>

-     </Message>

-    </Messages>

-   </Namespace>

-   <Namespace Name="Qpid.Client.Failover">

-    <Messages>

-     <Message TypeName="AvoidNamespacesWithFewTypes" Category="Microsoft.Design" CheckId="CA1020" Created="2006-12-04 13:11:47Z">

-      <Issue>

-       <Item>Qpid.Client.Failover</Item>

-      </Issue>

-     </Message>

-     <Message Id="Qpid" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-      <Issue Name="Namespace">

-       <Item>Qpid</Item>

-       <Item>Qpid.Client.Failover</Item>

-      </Issue>

-     </Message>

-    </Messages>

-   </Namespace>

-   <Namespace Name="Qpid.Client.Handler">

-    <Messages>

-     <Message Id="Qpid" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-      <Issue Name="Namespace">

-       <Item>Qpid</Item>

-       <Item>Qpid.Client.Handler</Item>

-      </Issue>

-     </Message>

-    </Messages>

-   </Namespace>

-   <Namespace Name="Qpid.Client.Message">

-    <Messages>

-     <Message Id="Qpid" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-      <Issue Name="Namespace">

-       <Item>Qpid</Item>

-       <Item>Qpid.Client.Message</Item>

-      </Issue>

-     </Message>

-    </Messages>

-   </Namespace>

-   <Namespace Name="Qpid.Client.Protocol">

-    <Messages>

-     <Message Id="Qpid" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-      <Issue Name="Namespace">

-       <Item>Qpid</Item>

-       <Item>Qpid.Client.Protocol</Item>

-      </Issue>

-     </Message>

-    </Messages>

-   </Namespace>

-   <Namespace Name="Qpid.Client.Protocol.Listener">

-    <Messages>

-     <Message TypeName="AvoidNamespacesWithFewTypes" Category="Microsoft.Design" CheckId="CA1020" Created="2006-12-04 13:11:47Z">

-      <Issue>

-       <Item>Qpid.Client.Protocol.Listener</Item>

-      </Issue>

-     </Message>

-     <Message Id="Qpid" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-      <Issue Name="Namespace">

-       <Item>Qpid</Item>

-       <Item>Qpid.Client.Protocol.Listener</Item>

-      </Issue>

-     </Message>

-    </Messages>

-   </Namespace>

-   <Namespace Name="Qpid.Client.qms">

-    <Messages>

-     <Message TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-      <Issue Name="Namespace">

-       <Item>Qpid.Client.qms</Item>

-      </Issue>

-     </Message>

-     <Message Id="Qpid" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-      <Issue Name="Namespace">

-       <Item>Qpid</Item>

-       <Item>Qpid.Client.qms</Item>

-      </Issue>

-     </Message>

-     <Message Id="qms" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-      <Issue Name="Namespace">

-       <Item>qms</Item>

-       <Item>Qpid.Client.qms</Item>

-      </Issue>

-     </Message>

-    </Messages>

-   </Namespace>

-   <Namespace Name="Qpid.Client.qms.failover">

-    <Messages>

-     <Message TypeName="AvoidNamespacesWithFewTypes" Category="Microsoft.Design" CheckId="CA1020" Created="2006-12-04 13:11:47Z">

-      <Issue>

-       <Item>Qpid.Client.qms.failover</Item>

-      </Issue>

-     </Message>

-     <Message TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-      <Issue Name="Namespace">

-       <Item>Qpid.Client.qms.failover</Item>

-      </Issue>

-      <Issue Name="Namespace">

-       <Item>Qpid.Client.qms.failover</Item>

-      </Issue>

-     </Message>

-     <Message Id="Qpid" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-      <Issue Name="Namespace">

-       <Item>Qpid</Item>

-       <Item>Qpid.Client.qms.failover</Item>

-      </Issue>

-     </Message>

-     <Message Id="qms" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-      <Issue Name="Namespace">

-       <Item>qms</Item>

-       <Item>Qpid.Client.qms.failover</Item>

-      </Issue>

-     </Message>

-    </Messages>

-   </Namespace>

-   <Namespace Name="Qpid.Client.State">

-    <Messages>

-     <Message Id="Qpid" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-      <Issue Name="Namespace">

-       <Item>Qpid</Item>

-       <Item>Qpid.Client.State</Item>

-      </Issue>

-     </Message>

-    </Messages>

-   </Namespace>

-   <Namespace Name="Qpid.Client.Tests">

-    <Messages>

-     <Message Id="Qpid" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-      <Issue Name="Namespace">

-       <Item>Qpid</Item>

-       <Item>Qpid.Client.Tests</Item>

-      </Issue>

-     </Message>

-    </Messages>

-   </Namespace>

-   <Namespace Name="Qpid.Client.Tests.connection">

-    <Messages>

-     <Message TypeName="AvoidNamespacesWithFewTypes" Category="Microsoft.Design" CheckId="CA1020" Created="2006-12-04 13:11:47Z">

-      <Issue>

-       <Item>Qpid.Client.Tests.connection</Item>

-      </Issue>

-     </Message>

-     <Message TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-      <Issue Name="Namespace">

-       <Item>Qpid.Client.Tests.connection</Item>

-      </Issue>

-     </Message>

-     <Message Id="Qpid" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-      <Issue Name="Namespace">

-       <Item>Qpid</Item>

-       <Item>Qpid.Client.Tests.connection</Item>

-      </Issue>

-     </Message>

-    </Messages>

-   </Namespace>

-   <Namespace Name="Qpid.Client.Tests.failover">

-    <Messages>

-     <Message TypeName="AvoidNamespacesWithFewTypes" Category="Microsoft.Design" CheckId="CA1020" Created="2006-12-04 13:11:47Z">

-      <Issue>

-       <Item>Qpid.Client.Tests.failover</Item>

-      </Issue>

-     </Message>

-     <Message TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-      <Issue Name="Namespace">

-       <Item>Qpid.Client.Tests.failover</Item>

-      </Issue>

-     </Message>

-     <Message Id="Qpid" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-      <Issue Name="Namespace">

-       <Item>Qpid</Item>

-       <Item>Qpid.Client.Tests.failover</Item>

-      </Issue>

-     </Message>

-    </Messages>

-   </Namespace>

-   <Namespace Name="Qpid.Client.Tests.url">

-    <Messages>

-     <Message TypeName="AvoidNamespacesWithFewTypes" Category="Microsoft.Design" CheckId="CA1020" Created="2006-12-04 13:11:47Z">

-      <Issue>

-       <Item>Qpid.Client.Tests.url</Item>

-      </Issue>

-     </Message>

-     <Message TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-      <Issue Name="Namespace">

-       <Item>Qpid.Client.Tests.url</Item>

-      </Issue>

-     </Message>

-     <Message Id="Qpid" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-      <Issue Name="Namespace">

-       <Item>Qpid</Item>

-       <Item>Qpid.Client.Tests.url</Item>

-      </Issue>

-     </Message>

-    </Messages>

-   </Namespace>

-   <Namespace Name="Qpid.Client.Transport">

-    <Messages>

-     <Message Id="Qpid" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-      <Issue Name="Namespace">

-       <Item>Qpid</Item>

-       <Item>Qpid.Client.Transport</Item>

-      </Issue>

-     </Message>

-    </Messages>

-   </Namespace>

-   <Namespace Name="Qpid.Client.Transport.Socket.Blocking">

-    <Messages>

-     <Message Id="Qpid" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-      <Issue Name="Namespace">

-       <Item>Qpid</Item>

-       <Item>Qpid.Client.Transport.Socket.Blocking</Item>

-      </Issue>

-     </Message>

-    </Messages>

-   </Namespace>

-   <Namespace Name="Qpid.Codec">

-    <Messages>

-     <Message Id="Qpid" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-      <Issue Name="Namespace">

-       <Item>Qpid</Item>

-       <Item>Qpid.Codec</Item>

-      </Issue>

-     </Message>

-    </Messages>

-   </Namespace>

-   <Namespace Name="Qpid.Codec.Demux">

-    <Messages>

-     <Message Id="Demux" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-      <Issue Name="Namespace">

-       <Item>Demux</Item>

-       <Item>Qpid.Codec.Demux</Item>

-      </Issue>

-     </Message>

-     <Message Id="Qpid" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-      <Issue Name="Namespace">

-       <Item>Qpid</Item>

-       <Item>Qpid.Codec.Demux</Item>

-      </Issue>

-     </Message>

-    </Messages>

-   </Namespace>

-   <Namespace Name="Qpid.Codec.Support">

-    <Messages>

-     <Message TypeName="AvoidNamespacesWithFewTypes" Category="Microsoft.Design" CheckId="CA1020" Created="2006-12-04 13:11:47Z">

-      <Issue>

-       <Item>Qpid.Codec.Support</Item>

-      </Issue>

-     </Message>

-     <Message Id="Qpid" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-      <Issue Name="Namespace">

-       <Item>Qpid</Item>

-       <Item>Qpid.Codec.Support</Item>

-      </Issue>

-     </Message>

-    </Messages>

-   </Namespace>

-   <Namespace Name="Qpid.Collections">

-    <Messages>

-     <Message TypeName="AvoidNamespacesWithFewTypes" Category="Microsoft.Design" CheckId="CA1020" Created="2006-12-04 13:11:47Z">

-      <Issue>

-       <Item>Qpid.Collections</Item>

-      </Issue>

-     </Message>

-     <Message Id="Qpid" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-      <Issue Name="Namespace">

-       <Item>Qpid</Item>

-       <Item>Qpid.Collections</Item>

-      </Issue>

-     </Message>

-    </Messages>

-   </Namespace>

-   <Namespace Name="Qpid.Common">

-    <Messages>

-     <Message TypeName="AvoidNamespacesWithFewTypes" Category="Microsoft.Design" CheckId="CA1020" Created="2006-12-04 13:11:47Z">

-      <Issue>

-       <Item>Qpid.Common</Item>

-      </Issue>

-     </Message>

-     <Message Id="Qpid" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-      <Issue Name="Namespace">

-       <Item>Qpid</Item>

-       <Item>Qpid.Common</Item>

-      </Issue>

-     </Message>

-    </Messages>

-   </Namespace>

-   <Namespace Name="Qpid.Framing">

-    <Messages>

-     <Message Id="Qpid" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-      <Issue Name="Namespace">

-       <Item>Qpid</Item>

-       <Item>Qpid.Framing</Item>

-      </Issue>

-     </Message>

-    </Messages>

-   </Namespace>

-   <Namespace Name="Qpid.Messaging">

-    <Messages>

-     <Message Id="Qpid" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-      <Issue Name="Namespace">

-       <Item>Qpid</Item>

-       <Item>Qpid.Messaging</Item>

-      </Issue>

-     </Message>

-    </Messages>

-   </Namespace>

-  </Namespaces>

-  <Targets>

-   <Target Name="$(ProjectDir)/Qpid.Client.Tests/bin/Debug/Qpid.Buffer.dll">

-    <Modules>

-     <Module Name="qpid.buffer.dll">

-      <Messages>

-       <Message TypeName="AssembliesShouldDeclareMinimumSecurity" Category="Microsoft.Usage" CheckId="CA2209" Created="2006-12-04 13:11:47Z">

-        <Issue>

-         <Item>Qpid.Buffer</Item>

-        </Issue>

-       </Message>

-       <Message TypeName="AssembliesShouldHaveValidStrongNames" Category="Microsoft.Design" CheckId="CA2210" Created="2006-12-04 13:11:47Z">

-        <Issue Name="NoStrongName">

-         <Item>Qpid.Buffer</Item>

-        </Issue>

-       </Message>

-       <Message TypeName="MarkAssembliesWithClsCompliant" Category="Microsoft.Design" CheckId="CA1014" Created="2006-12-04 13:11:47Z">

-        <Issue Name="NoAttr">

-         <Item>Qpid.Buffer</Item>

-        </Issue>

-       </Message>

-      </Messages>

-      <Namespaces>

-       <Namespace Name="Qpid.Buffer">

-        <Types>

-         <Type Name="BufferOverflowException">

-          <Messages>

-           <Message TypeName="ImplementStandardExceptionConstructors" Category="Microsoft.Design" CheckId="CA1032" Created="2006-12-04 13:11:47Z">

-            <Issue>

-             <Item>Qpid.Buffer.BufferOverflowException</Item>

-             <Item>protected BufferOverflowException(SerializationInfo, StreamingContext)</Item>

-            </Issue>

-            <Issue>

-             <Item>Qpid.Buffer.BufferOverflowException</Item>

-             <Item>public BufferOverflowException()</Item>

-            </Issue>

-            <Issue>

-             <Item>Qpid.Buffer.BufferOverflowException</Item>

-             <Item>public BufferOverflowException(String, Exception)</Item>

-            </Issue>

-           </Message>

-           <Message TypeName="MarkISerializableTypesWithSerializable" Category="Microsoft.Usage" CheckId="CA2237" Created="2006-12-04 13:11:47Z">

-            <Issue Level="Error">

-             <Item>BufferOverflowException</Item>

-            </Issue>

-           </Message>

-          </Messages>

-         </Type>

-         <Type Name="BufferUnderflowException">

-          <Messages>

-           <Message TypeName="ImplementStandardExceptionConstructors" Category="Microsoft.Design" CheckId="CA1032" Created="2006-12-04 13:11:47Z">

-            <Issue>

-             <Item>Qpid.Buffer.BufferUnderflowException</Item>

-             <Item>protected BufferUnderflowException(SerializationInfo, StreamingContext)</Item>

-            </Issue>

-            <Issue>

-             <Item>Qpid.Buffer.BufferUnderflowException</Item>

-             <Item>public BufferUnderflowException()</Item>

-            </Issue>

-            <Issue>

-             <Item>Qpid.Buffer.BufferUnderflowException</Item>

-             <Item>public BufferUnderflowException(String, Exception)</Item>

-            </Issue>

-           </Message>

-           <Message TypeName="MarkISerializableTypesWithSerializable" Category="Microsoft.Usage" CheckId="CA2237" Created="2006-12-04 13:11:47Z">

-            <Issue Level="Error">

-             <Item>BufferUnderflowException</Item>

-            </Issue>

-           </Message>

-          </Messages>

-         </Type>

-         <Type Name="ByteBuffer">

-          <Members>

-           <Member Name="_containerStack">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>_containerStack</Item>

-              </Issue>

-             </Message>

-             <Message TypeName="NonConstantFieldsShouldNotBeVisible" Category="Microsoft.Usage" CheckId="CA2211" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>_containerStack</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="_heapBufferStacks">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>_heapBufferStacks</Item>

-              </Issue>

-             </Message>

-             <Message TypeName="NonConstantFieldsShouldNotBeVisible" Category="Microsoft.Usage" CheckId="CA2211" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>_heapBufferStacks</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Allocate0(System.Int32,System.Boolean):Qpid.Buffer.ByteBuffer">

-            <Messages>

-             <Message Id="System.NotSupportedException.#ctor(System.String)" TypeName="DoNotPassLiteralsAsLocalizedParameters" Category="Microsoft.Globalization" CheckId="CA1303" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>ByteBuffer.Allocate0(Int32, Boolean):ByteBuffer</Item>

-               <Item>1</Item>

-               <Item>NotSupportedException.NotSupportedException(String)</Item>

-               <Item>Direct buffers not currently implemented</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Equals(System.Object):System.Boolean">

-            <Messages>

-             <Message TypeName="DoNotCastUnnecessarily" Category="Microsoft.Performance" CheckId="CA1800" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>obj</Item>

-               <Item>Qpid.Buffer.ByteBuffer</Item>

-               <Item>ByteBuffer.Equals(Object):Boolean</Item>

-               <Item>castclass</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="GetBufferStackIndex(System.Collections.Stack[],System.Int32):System.Int32">

-            <Messages>

-             <Message Id="System.ArgumentOutOfRangeException.#ctor(System.String,System.String)" TypeName="DoNotPassLiteralsAsLocalizedParameters" Category="Microsoft.Globalization" CheckId="CA1303" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>ByteBuffer.GetBufferStackIndex(Stack[], Int32):Int32</Item>

-               <Item>2</Item>

-               <Item>ArgumentOutOfRangeException.ArgumentOutOfRangeException(String, String)</Item>

-               <Item>Buffer size is too big: __</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="GetUnsignedInt():System.UInt32">

-            <Messages>

-             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2006-12-04 13:11:47Z">

-              <Issue Certainty="50">

-               <Item>GetUnsignedInt</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="GetUnsignedLong():System.UInt64">

-            <Messages>

-             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2006-12-04 13:11:47Z">

-              <Issue Certainty="50">

-               <Item>GetUnsignedLong</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="GetUnsignedShort():System.UInt16">

-            <Messages>

-             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2006-12-04 13:11:47Z">

-              <Issue Certainty="50">

-               <Item>GetUnsignedShort</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="MINIMUM_CAPACITY">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>MINIMUM_CAPACITY</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>ByteBuffer.MINIMUM_CAPACITY</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Put(Qpid.Buffer.ByteBuffer):System.Void">

-            <Messages>

-             <Message Id="0#buf" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>ByteBuffer.Put(ByteBuffer):Void</Item>

-               <Item>buf</Item>

-               <Item>buf</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Release0(Qpid.Buffer.ByteBuffer):System.Void">

-            <Messages>

-             <Message Id="0#buf" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>ByteBuffer.Release0(ByteBuffer):Void</Item>

-               <Item>buf</Item>

-               <Item>buf</Item>

-              </Issue>

-             </Message>

-             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>'buf'</Item>

-               <Item>ByteBuffer.Release0(ByteBuffer):Void</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="ByteBufferHexDumper">

-          <Messages>

-           <Message TypeName="StaticHolderTypesShouldNotHaveConstructors" Category="Microsoft.Design" CheckId="CA1053" Created="2006-12-04 13:11:47Z">

-            <Issue>

-             <Item>ByteBufferHexDumper</Item>

-            </Issue>

-           </Message>

-          </Messages>

-          <Members>

-           <Member Name=".cctor()">

-            <Messages>

-             <Message TypeName="InitializeReferenceTypeStaticFieldsInline" Category="Microsoft.Performance" CheckId="CA1810" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Qpid.Buffer.ByteBufferHexDumper</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="GetHexDump(Qpid.Buffer.ByteBuffer):System.String">

-            <Messages>

-             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>'input'</Item>

-               <Item>ByteBufferHexDumper.GetHexDump(ByteBuffer):String</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="ByteBufferProxy">

-          <Members>

-           <Member Name=".ctor(Qpid.Buffer.ByteBuffer)">

-            <Messages>

-             <Message Id="0#buf" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>ByteBufferProxy.ByteBufferProxy(ByteBuffer)</Item>

-               <Item>buf</Item>

-               <Item>buf</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="_buf">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>_buf</Item>

-              </Issue>

-             </Message>

-             <Message Id="_buf" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>_buf</Item>

-               <Item>ByteBufferProxy._buf</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>_buf</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="HeapByteBuffer">

-          <Members>

-           <Member Name="CheckSpace(System.Int32):System.Void">

-            <Messages>

-             <Message Id="Qpid.Buffer.BufferOverflowException.#ctor(System.String)" TypeName="DoNotPassLiteralsAsLocalizedParameters" Category="Microsoft.Globalization" CheckId="CA1303" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>HeapByteBuffer.CheckSpace(Int32):Void</Item>

-               <Item>1</Item>

-               <Item>BufferOverflowException.BufferOverflowException(String)</Item>

-               <Item>Attempt to write ____ byte(s) to buffer where position is ____ and limit is __</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CheckSpaceForReading(System.Int32):System.Void">

-            <Messages>

-             <Message Id="Qpid.Buffer.BufferUnderflowException.#ctor(System.String)" TypeName="DoNotPassLiteralsAsLocalizedParameters" Category="Microsoft.Globalization" CheckId="CA1303" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>HeapByteBuffer.CheckSpaceForReading(Int32):Void</Item>

-               <Item>1</Item>

-               <Item>BufferUnderflowException.BufferUnderflowException(String)</Item>

-               <Item>Attempt to read ____ byte(s) to buffer where position is ____ and limit is __</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="GetString(System.UInt32,System.Text.Encoding):System.String">

-            <Messages>

-             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>'encoder'</Item>

-               <Item>HeapByteBuffer.GetString(UInt32, Encoding):String</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Limit">

-            <Accessors>

-             <Accessor Name="set_Limit(System.Int32):System.Void">

-              <Messages>

-               <Message Id="System.ArgumentException.#ctor(System.String)" TypeName="DoNotPassLiteralsAsLocalizedParameters" Category="Microsoft.Globalization" CheckId="CA1303" Created="2006-12-04 13:11:47Z">

-                <Issue>

-                 <Item>HeapByteBuffer.set_Limit(Int32):Void</Item>

-                 <Item>1</Item>

-                 <Item>ArgumentException.ArgumentException(String)</Item>

-                 <Item>Limit must not be greater than Capacity</Item>

-                </Issue>

-                <Issue>

-                 <Item>HeapByteBuffer.set_Limit(Int32):Void</Item>

-                 <Item>1</Item>

-                 <Item>ArgumentException.ArgumentException(String)</Item>

-                 <Item>Limit must not be negative</Item>

-                </Issue>

-               </Message>

-              </Messages>

-             </Accessor>

-            </Accessors>

-           </Member>

-           <Member Name="Mark():System.Void">

-            <Messages>

-             <Message TypeName="MarkMembersAsStatic" Category="Microsoft.Performance" CheckId="CA1822" Created="2006-12-04 13:11:47Z" FixCategory="Breaking">

-              <Issue>

-               <Item>HeapByteBuffer.Mark():Void</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Put(Qpid.Buffer.ByteBuffer):System.Void">

-            <Messages>

-             <Message TypeName="DoNotCastUnnecessarily" Category="Microsoft.Performance" CheckId="CA1800" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>src</Item>

-               <Item>Qpid.Buffer.HeapByteBuffer</Item>

-               <Item>HeapByteBuffer.Put(ByteBuffer):Void</Item>

-               <Item>castclass</Item>

-              </Issue>

-             </Message>

-             <Message Id="Qpid.Buffer.BufferOverflowException.#ctor(System.String)" TypeName="DoNotPassLiteralsAsLocalizedParameters" Category="Microsoft.Globalization" CheckId="CA1303" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>HeapByteBuffer.Put(ByteBuffer):Void</Item>

-               <Item>1</Item>

-               <Item>BufferOverflowException.BufferOverflowException(String)</Item>

-               <Item>Not enought capacity in this buffer for ____ elements - only ____ remaining</Item>

-              </Issue>

-             </Message>

-             <Message Id="System.ArgumentException.#ctor(System.String)" TypeName="DoNotPassLiteralsAsLocalizedParameters" Category="Microsoft.Globalization" CheckId="CA1303" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>HeapByteBuffer.Put(ByteBuffer):Void</Item>

-               <Item>1</Item>

-               <Item>ArgumentException.ArgumentException(String)</Item>

-               <Item>Cannot copy self into self!</Item>

-              </Issue>

-             </Message>

-             <Message Id="enought" TypeName="LiteralsShouldBeSpelledCorrectly" Category="Microsoft.Usage" CheckId="CA2204" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>enought</Item>

-               <Item>Not enought capacity in this buffer for ____ elements - only ____ remaining</Item>

-              </Issue>

-             </Message>

-             <Message Id="0#" TypeName="ParameterNamesShouldMatchBaseDeclaration" Category="Microsoft.Naming" CheckId="CA1725" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>src</Item>

-               <Item>HeapByteBuffer.Put(ByteBuffer):Void</Item>

-               <Item>buf</Item>

-               <Item>ByteBuffer.Put(ByteBuffer):Void</Item>

-              </Issue>

-             </Message>

-             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>'src'</Item>

-               <Item>HeapByteBuffer.Put(ByteBuffer):Void</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Put(System.Byte[]):System.Void">

-            <Messages>

-             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>'data'</Item>

-               <Item>HeapByteBuffer.Put(Byte[]):Void</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Reset():System.Void">

-            <Messages>

-             <Message TypeName="MarkMembersAsStatic" Category="Microsoft.Performance" CheckId="CA1822" Created="2006-12-04 13:11:47Z" FixCategory="Breaking">

-              <Issue>

-               <Item>HeapByteBuffer.Reset():Void</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="wrap(System.Byte[]):Qpid.Buffer.HeapByteBuffer">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>wrap</Item>

-              </Issue>

-             </Message>

-             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>'bytes'</Item>

-               <Item>HeapByteBuffer.wrap(Byte[]):HeapByteBuffer</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="wrap(System.Byte[],System.Int32):Qpid.Buffer.HeapByteBuffer">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>wrap</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="RefCountingByteBuffer">

-          <Members>

-           <Member Name="Acquire():System.Void">

-            <Messages>

-             <Message Id="System.Exception.#ctor(System.String)" TypeName="DoNotPassLiteralsAsLocalizedParameters" Category="Microsoft.Globalization" CheckId="CA1303" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>RefCountingByteBuffer.Acquire():Void</Item>

-               <Item>1</Item>

-               <Item>Exception.Exception(String)</Item>

-               <Item>Already released buffer</Item>

-              </Issue>

-             </Message>

-             <Message TypeName="DoNotRaiseReservedExceptionTypes" Category="Microsoft.Usage" CheckId="CA2201" Created="2006-12-04 13:11:47Z">

-              <Issue Name="TooGeneric">

-               <Item>RefCountingByteBuffer.Acquire():Void</Item>

-               <Item>System.Exception</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Buf">

-            <Messages>

-             <Message Id="Buf" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>Buf</Item>

-               <Item>RefCountingByteBuffer.Buf:ByteBuffer</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Init(Qpid.Buffer.ByteBuffer):System.Void">

-            <Messages>

-             <Message Id="0#buf" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>RefCountingByteBuffer.Init(ByteBuffer):Void</Item>

-               <Item>buf</Item>

-               <Item>buf</Item>

-              </Issue>

-             </Message>

-             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>'buf'</Item>

-               <Item>RefCountingByteBuffer.Init(ByteBuffer):Void</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Put(Qpid.Buffer.ByteBuffer):System.Void">

-            <Messages>

-             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>'buf'</Item>

-               <Item>RefCountingByteBuffer.Put(ByteBuffer):Void</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Put(System.Byte[]):System.Void">

-            <Messages>

-             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>'data'</Item>

-               <Item>RefCountingByteBuffer.Put(Byte[]):Void</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Release():System.Void">

-            <Messages>

-             <Message Id="System.Exception.#ctor(System.String)" TypeName="DoNotPassLiteralsAsLocalizedParameters" Category="Microsoft.Globalization" CheckId="CA1303" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>RefCountingByteBuffer.Release():Void</Item>

-               <Item>1</Item>

-               <Item>Exception.Exception(String)</Item>

-               <Item>Already released buffer. Release called too many times</Item>

-              </Issue>

-             </Message>

-             <Message TypeName="DoNotRaiseReservedExceptionTypes" Category="Microsoft.Usage" CheckId="CA2201" Created="2006-12-04 13:11:47Z">

-              <Issue Name="TooGeneric">

-               <Item>RefCountingByteBuffer.Release():Void</Item>

-               <Item>System.Exception</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-        </Types>

-       </Namespace>

-      </Namespaces>

-     </Module>

-    </Modules>

-   </Target>

-   <Target Name="$(ProjectDir)/Qpid.Client.Tests/bin/Debug/Qpid.Client.dll">

-    <Modules>

-     <Module Name="qpid.client.dll">

-      <Messages>

-       <Message TypeName="AssembliesShouldDeclareMinimumSecurity" Category="Microsoft.Usage" CheckId="CA2209" Created="2006-12-04 13:11:47Z">

-        <Issue>

-         <Item>Qpid.Client</Item>

-        </Issue>

-       </Message>

-       <Message TypeName="AssembliesShouldHaveValidStrongNames" Category="Microsoft.Design" CheckId="CA2210" Created="2006-12-04 13:11:47Z">

-        <Issue Name="NoStrongName">

-         <Item>Qpid.Client</Item>

-        </Issue>

-       </Message>

-       <Message TypeName="MarkAssembliesWithClsCompliant" Category="Microsoft.Design" CheckId="CA1014" Created="2006-12-04 13:11:47Z">

-        <Issue Name="NoAttr">

-         <Item>Qpid.Client</Item>

-        </Issue>

-       </Message>

-      </Messages>

-      <Namespaces>

-       <Namespace Name="Qpid.Client">

-        <Types>

-         <Type Name="AmqBrokerInfo">

-          <Messages>

-           <Message Id="Amq" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-            <Issue Name="Type">

-             <Item>Amq</Item>

-             <Item>Qpid.Client.AmqBrokerInfo</Item>

-            </Issue>

-           </Message>

-          </Messages>

-          <Members>

-           <Member Name=".ctor(System.String)">

-            <Messages>

-             <Message Id="url" TypeName="ReviewUnusedParameters" Category="Microsoft.Usage" CheckId="CA1801" Created="2006-12-04 13:11:47Z" FixCategory="Breaking">

-              <Issue>

-               <Item>url</Item>

-               <Item>AmqBrokerInfo.AmqBrokerInfo(String)</Item>

-              </Issue>

-             </Message>

-             <Message Id="0#" TypeName="UriParametersShouldNotBeStrings" Category="Microsoft.Design" CheckId="CA1054" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>url</Item>

-               <Item>AmqBrokerInfo.AmqBrokerInfo(String)</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="DEFAULT_CONNECT_TIMEOUT">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>DEFAULT_CONNECT_TIMEOUT</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>AmqBrokerInfo.DEFAULT_CONNECT_TIMEOUT</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Equals(System.Object):System.Boolean">

-            <Messages>

-             <Message TypeName="DoNotCastUnnecessarily" Category="Microsoft.Performance" CheckId="CA1800" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>obj</Item>

-               <Item>Qpid.Client.qms.BrokerInfo</Item>

-               <Item>AmqBrokerInfo.Equals(Object):Boolean</Item>

-               <Item>castclass</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="GetHashCode():System.Int32">

-            <Messages>

-             <Message Id="System.String.ToLower" TypeName="SpecifyCultureInfo" Category="Microsoft.Globalization" CheckId="CA1304" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>AmqBrokerInfo.GetHashCode():Int32</Item>

-               <Item>System.String.ToLower</Item>

-               <Item>System.String.ToLower(System.Globalization.CultureInfo)</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="getTimeout():System.Int64">

-            <Messages>

-             <Message Id="System.Int64.Parse(System.String)" TypeName="SpecifyIFormatProvider" Category="Microsoft.Globalization" CheckId="CA1305" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>AmqBrokerInfo.getTimeout():Int64</Item>

-               <Item>System.Int64.Parse(System.String)</Item>

-               <Item>System.Int64.Parse(System.String,System.IFormatProvider)</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="setHost(System.String):System.Void">

-            <Messages>

-             <Message Id="0#" TypeName="ParameterNamesShouldMatchBaseDeclaration" Category="Microsoft.Naming" CheckId="CA1725" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>_host</Item>

-               <Item>AmqBrokerInfo.setHost(String):Void</Item>

-               <Item>host</Item>

-               <Item>BrokerInfo.setHost(String):Void</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="setPort(System.Int32):System.Void">

-            <Messages>

-             <Message Id="0#" TypeName="ParameterNamesShouldMatchBaseDeclaration" Category="Microsoft.Naming" CheckId="CA1725" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>_port</Item>

-               <Item>AmqBrokerInfo.setPort(Int32):Void</Item>

-               <Item>port</Item>

-               <Item>BrokerInfo.setPort(Int32):Void</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="setTimeout(System.Int64):System.Void">

-            <Messages>

-             <Message Id="System.Int64.ToString" TypeName="SpecifyIFormatProvider" Category="Microsoft.Globalization" CheckId="CA1305" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>AmqBrokerInfo.setTimeout(Int64):Void</Item>

-               <Item>System.Int64.ToString</Item>

-               <Item>System.Int64.ToString(System.IFormatProvider)</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="setTransport(System.String):System.Void">

-            <Messages>

-             <Message Id="0#" TypeName="ParameterNamesShouldMatchBaseDeclaration" Category="Microsoft.Naming" CheckId="CA1725" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>_transport</Item>

-               <Item>AmqBrokerInfo.setTransport(String):Void</Item>

-               <Item>transport</Item>

-               <Item>BrokerInfo.setTransport(String):Void</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="StringEqualsIgnoreCase(System.String,System.String):System.Boolean">

-            <Messages>

-             <Message Id="one" TypeName="AvoidUnnecessaryStringCreation" Category="Microsoft.Performance" CheckId="CA1807" Created="2006-12-04 13:11:47Z">

-              <Issue Name="UseStringCompareParameter">

-               <Item>AmqBrokerInfo.StringEqualsIgnoreCase(String, String):Boolean</Item>

-               <Item>String.Equals(String):Boolean</Item>

-               <Item>one</Item>

-              </Issue>

-             </Message>

-             <Message Id="two" TypeName="AvoidUnnecessaryStringCreation" Category="Microsoft.Performance" CheckId="CA1807" Created="2006-12-04 13:11:47Z">

-              <Issue Name="UseStringCompareParameter">

-               <Item>AmqBrokerInfo.StringEqualsIgnoreCase(String, String):Boolean</Item>

-               <Item>String.Equals(String):Boolean</Item>

-               <Item>two</Item>

-              </Issue>

-             </Message>

-             <Message TypeName="MarkMembersAsStatic" Category="Microsoft.Performance" CheckId="CA1822" Created="2006-12-04 13:11:47Z" FixCategory="NonBreaking">

-              <Issue>

-               <Item>AmqBrokerInfo.StringEqualsIgnoreCase(String, String):Boolean</Item>

-              </Issue>

-             </Message>

-             <Message Id="System.String.ToLower" TypeName="SpecifyCultureInfo" Category="Microsoft.Globalization" CheckId="CA1304" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>AmqBrokerInfo.StringEqualsIgnoreCase(String, String):Boolean</Item>

-               <Item>System.String.ToLower</Item>

-               <Item>System.String.ToLower(System.Globalization.CultureInfo)</Item>

-              </Issue>

-              <Issue>

-               <Item>AmqBrokerInfo.StringEqualsIgnoreCase(String, String):Boolean</Item>

-               <Item>System.String.ToLower</Item>

-               <Item>System.String.ToLower(System.Globalization.CultureInfo)</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="ToString():System.String">

-            <Messages>

-             <Message Id="this._transport" TypeName="AvoidUnnecessaryStringCreation" Category="Microsoft.Performance" CheckId="CA1807" Created="2006-12-04 13:11:47Z">

-              <Issue Name="UseStringCompareLocal">

-               <Item>AmqBrokerInfo.ToString():String</Item>

-               <Item>String.Equals(String):Boolean</Item>

-               <Item>this._transport</Item>

-              </Issue>

-             </Message>

-             <Message Id="System.String.ToLower" TypeName="SpecifyCultureInfo" Category="Microsoft.Globalization" CheckId="CA1304" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>AmqBrokerInfo.ToString():String</Item>

-               <Item>System.String.ToLower</Item>

-               <Item>System.String.ToLower(System.Globalization.CultureInfo)</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="URL_FORMAT_EXAMPLE">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>URL_FORMAT_EXAMPLE</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>URL_FORMAT_EXAMPLE</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="AmqChannel">

-          <Messages>

-           <Message Id="Amq" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-            <Issue Name="Type">

-             <Item>Amq</Item>

-             <Item>Qpid.Client.AmqChannel</Item>

-            </Issue>

-           </Message>

-           <Message TypeName="ImplementIDisposableCorrectly" Category="Microsoft.Design" CheckId="CA1063" Created="2006-12-04 13:11:47Z">

-            <Issue Name="ProvideDisposeBool">

-             <Item>Qpid.Client.AmqChannel</Item>

-            </Issue>

-           </Message>

-          </Messages>

-          <Members>

-           <Member Name=".cctor()">

-            <Messages>

-             <Message TypeName="DoNotInitializeUnnecessarily" Category="Microsoft.Performance" CheckId="CA1805" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>AmqChannel.AmqChannel()</Item>

-               <Item>_nextSessionNumber</Item>

-               <Item>System.Int32</Item>

-               <Item>0</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name=".ctor(Qpid.Client.AMQConnection,System.UInt16,System.Boolean,Qpid.Messaging.AcknowledgeMode,Qpid.Client.Message.MessageFactoryRegistry,System.Int32)">

-            <Messages>

-             <Message Id="defaultPrefetch" TypeName="ReviewUnusedParameters" Category="Microsoft.Usage" CheckId="CA1801" Created="2006-12-04 13:11:47Z" FixCategory="NonBreaking">

-              <Issue>

-               <Item>defaultPrefetch</Item>

-               <Item>AmqChannel.AmqChannel(AMQConnection, UInt16, Boolean, AcknowledgeMode, MessageFactoryRegistry, Int32)</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CheckNotTransacted():System.Void">

-            <Messages>

-             <Message Id="System.InvalidOperationException.#ctor(System.String)" TypeName="DoNotPassLiteralsAsLocalizedParameters" Category="Microsoft.Globalization" CheckId="CA1303" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>AmqChannel.CheckNotTransacted():Void</Item>

-               <Item>1</Item>

-               <Item>InvalidOperationException.InvalidOperationException(String)</Item>

-               <Item>Channel is transacted</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CheckTransacted():System.Void">

-            <Messages>

-             <Message Id="System.InvalidOperationException.#ctor(System.String)" TypeName="DoNotPassLiteralsAsLocalizedParameters" Category="Microsoft.Globalization" CheckId="CA1303" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>AmqChannel.CheckTransacted():Void</Item>

-               <Item>1</Item>

-               <Item>InvalidOperationException.InvalidOperationException(String)</Item>

-               <Item>Channel is not transacted</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="ClosedWithException(System.Exception):System.Void">

-            <Messages>

-             <Message TypeName="DoNotCastUnnecessarily" Category="Microsoft.Performance" CheckId="CA1800" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>e</Item>

-               <Item>Qpid.AMQException</Item>

-               <Item>AmqChannel.ClosedWithException(Exception):Void</Item>

-               <Item>castclass</Item>

-              </Issue>

-             </Message>

-             <Message Id="Qpid.AMQException.#ctor(System.String,System.Exception)" TypeName="DoNotPassLiteralsAsLocalizedParameters" Category="Microsoft.Globalization" CheckId="CA1303" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>AmqChannel.ClosedWithException(Exception):Void</Item>

-               <Item>1</Item>

-               <Item>AMQException.AMQException(String, Exception)</Item>

-               <Item>Closing session forcibly</Item>

-              </Issue>

-             </Message>

-             <Message Id="0#e" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="ParameterOneLetter">

-               <Item>AmqChannel.ClosedWithException(Exception):Void</Item>

-               <Item>e</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="ConsumeFromQueue(System.String,System.Boolean,System.Boolean,Qpid.Messaging.AcknowledgeMode):System.String">

-            <Messages>

-             <Message Id="System.String.Format(System.String,System.Object,System.Object)" TypeName="SpecifyIFormatProvider" Category="Microsoft.Globalization" CheckId="CA1305" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>AmqChannel.ConsumeFromQueue(String, Boolean, Boolean, AcknowledgeMode):String</Item>

-               <Item>System.String.Format(System.String,System.Object,System.Object)</Item>

-               <Item>System.String.Format(System.IFormatProvider,System.String,System.Object[])</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CreateConsumer(System.String,System.Int32,System.Int32,System.Boolean,System.Boolean,System.Boolean,System.String):Qpid.Messaging.IMessageConsumer">

-            <Messages>

-             <Message Id="System.String.Format(System.String,System.Object[])" TypeName="SpecifyIFormatProvider" Category="Microsoft.Globalization" CheckId="CA1305" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>AmqChannel.CreateConsumer(String, Int32, Int32, Boolean, Boolean, Boolean, String):IMessageConsumer</Item>

-               <Item>System.String.Format(System.String,System.Object[])</Item>

-               <Item>System.String.Format(System.IFormatProvider,System.String,System.Object[])</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CreatePublisher(System.String,System.String,Qpid.Messaging.DeliveryMode,System.Int64,System.Boolean,System.Boolean,System.Int32):Qpid.Messaging.IMessagePublisher">

-            <Messages>

-             <Message Id="System.String.Format(System.String,System.Object,System.Object,System.Object)" TypeName="SpecifyIFormatProvider" Category="Microsoft.Globalization" CheckId="CA1305" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>AmqChannel.CreatePublisher(String, String, DeliveryMode, Int64, Boolean, Boolean, Int32):IMessagePublisher</Item>

-               <Item>System.String.Format(System.String,System.Object,System.Object,System.Object)</Item>

-               <Item>System.String.Format(System.IFormatProvider,System.String,System.Object[])</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CreateTextMessage(System.String):Qpid.Messaging.ITextMessage">

-            <Messages>

-             <Message Id="0#" TypeName="ParameterNamesShouldMatchBaseDeclaration" Category="Microsoft.Naming" CheckId="CA1725" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>text</Item>

-               <Item>AmqChannel.CreateTextMessage(String):ITextMessage</Item>

-               <Item>initialValue</Item>

-               <Item>IChannel.CreateTextMessage(String):ITextMessage</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="DeclareExchange(System.String,System.String):System.Void">

-            <Messages>

-             <Message Id="System.String.Format(System.String,System.Object,System.Object)" TypeName="SpecifyIFormatProvider" Category="Microsoft.Globalization" CheckId="CA1305" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>AmqChannel.DeclareExchange(String, String):Void</Item>

-               <Item>System.String.Format(System.String,System.Object,System.Object)</Item>

-               <Item>System.String.Format(System.IFormatProvider,System.String,System.Object[])</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="DeclareExchange(System.UInt16,System.UInt16,System.String,System.String,System.Boolean,System.Boolean,System.Boolean,System.Boolean,System.Boolean,Qpid.Framing.FieldTable):System.Void">

-            <Messages>

-             <Message Id="System.NotImplementedException.#ctor(System.String)" TypeName="DoNotPassLiteralsAsLocalizedParameters" Category="Microsoft.Globalization" CheckId="CA1303" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>AmqChannel.DeclareExchange(UInt16, UInt16, String, String, Boolean, Boolean, Boolean, Boolean, Boolean, FieldTable):Void</Item>

-               <Item>1</Item>

-               <Item>NotImplementedException.NotImplementedException(String)</Item>

-               <Item>Don't use nowait=false with DeclareExchange</Item>

-              </Issue>

-             </Message>

-             <Message Id="nowait" TypeName="LiteralsShouldBeSpelledCorrectly" Category="Microsoft.Usage" CheckId="CA2204" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>nowait</Item>

-               <Item>Don't use nowait=false with DeclareExchange</Item>

-              </Issue>

-             </Message>

-             <Message Id="System.String.Format(System.String,System.Object,System.Object,System.Object)" TypeName="SpecifyIFormatProvider" Category="Microsoft.Globalization" CheckId="CA1305" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>AmqChannel.DeclareExchange(UInt16, UInt16, String, String, Boolean, Boolean, Boolean, Boolean, Boolean, FieldTable):Void</Item>

-               <Item>System.String.Format(System.String,System.Object,System.Object,System.Object)</Item>

-               <Item>System.String.Format(System.IFormatProvider,System.String,System.Object[])</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Dispose():System.Void">

-            <Messages>

-             <Message TypeName="ImplementIDisposableCorrectly" Category="Microsoft.Design" CheckId="CA1063" Created="2006-12-04 13:11:47Z">

-              <Issue Name="DisposeImplementation">

-               <Item>AmqChannel.Dispose():Void</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="DoBasicPublish(System.String,System.String,System.Boolean,System.Boolean,Qpid.Client.Message.AbstractQmsMessage,Qpid.Messaging.DeliveryMode,System.UInt32,System.Int32,System.Boolean):System.Void">

-            <Messages>

-             <Message Id="System.String.Format(System.String,System.Object,System.Object)" TypeName="SpecifyIFormatProvider" Category="Microsoft.Globalization" CheckId="CA1305" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>AmqChannel.DoBasicPublish(String, String, Boolean, Boolean, AbstractQmsMessage, DeliveryMode, UInt32, Int32, Boolean):Void</Item>

-               <Item>System.String.Format(System.String,System.Object,System.Object)</Item>

-               <Item>System.String.Format(System.IFormatProvider,System.String,System.Object[])</Item>

-              </Issue>

-              <Issue>

-               <Item>AmqChannel.DoBasicPublish(String, String, Boolean, Boolean, AbstractQmsMessage, DeliveryMode, UInt32, Int32, Boolean):Void</Item>

-               <Item>System.String.Format(System.String,System.Object,System.Object)</Item>

-               <Item>System.String.Format(System.IFormatProvider,System.String,System.Object[])</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="DoBind(System.String,System.String,System.String,Qpid.Framing.FieldTable):System.Void">

-            <Messages>

-             <Message Id="System.String.Format(System.String,System.Object[])" TypeName="SpecifyIFormatProvider" Category="Microsoft.Globalization" CheckId="CA1305" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>AmqChannel.DoBind(String, String, String, FieldTable):Void</Item>

-               <Item>System.String.Format(System.String,System.Object[])</Item>

-               <Item>System.String.Format(System.IFormatProvider,System.String,System.Object[])</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="DoQueueDeclare(System.String,System.Boolean,System.Boolean,System.Boolean):System.Void">

-            <Messages>

-             <Message Id="System.String.Format(System.String,System.Object[])" TypeName="SpecifyIFormatProvider" Category="Microsoft.Globalization" CheckId="CA1305" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>AmqChannel.DoQueueDeclare(String, Boolean, Boolean, Boolean):Void</Item>

-               <Item>System.String.Format(System.String,System.Object[])</Item>

-               <Item>System.String.Format(System.IFormatProvider,System.String,System.Object[])</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="ReplayOnFailOver():System.Void">

-            <Messages>

-             <Message Id="System.String.Format(System.String,System.Object)" TypeName="SpecifyIFormatProvider" Category="Microsoft.Globalization" CheckId="CA1305" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>AmqChannel.ReplayOnFailOver():Void</Item>

-               <Item>System.String.Format(System.String,System.Object)</Item>

-               <Item>System.String.Format(System.IFormatProvider,System.String,System.Object[])</Item>

-              </Issue>

-              <Issue>

-               <Item>AmqChannel.ReplayOnFailOver():Void</Item>

-               <Item>System.String.Format(System.String,System.Object)</Item>

-               <Item>System.String.Format(System.IFormatProvider,System.String,System.Object[])</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Run():System.Void">

-            <Messages>

-             <Message TypeName="MarkMembersAsStatic" Category="Microsoft.Performance" CheckId="CA1822" Created="2006-12-04 13:11:47Z" FixCategory="Breaking">

-              <Issue>

-               <Item>AmqChannel.Run():Void</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Unsubscribe(System.String):System.Void">

-            <Messages>

-             <Message Id="0#" TypeName="ParameterNamesShouldMatchBaseDeclaration" Category="Microsoft.Naming" CheckId="CA1725" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>name</Item>

-               <Item>AmqChannel.Unsubscribe(String):Void</Item>

-               <Item>subscriptionName</Item>

-               <Item>IChannel.Unsubscribe(String):Void</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="AmqChannel+Dispatcher">

-          <Members>

-           <Member Name=".ctor(Qpid.Client.AmqChannel)">

-            <Messages>

-             <Message TypeName="DoNotInitializeUnnecessarily" Category="Microsoft.Performance" CheckId="CA1805" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Dispatcher.Dispatcher(AmqChannel)</Item>

-               <Item>_stopped</Item>

-               <Item>System.Int32</Item>

-               <Item>0</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="DispatchMessage(Qpid.Client.Message.UnprocessedMessage):System.Void">

-            <Messages>

-             <Message TypeName="DoNotCatchGeneralExceptionTypes" Category="Microsoft.Design" CheckId="CA1031" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Dispatcher.DispatchMessage(UnprocessedMessage):Void</Item>

-               <Item>System.Exception</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="AMQConnection">

-          <Messages>

-           <Message TypeName="ImplementIDisposableCorrectly" Category="Microsoft.Design" CheckId="CA1063" Created="2006-12-04 13:11:47Z">

-            <Issue Name="ProvideDisposeBool">

-             <Item>Qpid.Client.AMQConnection</Item>

-            </Issue>

-           </Message>

-           <Message TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-            <Issue Name="Type">

-             <Item>AMQConnection</Item>

-            </Issue>

-           </Message>

-          </Messages>

-          <Members>

-           <Member Name=".ctor(Qpid.Client.qms.ConnectionInfo)">

-            <Messages>

-             <Message TypeName="DoNotCatchGeneralExceptionTypes" Category="Microsoft.Design" CheckId="CA1031" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>AMQConnection.AMQConnection(ConnectionInfo)</Item>

-               <Item>System.Exception</Item>

-              </Issue>

-             </Message>

-             <Message TypeName="DoNotInitializeUnnecessarily" Category="Microsoft.Performance" CheckId="CA1805" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>AMQConnection.AMQConnection(ConnectionInfo)</Item>

-               <Item>_connected</Item>

-               <Item>System.Boolean</Item>

-               <Item>false</Item>

-              </Issue>

-              <Issue>

-               <Item>AMQConnection.AMQConnection(ConnectionInfo)</Item>

-               <Item>_lastAMQException</Item>

-               <Item>Qpid.AMQException</Item>

-               <Item>null</Item>

-              </Issue>

-              <Issue>

-               <Item>AMQConnection.AMQConnection(ConnectionInfo)</Item>

-               <Item>_nextChannelId</Item>

-               <Item>System.Int32</Item>

-               <Item>0</Item>

-              </Issue>

-             </Message>

-             <Message Id="Qpid.Client.AMQConnectionException.#ctor(System.String,System.Exception)" TypeName="DoNotPassLiteralsAsLocalizedParameters" Category="Microsoft.Globalization" CheckId="CA1303" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>AMQConnection.AMQConnection(ConnectionInfo)</Item>

-               <Item>1</Item>

-               <Item>AMQConnectionException.AMQConnectionException(String, Exception)</Item>

-               <Item>Unable to connect</Item>

-              </Issue>

-             </Message>

-             <Message Id="System.ArgumentException.#ctor(System.String)" TypeName="DoNotPassLiteralsAsLocalizedParameters" Category="Microsoft.Globalization" CheckId="CA1303" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>AMQConnection.AMQConnection(ConnectionInfo)</Item>

-               <Item>1</Item>

-               <Item>ArgumentException.ArgumentException(String)</Item>

-               <Item>ConnectionInfo must be specified</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="AttemptReconnection():System.Boolean">

-            <Messages>

-             <Message TypeName="DoNotCatchGeneralExceptionTypes" Category="Microsoft.Design" CheckId="CA1031" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>AMQConnection.AttemptReconnection():Boolean</Item>

-               <Item>System.Exception</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="AttemptReconnection(System.String,System.Int32,System.Boolean):System.Boolean">

-            <Messages>

-             <Message TypeName="DoNotCatchGeneralExceptionTypes" Category="Microsoft.Design" CheckId="CA1031" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>AMQConnection.AttemptReconnection(String, Int32, Boolean):Boolean</Item>

-               <Item>System.Exception</Item>

-              </Issue>

-             </Message>

-             <Message Id="2#" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>useSSL</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CloseSession(Qpid.Client.AmqChannel):System.Void">

-            <Messages>

-             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>'channel'</Item>

-               <Item>AMQConnection.CloseSession(AmqChannel):Void</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Dispose():System.Void">

-            <Messages>

-             <Message TypeName="ImplementIDisposableCorrectly" Category="Microsoft.Design" CheckId="CA1063" Created="2006-12-04 13:11:47Z">

-              <Issue Name="DisposeImplementation">

-               <Item>AMQConnection.Dispose():Void</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="ExceptionReceived(System.Exception):System.Void">

-            <Messages>

-             <Message TypeName="DoNotCastUnnecessarily" Category="Microsoft.Performance" CheckId="CA1800" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>cause</Item>

-               <Item>Qpid.Messaging.QpidException</Item>

-               <Item>AMQConnection.ExceptionReceived(Exception):Void</Item>

-               <Item>castclass</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="FireFailoverComplete():System.Void">

-            <Messages>

-             <Message TypeName="UseEventsWhereAppropriate" Category="Microsoft.Design" CheckId="CA1030" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>FireFailoverComplete</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="FirePreFailover(System.Boolean):System.Boolean">

-            <Messages>

-             <Message TypeName="UseEventsWhereAppropriate" Category="Microsoft.Design" CheckId="CA1030" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>FirePreFailover</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="FirePreResubscribe():System.Boolean">

-            <Messages>

-             <Message Id="Resubscribe" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>Resubscribe</Item>

-               <Item>AMQConnection.FirePreResubscribe():Boolean</Item>

-              </Issue>

-             </Message>

-             <Message TypeName="UseEventsWhereAppropriate" Category="Microsoft.Design" CheckId="CA1030" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>FirePreResubscribe</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="LoadTransportFromAssembly(System.String,System.Int32,System.String,System.String):Qpid.Client.Transport.ITransport">

-            <Messages>

-             <Message Id="System.String.Format(System.String,System.Object)" TypeName="SpecifyIFormatProvider" Category="Microsoft.Globalization" CheckId="CA1305" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>AMQConnection.LoadTransportFromAssembly(String, Int32, String, String):ITransport</Item>

-               <Item>System.String.Format(System.String,System.Object)</Item>

-               <Item>System.String.Format(System.IFormatProvider,System.String,System.Object[])</Item>

-              </Issue>

-             </Message>

-             <Message Id="System.String.Format(System.String,System.Object,System.Object)" TypeName="SpecifyIFormatProvider" Category="Microsoft.Globalization" CheckId="CA1305" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>AMQConnection.LoadTransportFromAssembly(String, Int32, String, String):ITransport</Item>

-               <Item>System.String.Format(System.String,System.Object,System.Object)</Item>

-               <Item>System.String.Format(System.IFormatProvider,System.String,System.Object[])</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="MakeBrokerConnection(Qpid.Client.qms.BrokerInfo):System.Void">

-            <Messages>

-             <Message TypeName="RethrowToPreserveStackDetails" Category="Microsoft.Usage" CheckId="CA2200" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>AMQConnection.MakeBrokerConnection(BrokerInfo):Void</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="ReopenChannel(System.UInt16,System.UInt16,System.Boolean):System.Void">

-            <Messages>

-             <Message Id="Qpid.AMQException.#ctor(System.String)" TypeName="DoNotPassLiteralsAsLocalizedParameters" Category="Microsoft.Globalization" CheckId="CA1303" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>AMQConnection.ReopenChannel(UInt16, UInt16, Boolean):Void</Item>

-               <Item>1</Item>

-               <Item>AMQException.AMQException(String)</Item>

-               <Item>Error reopening channel ____ after failover: __</Item>

-              </Issue>

-             </Message>

-             <Message Id="System.String.Format(System.String,System.Object,System.Object,System.Object)" TypeName="SpecifyIFormatProvider" Category="Microsoft.Globalization" CheckId="CA1305" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>AMQConnection.ReopenChannel(UInt16, UInt16, Boolean):Void</Item>

-               <Item>System.String.Format(System.String,System.Object,System.Object,System.Object)</Item>

-               <Item>System.String.Format(System.IFormatProvider,System.String,System.Object[])</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="ResubscribeChannels():System.Void">

-            <Messages>

-             <Message Id="Resubscribe" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>Resubscribe</Item>

-               <Item>AMQConnection.ResubscribeChannels():Void</Item>

-              </Issue>

-             </Message>

-             <Message Id="System.String.Format(System.String,System.Object,System.Object)" TypeName="SpecifyIFormatProvider" Category="Microsoft.Globalization" CheckId="CA1305" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>AMQConnection.ResubscribeChannels():Void</Item>

-               <Item>System.String.Format(System.String,System.Object,System.Object)</Item>

-               <Item>System.String.Format(System.IFormatProvider,System.String,System.Object[])</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="StartHeartBeatThread(System.Int32):System.Void">

-            <Messages>

-             <Message Id="HeartBeat" TypeName="CompoundWordsShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1702" Created="2006-12-04 13:11:47Z">

-              <Issue Name="ShouldBeDiscreteTerm">

-               <Item>HeartBeat</Item>

-               <Item>method</Item>

-               <Item>StartHeartBeatThread</Item>

-               <Item>Heartbeat</Item>

-              </Issue>

-             </Message>

-             <Message Id="heartbeatSeconds*1000" TypeName="OperationsShouldNotOverflow" Category="Microsoft.Usage" CheckId="CA2233" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>heartbeatSeconds*1000</Item>

-               <Item>AMQConnection.StartHeartBeatThread(Int32):Void</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="StopHeartBeatThread():System.Void">

-            <Messages>

-             <Message Id="HeartBeat" TypeName="CompoundWordsShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1702" Created="2006-12-04 13:11:47Z">

-              <Issue Name="ShouldBeDiscreteTerm">

-               <Item>HeartBeat</Item>

-               <Item>method</Item>

-               <Item>StopHeartBeatThread</Item>

-               <Item>Heartbeat</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="toURL():System.String">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>toURL</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>AMQConnection.toURL():String</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Username">

-            <Messages>

-             <Message Id="Username" TypeName="CompoundWordsShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1702" Created="2006-12-04 13:11:47Z">

-              <Issue Name="ShouldBeCompoundWord">

-               <Item>Username</Item>

-               <Item>property</Item>

-               <Item>Username</Item>

-               <Item>UserName</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="AMQConnectionException">

-          <Messages>

-           <Message TypeName="ImplementStandardExceptionConstructors" Category="Microsoft.Design" CheckId="CA1032" Created="2006-12-04 13:11:47Z">

-            <Issue>

-             <Item>Qpid.Client.AMQConnectionException</Item>

-             <Item>protected AMQConnectionException(SerializationInfo, StreamingContext)</Item>

-            </Issue>

-            <Issue>

-             <Item>Qpid.Client.AMQConnectionException</Item>

-             <Item>public AMQConnectionException()</Item>

-            </Issue>

-            <Issue>

-             <Item>Qpid.Client.AMQConnectionException</Item>

-             <Item>public AMQConnectionException(String)</Item>

-            </Issue>

-           </Message>

-           <Message TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-            <Issue Name="Type">

-             <Item>AMQConnectionException</Item>

-            </Issue>

-           </Message>

-          </Messages>

-          <Members>

-           <Member Name=".ctor(System.String,System.Exception)">

-            <Messages>

-             <Message Id="1#e" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="ParameterOneLetter">

-               <Item>AMQConnectionException.AMQConnectionException(String, Exception)</Item>

-               <Item>e</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="AMQDestination">

-          <Messages>

-           <Message TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-            <Issue Name="Type">

-             <Item>AMQDestination</Item>

-            </Issue>

-           </Message>

-          </Messages>

-          <Members>

-           <Member Name="_destinationName">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>_destinationName</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>_destinationName</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="_exchangeClass">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>_exchangeClass</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>_exchangeClass</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="_exchangeName">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>_exchangeName</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>_exchangeName</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="_isAutoDelete">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>_isAutoDelete</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>_isAutoDelete</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="_isDurable">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>_isDurable</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>_isDurable</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="_isExclusive">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>_isExclusive</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>_isExclusive</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="_queueName">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>_queueName</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>_queueName</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Equals(System.Object):System.Boolean">

-            <Messages>

-             <Message Id="0#" TypeName="ParameterNamesShouldMatchBaseDeclaration" Category="Microsoft.Naming" CheckId="CA1725" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>o</Item>

-               <Item>AMQDestination.Equals(Object):Boolean</Item>

-               <Item>obj</Item>

-               <Item>Object.Equals(Object):Boolean</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="StringsNotEqualNullSafe(System.String,System.String):System.Boolean">

-            <Messages>

-             <Message TypeName="MarkMembersAsStatic" Category="Microsoft.Performance" CheckId="CA1822" Created="2006-12-04 13:11:47Z" FixCategory="NonBreaking">

-              <Issue>

-               <Item>AMQDestination.StringsNotEqualNullSafe(String, String):Boolean</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="BasicMessageConsumer">

-          <Messages>

-           <Message TypeName="ImplementIDisposableCorrectly" Category="Microsoft.Design" CheckId="CA1063" Created="2006-12-04 13:11:47Z">

-            <Issue Name="ProvideDisposeBool">

-             <Item>Qpid.Client.BasicMessageConsumer</Item>

-            </Issue>

-           </Message>

-          </Messages>

-          <Members>

-           <Member Name="Dispose():System.Void">

-            <Messages>

-             <Message TypeName="ImplementIDisposableCorrectly" Category="Microsoft.Design" CheckId="CA1063" Created="2006-12-04 13:11:47Z">

-              <Issue Name="DisposeImplementation">

-               <Item>BasicMessageConsumer.Dispose():Void</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="NotifyMessage(Qpid.Client.Message.UnprocessedMessage,System.Int32):System.Void">

-            <Messages>

-             <Message TypeName="DoNotCatchGeneralExceptionTypes" Category="Microsoft.Design" CheckId="CA1031" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>BasicMessageConsumer.NotifyMessage(UnprocessedMessage, Int32):Void</Item>

-               <Item>System.Exception</Item>

-              </Issue>

-             </Message>

-             <Message Id="channelId" TypeName="ReviewUnusedParameters" Category="Microsoft.Usage" CheckId="CA1801" Created="2006-12-04 13:11:47Z" FixCategory="NonBreaking">

-              <Issue>

-               <Item>channelId</Item>

-               <Item>BasicMessageConsumer.NotifyMessage(UnprocessedMessage, Int32):Void</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="OnMessage">

-            <Accessors>

-             <Accessor Name="set_OnMessage(Qpid.Messaging.MessageReceivedDelegate):System.Void">

-              <Messages>

-               <Message Id="System.InvalidOperationException.#ctor(System.String)" TypeName="DoNotPassLiteralsAsLocalizedParameters" Category="Microsoft.Globalization" CheckId="CA1303" Created="2006-12-04 13:11:47Z">

-                <Issue>

-                 <Item>BasicMessageConsumer.set_OnMessage(MessageReceivedDelegate):Void</Item>

-                 <Item>1</Item>

-                 <Item>InvalidOperationException.InvalidOperationException(String)</Item>

-                 <Item>Another thread is already receiving...</Item>

-                </Issue>

-               </Message>

-              </Messages>

-             </Accessor>

-            </Accessors>

-           </Member>

-           <Member Name="Receive(System.Int64):Qpid.Messaging.IMessage">

-            <Messages>

-             <Message Id="System.InvalidOperationException.#ctor(System.String)" TypeName="DoNotPassLiteralsAsLocalizedParameters" Category="Microsoft.Globalization" CheckId="CA1303" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>BasicMessageConsumer.Receive(Int64):IMessage</Item>

-               <Item>1</Item>

-               <Item>InvalidOperationException.InvalidOperationException(String)</Item>

-               <Item>Another thread is already receiving (possibly asynchronously)...</Item>

-              </Issue>

-             </Message>

-             <Message Id="System.NotImplementedException.#ctor(System.String)" TypeName="DoNotPassLiteralsAsLocalizedParameters" Category="Microsoft.Globalization" CheckId="CA1303" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>BasicMessageConsumer.Receive(Int64):IMessage</Item>

-               <Item>1</Item>

-               <Item>NotImplementedException.NotImplementedException(String)</Item>

-               <Item>Need to implement synchronousQueue.Poll(timeout</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="ReceiveNoWait():Qpid.Messaging.IMessage">

-            <Messages>

-             <Message Id="System.InvalidOperationException.#ctor(System.String)" TypeName="DoNotPassLiteralsAsLocalizedParameters" Category="Microsoft.Globalization" CheckId="CA1303" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>BasicMessageConsumer.ReceiveNoWait():IMessage</Item>

-               <Item>1</Item>

-               <Item>InvalidOperationException.InvalidOperationException(String)</Item>

-               <Item>Another thread is already receiving (possibly asynchronously)...</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="ReturnMessageOrThrow(System.Object):Qpid.Messaging.IMessage">

-            <Messages>

-             <Message TypeName="DoNotCastUnnecessarily" Category="Microsoft.Performance" CheckId="CA1800" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>o</Item>

-               <Item>System.Exception</Item>

-               <Item>BasicMessageConsumer.ReturnMessageOrThrow(Object):IMessage</Item>

-               <Item>castclass</Item>

-              </Issue>

-             </Message>

-             <Message TypeName="MarkMembersAsStatic" Category="Microsoft.Performance" CheckId="CA1822" Created="2006-12-04 13:11:47Z" FixCategory="NonBreaking">

-              <Issue>

-               <Item>BasicMessageConsumer.ReturnMessageOrThrow(Object):IMessage</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="BasicMessageProducer">

-          <Messages>

-           <Message TypeName="ImplementIDisposableCorrectly" Category="Microsoft.Design" CheckId="CA1063" Created="2006-12-04 13:11:47Z">

-            <Issue Name="ProvideDisposeBool">

-             <Item>Qpid.Client.BasicMessageProducer</Item>

-            </Issue>

-           </Message>

-          </Messages>

-          <Members>

-           <Member Name=".ctor(System.String,System.String,System.Boolean,System.UInt16,Qpid.Client.AmqChannel,System.Int64,Qpid.Messaging.DeliveryMode,System.Int64,System.Boolean,System.Boolean,System.Int32)">

-            <Messages>

-             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>'channel'</Item>

-               <Item>BasicMessageProducer.BasicMessageProducer(String, String, Boolean, UInt16, AmqChannel, Int64, DeliveryMode, Int64, Boolean, Boolean, Int32)</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="_channelId">

-            <Messages>

-             <Message TypeName="AvoidUnusedPrivateFields" Category="Microsoft.Performance" CheckId="CA1823" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>BasicMessageProducer._channelId</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="_encoding">

-            <Messages>

-             <Message TypeName="AvoidUnusedPrivateFields" Category="Microsoft.Performance" CheckId="CA1823" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>BasicMessageProducer._encoding</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="_immediate">

-            <Messages>

-             <Message TypeName="AvoidUnusedPrivateFields" Category="Microsoft.Performance" CheckId="CA1823" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>BasicMessageProducer._immediate</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="_logger">

-            <Messages>

-             <Message TypeName="DoNotDeclareReadOnlyMutableReferenceTypes" Category="Microsoft.Security" CheckId="CA2104" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>BasicMessageProducer._logger</Item>

-               <Item>log4net.ILog</Item>

-              </Issue>

-             </Message>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>_logger</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>_logger</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="_mandatory">

-            <Messages>

-             <Message TypeName="AvoidUnusedPrivateFields" Category="Microsoft.Performance" CheckId="CA1823" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>BasicMessageProducer._mandatory</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="_mimeType">

-            <Messages>

-             <Message TypeName="AvoidUnusedPrivateFields" Category="Microsoft.Performance" CheckId="CA1823" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>BasicMessageProducer._mimeType</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="_transacted">

-            <Messages>

-             <Message TypeName="AvoidUnusedPrivateFields" Category="Microsoft.Performance" CheckId="CA1823" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>BasicMessageProducer._transacted</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="DEFAULT_IMMEDIATE">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>DEFAULT_IMMEDIATE</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>BasicMessageProducer.DEFAULT_IMMEDIATE</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="DEFAULT_MANDATORY">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>DEFAULT_MANDATORY</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>BasicMessageProducer.DEFAULT_MANDATORY</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="DisableMessageID">

-            <Accessors>

-             <Accessor Name="get_DisableMessageID():System.Boolean">

-              <Messages>

-               <Message Id="System.Exception.#ctor(System.String)" TypeName="DoNotPassLiteralsAsLocalizedParameters" Category="Microsoft.Globalization" CheckId="CA1303" Created="2006-12-04 13:11:47Z">

-                <Issue>

-                 <Item>BasicMessageProducer.get_DisableMessageID():Boolean</Item>

-                 <Item>1</Item>

-                 <Item>Exception.Exception(String)</Item>

-                 <Item>The method or operation is not implemented.</Item>

-                </Issue>

-               </Message>

-               <Message TypeName="DoNotRaiseReservedExceptionTypes" Category="Microsoft.Usage" CheckId="CA2201" Created="2006-12-04 13:11:47Z">

-                <Issue Name="TooGeneric">

-                 <Item>BasicMessageProducer.get_DisableMessageID():Boolean</Item>

-                 <Item>System.Exception</Item>

-                </Issue>

-               </Message>

-              </Messages>

-             </Accessor>

-             <Accessor Name="set_DisableMessageID(System.Boolean):System.Void">

-              <Messages>

-               <Message Id="System.Exception.#ctor(System.String)" TypeName="DoNotPassLiteralsAsLocalizedParameters" Category="Microsoft.Globalization" CheckId="CA1303" Created="2006-12-04 13:11:47Z">

-                <Issue>

-                 <Item>BasicMessageProducer.set_DisableMessageID(Boolean):Void</Item>

-                 <Item>1</Item>

-                 <Item>Exception.Exception(String)</Item>

-                 <Item>The method or operation is not implemented.</Item>

-                </Issue>

-               </Message>

-               <Message TypeName="DoNotRaiseReservedExceptionTypes" Category="Microsoft.Usage" CheckId="CA2201" Created="2006-12-04 13:11:47Z">

-                <Issue Name="TooGeneric">

-                 <Item>BasicMessageProducer.set_DisableMessageID(Boolean):Void</Item>

-                 <Item>System.Exception</Item>

-                </Issue>

-               </Message>

-              </Messages>

-             </Accessor>

-            </Accessors>

-           </Member>

-           <Member Name="Dispose():System.Void">

-            <Messages>

-             <Message TypeName="ImplementIDisposableCorrectly" Category="Microsoft.Design" CheckId="CA1063" Created="2006-12-04 13:11:47Z">

-              <Issue Name="DisposeImplementation">

-               <Item>BasicMessageProducer.Dispose():Void</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Encoding">

-            <Messages>

-             <Message TypeName="PropertiesShouldNotBeWriteOnly" Category="Microsoft.Design" CheckId="CA1044" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Encoding</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="MimeType">

-            <Messages>

-             <Message TypeName="PropertiesShouldNotBeWriteOnly" Category="Microsoft.Design" CheckId="CA1044" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>MimeType</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Priority">

-            <Accessors>

-             <Accessor Name="set_Priority(System.Int32):System.Void">

-              <Messages>

-               <Message TypeName="InstantiateArgumentExceptionsCorrectly" Category="Microsoft.Usage" CheckId="CA2208" Created="2006-12-04 13:11:47Z">

-                <Issue Name="OneArgumentShouldBeParameterName">

-                 <Item>System.ArgumentOutOfRangeException</Item>

-                 <Item>ArgumentOutOfRangeException.ArgumentOutOfRangeException(String)</Item>

-                 <Item>Priority of ____ is illegal. Value must be in range 0 to 9</Item>

-                </Issue>

-               </Message>

-              </Messages>

-             </Accessor>

-            </Accessors>

-           </Member>

-           <Member Name="TimeToLive">

-            <Accessors>

-             <Accessor Name="set_TimeToLive(System.Int64):System.Void">

-              <Messages>

-               <Message TypeName="InstantiateArgumentExceptionsCorrectly" Category="Microsoft.Usage" CheckId="CA2208" Created="2006-12-04 13:11:47Z">

-                <Issue Name="OneArgumentShouldBeParameterName">

-                 <Item>System.ArgumentOutOfRangeException</Item>

-                 <Item>ArgumentOutOfRangeException.ArgumentOutOfRangeException(String)</Item>

-                 <Item>Time to live must be non-negative - supplied value was __</Item>

-                </Issue>

-               </Message>

-              </Messages>

-             </Accessor>

-            </Accessors>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="Closeable">

-          <Messages>

-           <Message TypeName="IdentifiersShouldDifferByMoreThanCase" Category="Microsoft.Naming" CheckId="CA1708" Created="2006-12-04 13:11:47Z">

-            <Issue Name="Member">

-             <Item>'CLOSED'</Item>

-             <Item>Closed</Item>

-            </Issue>

-           </Message>

-          </Messages>

-          <Members>

-           <Member Name="_closed">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>_closed</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>_closed</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="_closingLock">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>_closingLock</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>_closingLock</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CheckNotClosed():System.Void">

-            <Messages>

-             <Message Id="System.InvalidOperationException.#ctor(System.String)" TypeName="DoNotPassLiteralsAsLocalizedParameters" Category="Microsoft.Globalization" CheckId="CA1303" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Closeable.CheckNotClosed():Void</Item>

-               <Item>1</Item>

-               <Item>InvalidOperationException.InvalidOperationException(String)</Item>

-               <Item>Object ____ has been closed</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CLOSED">

-            <Messages>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>Closeable.CLOSED</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="NOT_CLOSED">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>NOT_CLOSED</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>Closeable.NOT_CLOSED</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="ConnectionTuneParameters">

-          <Members>

-           <Member Name="TxnLimit">

-            <Messages>

-             <Message Id="Txn" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>Txn</Item>

-               <Item>ConnectionTuneParameters.TxnLimit:UInt32</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="QpidConnectionInfo">

-          <Messages>

-           <Message Id="Qpid" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-            <Issue Name="Type">

-             <Item>Qpid</Item>

-             <Item>Qpid.Client.QpidConnectionInfo</Item>

-            </Issue>

-           </Message>

-          </Messages>

-          <Members>

-           <Member Name=".ctor()">

-            <Messages>

-             <Message TypeName="DoNotInitializeUnnecessarily" Category="Microsoft.Performance" CheckId="CA1805" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>QpidConnectionInfo.QpidConnectionInfo()</Item>

-               <Item>_failoverMethod</Item>

-               <Item>System.String</Item>

-               <Item>null</Item>

-              </Issue>

-             </Message>

-             <Message Id="System.String.Format(System.String,System.Object,System.Object)" TypeName="SpecifyIFormatProvider" Category="Microsoft.Globalization" CheckId="CA1305" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>QpidConnectionInfo.QpidConnectionInfo()</Item>

-               <Item>System.String.Format(System.String,System.Object,System.Object)</Item>

-               <Item>System.String.Format(System.IFormatProvider,System.String,System.Object[])</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="_logger">

-            <Messages>

-             <Message TypeName="AvoidUnusedPrivateFields" Category="Microsoft.Performance" CheckId="CA1823" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>QpidConnectionInfo._logger</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="AddBrokerInfo(Qpid.Client.qms.BrokerInfo):System.Void">

-            <Messages>

-             <Message Id="0#" TypeName="ParameterNamesShouldMatchBaseDeclaration" Category="Microsoft.Naming" CheckId="CA1725" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>brokerInfo</Item>

-               <Item>QpidConnectionInfo.AddBrokerInfo(BrokerInfo):Void</Item>

-               <Item>broker</Item>

-               <Item>ConnectionInfo.AddBrokerInfo(BrokerInfo):Void</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="AsUrl():System.String">

-            <Messages>

-             <Message TypeName="DoNotConcatenateStringsInsideLoops" Category="Microsoft.Performance" CheckId="CA1818" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>QpidConnectionInfo.AsUrl():String</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="FromUrl(System.String):Qpid.Client.qms.ConnectionInfo">

-            <Messages>

-             <Message Id="0#" TypeName="UriParametersShouldNotBeStrings" Category="Microsoft.Design" CheckId="CA1054" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>url</Item>

-               <Item>QpidConnectionInfo.FromUrl(String):ConnectionInfo</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="QpidConnectionUrl">

-          <Messages>

-           <Message Id="Qpid" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-            <Issue Name="Type">

-             <Item>Qpid</Item>

-             <Item>Qpid.Client.QpidConnectionUrl</Item>

-            </Issue>

-           </Message>

-           <Message TypeName="StaticHolderTypesShouldNotHaveConstructors" Category="Microsoft.Design" CheckId="CA1053" Created="2006-12-04 13:11:47Z">

-            <Issue>

-             <Item>QpidConnectionUrl</Item>

-            </Issue>

-           </Message>

-          </Messages>

-          <Members>

-           <Member Name="FromUri(System.Uri):Qpid.Client.qms.ConnectionInfo">

-            <Messages>

-             <Message TypeName="AvoidUncalledPrivateCode" Category="Microsoft.Performance" CheckId="CA1811" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>QpidConnectionUrl.FromUri(Uri):ConnectionInfo</Item>

-              </Issue>

-             </Message>

-             <Message Id="uri" TypeName="ReviewUnusedParameters" Category="Microsoft.Usage" CheckId="CA1801" Created="2006-12-04 13:11:47Z" FixCategory="NonBreaking">

-              <Issue>

-               <Item>uri</Item>

-               <Item>QpidConnectionUrl.FromUri(Uri):ConnectionInfo</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="FromUrl(System.String):Qpid.Client.qms.ConnectionInfo">

-            <Messages>

-             <Message Id="url" TypeName="ReviewUnusedParameters" Category="Microsoft.Usage" CheckId="CA1801" Created="2006-12-04 13:11:47Z" FixCategory="NonBreaking">

-              <Issue>

-               <Item>url</Item>

-               <Item>QpidConnectionUrl.FromUrl(String):ConnectionInfo</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-        </Types>

-       </Namespace>

-       <Namespace Name="Qpid.Client.Failover">

-        <Types>

-         <Type Name="FailoverException">

-          <Messages>

-           <Message TypeName="ExceptionsShouldBePublic" Category="Microsoft.Design" CheckId="CA1064" Created="2006-12-04 13:11:47Z">

-            <Issue>

-             <Item>Qpid.Client.Failover.FailoverException</Item>

-            </Issue>

-           </Message>

-          </Messages>

-         </Type>

-         <Type Name="FailoverHandler">

-          <Messages>

-           <Message TypeName="TypesThatOwnDisposableFieldsShouldBeDisposable" Category="Microsoft.Design" CheckId="CA1001" Created="2006-12-04 13:11:47Z" FixCategory="Breaking">

-            <Issue>

-             <Item>Qpid.Client.Failover.FailoverHandler</Item>

-             <Item>System.Threading.ManualResetEvent</Item>

-            </Issue>

-           </Message>

-          </Messages>

-          <Members>

-           <Member Name="getHost():System.String">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>getHost</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="getPort():System.Int32">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>getPort</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Run():System.Void">

-            <Messages>

-             <Message TypeName="DoNotCatchGeneralExceptionTypes" Category="Microsoft.Design" CheckId="CA1031" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>FailoverHandler.Run():Void</Item>

-               <Item>System.Exception</Item>

-              </Issue>

-              <Issue>

-               <Item>FailoverHandler.Run():Void</Item>

-               <Item>System.Exception</Item>

-              </Issue>

-             </Message>

-             <Message Id="Qpid.AMQDisconnectedException.#ctor(System.String)" TypeName="DoNotPassLiteralsAsLocalizedParameters" Category="Microsoft.Globalization" CheckId="CA1303" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>FailoverHandler.Run():Void</Item>

-               <Item>1</Item>

-               <Item>AMQDisconnectedException.AMQDisconnectedException(String)</Item>

-               <Item>Redirect was vetoed by client</Item>

-              </Issue>

-              <Issue>

-               <Item>FailoverHandler.Run():Void</Item>

-               <Item>1</Item>

-               <Item>AMQDisconnectedException.AMQDisconnectedException(String)</Item>

-               <Item>Server closed connection and no failover was successful</Item>

-              </Issue>

-             </Message>

-             <Message Id="Qpid.Client.Failover.FailoverException.#ctor(System.String)" TypeName="DoNotPassLiteralsAsLocalizedParameters" Category="Microsoft.Globalization" CheckId="CA1303" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>FailoverHandler.Run():Void</Item>

-               <Item>1</Item>

-               <Item>FailoverException.FailoverException(String)</Item>

-               <Item>Failing over about to start</Item>

-              </Issue>

-             </Message>

-             <Message Id="System.InvalidOperationException.#ctor(System.String)" TypeName="DoNotPassLiteralsAsLocalizedParameters" Category="Microsoft.Globalization" CheckId="CA1303" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>FailoverHandler.Run():Void</Item>

-               <Item>1</Item>

-               <Item>InvalidOperationException.InvalidOperationException(String)</Item>

-               <Item>FailoverHandler must Run on a non-background thread.</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="setHost(System.String):System.Void">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>setHost</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="setPort(System.Int32):System.Void">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>setPort</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="FailoverSupport">

-          <Members>

-           <Member Name="execute(Qpid.Client.AMQConnection):System.Object">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>execute</Item>

-              </Issue>

-             </Message>

-             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>'con'</Item>

-               <Item>FailoverSupport.execute(AMQConnection):Object</Item>

-              </Issue>

-              <Issue>

-               <Item>'con'</Item>

-               <Item>FailoverSupport.execute(AMQConnection):Object</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="operation():System.Object">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>operation</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-        </Types>

-       </Namespace>

-       <Namespace Name="Qpid.Client.Handler">

-        <Types>

-         <Type Name="BasicDeliverMethodHandler">

-          <Members>

-           <Member Name="MethodReceived(Qpid.Client.State.AMQStateManager,Qpid.Client.Protocol.AMQMethodEvent):System.Void">

-            <Messages>

-             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>'evt'</Item>

-               <Item>BasicDeliverMethodHandler.MethodReceived(AMQStateManager, AMQMethodEvent):Void</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="BasicReturnMethodHandler">

-          <Members>

-           <Member Name="MethodReceived(Qpid.Client.State.AMQStateManager,Qpid.Client.Protocol.AMQMethodEvent):System.Void">

-            <Messages>

-             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>'evt'</Item>

-               <Item>BasicReturnMethodHandler.MethodReceived(AMQStateManager, AMQMethodEvent):Void</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="ChannelCloseMethodHandler">

-          <Members>

-           <Member Name="MethodReceived(Qpid.Client.State.AMQStateManager,Qpid.Client.Protocol.AMQMethodEvent):System.Void">

-            <Messages>

-             <Message Id="Qpid.AMQChannelClosedException.#ctor(System.Int32,System.String)" TypeName="DoNotPassLiteralsAsLocalizedParameters" Category="Microsoft.Globalization" CheckId="CA1303" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>ChannelCloseMethodHandler.MethodReceived(AMQStateManager, AMQMethodEvent):Void</Item>

-               <Item>2</Item>

-               <Item>AMQChannelClosedException.AMQChannelClosedException(Int32, String)</Item>

-               <Item>Error: __</Item>

-              </Issue>

-             </Message>

-             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>'evt'</Item>

-               <Item>ChannelCloseMethodHandler.MethodReceived(AMQStateManager, AMQMethodEvent):Void</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="ConnectionCloseMethodHandler">

-          <Members>

-           <Member Name="MethodReceived(Qpid.Client.State.AMQStateManager,Qpid.Client.Protocol.AMQMethodEvent):System.Void">

-            <Messages>

-             <Message Id="Qpid.AMQConnectionClosedException.#ctor(System.Int32,System.String)" TypeName="DoNotPassLiteralsAsLocalizedParameters" Category="Microsoft.Globalization" CheckId="CA1303" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>ConnectionCloseMethodHandler.MethodReceived(AMQStateManager, AMQMethodEvent):Void</Item>

-               <Item>2</Item>

-               <Item>AMQConnectionClosedException.AMQConnectionClosedException(Int32, String)</Item>

-               <Item>Error: __</Item>

-              </Issue>

-             </Message>

-             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>'evt'</Item>

-               <Item>ConnectionCloseMethodHandler.MethodReceived(AMQStateManager, AMQMethodEvent):Void</Item>

-              </Issue>

-              <Issue>

-               <Item>'stateManager'</Item>

-               <Item>ConnectionCloseMethodHandler.MethodReceived(AMQStateManager, AMQMethodEvent):Void</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="ConnectionCloseOkHandler">

-          <Members>

-           <Member Name="MethodReceived(Qpid.Client.State.AMQStateManager,Qpid.Client.Protocol.AMQMethodEvent):System.Void">

-            <Messages>

-             <Message Id="method" TypeName="RemoveUnusedLocals" Category="Microsoft.Performance" CheckId="CA1804" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>ConnectionCloseOkHandler.MethodReceived(AMQStateManager, AMQMethodEvent):Void</Item>

-               <Item>method</Item>

-               <Item>Qpid.Framing.ConnectionCloseOkBody</Item>

-              </Issue>

-             </Message>

-             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>'evt'</Item>

-               <Item>ConnectionCloseOkHandler.MethodReceived(AMQStateManager, AMQMethodEvent):Void</Item>

-              </Issue>

-              <Issue>

-               <Item>'stateManager'</Item>

-               <Item>ConnectionCloseOkHandler.MethodReceived(AMQStateManager, AMQMethodEvent):Void</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="ConnectionOpenOkMethodHandler">

-          <Members>

-           <Member Name="MethodReceived(Qpid.Client.State.AMQStateManager,Qpid.Client.Protocol.AMQMethodEvent):System.Void">

-            <Messages>

-             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>'stateManager'</Item>

-               <Item>ConnectionOpenOkMethodHandler.MethodReceived(AMQStateManager, AMQMethodEvent):Void</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="ConnectionRedirectMethodHandler">

-          <Members>

-           <Member Name="_logger">

-            <Messages>

-             <Message TypeName="AvoidUnusedPrivateFields" Category="Microsoft.Performance" CheckId="CA1823" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>ConnectionRedirectMethodHandler._logger</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="GetInstance():Qpid.Client.Handler.ConnectionRedirectMethodHandler">

-            <Messages>

-             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2006-12-04 13:11:47Z">

-              <Issue Certainty="50">

-               <Item>GetInstance</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="ConnectionSecureMethodHandler">

-          <Members>

-           <Member Name="MethodReceived(Qpid.Client.State.AMQStateManager,Qpid.Client.Protocol.AMQMethodEvent):System.Void">

-            <Messages>

-             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>'evt'</Item>

-               <Item>ConnectionSecureMethodHandler.MethodReceived(AMQStateManager, AMQMethodEvent):Void</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="ConnectionStartMethodHandler">

-          <Members>

-           <Member Name="GetFullSystemInfo():System.String">

-            <Messages>

-             <Message TypeName="MarkMembersAsStatic" Category="Microsoft.Performance" CheckId="CA1822" Created="2006-12-04 13:11:47Z" FixCategory="NonBreaking">

-              <Issue>

-               <Item>ConnectionStartMethodHandler.GetFullSystemInfo():String</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="MethodReceived(Qpid.Client.State.AMQStateManager,Qpid.Client.Protocol.AMQMethodEvent):System.Void">

-            <Messages>

-             <Message Id="Qpid.AMQException.#ctor(System.String)" TypeName="DoNotPassLiteralsAsLocalizedParameters" Category="Microsoft.Globalization" CheckId="CA1303" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>ConnectionStartMethodHandler.MethodReceived(AMQStateManager, AMQMethodEvent):Void</Item>

-               <Item>1</Item>

-               <Item>AMQException.AMQException(String)</Item>

-               <Item>No locales sent from server, passed: __</Item>

-              </Issue>

-              <Issue>

-               <Item>ConnectionStartMethodHandler.MethodReceived(AMQStateManager, AMQMethodEvent):Void</Item>

-               <Item>1</Item>

-               <Item>AMQException.AMQException(String)</Item>

-               <Item>No supported security mechanism found, passed: __</Item>

-              </Issue>

-             </Message>

-             <Message Id="Qpid.AMQException.#ctor(log4net.ILog,System.String,System.Exception)" TypeName="DoNotPassLiteralsAsLocalizedParameters" Category="Microsoft.Globalization" CheckId="CA1303" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>ConnectionStartMethodHandler.MethodReceived(AMQStateManager, AMQMethodEvent):Void</Item>

-               <Item>2</Item>

-               <Item>AMQException.AMQException(ILog, String, Exception)</Item>

-               <Item>Unable to decode data: __</Item>

-              </Issue>

-             </Message>

-             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>'evt'</Item>

-               <Item>ConnectionStartMethodHandler.MethodReceived(AMQStateManager, AMQMethodEvent):Void</Item>

-              </Issue>

-              <Issue>

-               <Item>'stateManager'</Item>

-               <Item>ConnectionStartMethodHandler.MethodReceived(AMQStateManager, AMQMethodEvent):Void</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="ConnectionTuneMethodHandler">

-          <Members>

-           <Member Name="MethodReceived(Qpid.Client.State.AMQStateManager,Qpid.Client.Protocol.AMQMethodEvent):System.Void">

-            <Messages>

-             <Message Id="System.String.Format(System.String,System.Object)" TypeName="SpecifyIFormatProvider" Category="Microsoft.Globalization" CheckId="CA1305" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>ConnectionTuneMethodHandler.MethodReceived(AMQStateManager, AMQMethodEvent):Void</Item>

-               <Item>System.String.Format(System.String,System.Object)</Item>

-               <Item>System.String.Format(System.IFormatProvider,System.String,System.Object[])</Item>

-              </Issue>

-             </Message>

-             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>'evt'</Item>

-               <Item>ConnectionTuneMethodHandler.MethodReceived(AMQStateManager, AMQMethodEvent):Void</Item>

-              </Issue>

-              <Issue>

-               <Item>'stateManager'</Item>

-               <Item>ConnectionTuneMethodHandler.MethodReceived(AMQStateManager, AMQMethodEvent):Void</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-        </Types>

-       </Namespace>

-       <Namespace Name="Qpid.Client.Message">

-        <Types>

-         <Type Name="AbstractQmsMessage">

-          <Messages>

-           <Message Id="Qms" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-            <Issue Name="Type">

-             <Item>Qms</Item>

-             <Item>Qpid.Client.Message.AbstractQmsMessage</Item>

-            </Issue>

-           </Message>

-          </Messages>

-          <Members>

-           <Member Name="_data">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>_data</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>_data</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="_redelivered">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>_redelivered</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>_redelivered</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="GetExchangeName(System.String,System.String&amp;):System.String">

-            <Messages>

-             <Message TypeName="ProvideCorrectArgumentsToFormattingMethods" Category="Microsoft.Usage" CheckId="CA2241" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MissingSpecifier">

-               <Item>String.Format(String, Object[]):String</Item>

-               <Item>AbstractQmsMessage.GetExchangeName(String, String&amp;):String</Item>

-               <Item>'stack2'</Item>

-               <Item>split = {0}</Item>

-              </Issue>

-             </Message>

-             <Message Id="System.String.Format(System.String,System.Object)" TypeName="SpecifyIFormatProvider" Category="Microsoft.Globalization" CheckId="CA1305" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>AbstractQmsMessage.GetExchangeName(String, String&amp;):String</Item>

-               <Item>System.String.Format(System.String,System.Object)</Item>

-               <Item>System.String.Format(System.IFormatProvider,System.String,System.Object[])</Item>

-              </Issue>

-              <Issue>

-               <Item>AbstractQmsMessage.GetExchangeName(String, String&amp;):String</Item>

-               <Item>System.String.Format(System.String,System.Object)</Item>

-               <Item>System.String.Format(System.IFormatProvider,System.String,System.Object[])</Item>

-              </Issue>

-              <Issue>

-               <Item>AbstractQmsMessage.GetExchangeName(String, String&amp;):String</Item>

-               <Item>System.String.Format(System.String,System.Object)</Item>

-               <Item>System.String.Format(System.IFormatProvider,System.String,System.Object[])</Item>

-              </Issue>

-             </Message>

-             <Message Id="System.String.Format(System.String,System.Object[])" TypeName="SpecifyIFormatProvider" Category="Microsoft.Globalization" CheckId="CA1305" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>AbstractQmsMessage.GetExchangeName(String, String&amp;):String</Item>

-               <Item>System.String.Format(System.String,System.Object[])</Item>

-               <Item>System.String.Format(System.IFormatProvider,System.String,System.Object[])</Item>

-              </Issue>

-              <Issue>

-               <Item>AbstractQmsMessage.GetExchangeName(String, String&amp;):String</Item>

-               <Item>System.String.Format(System.String,System.Object[])</Item>

-               <Item>System.String.Format(System.IFormatProvider,System.String,System.Object[])</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="ToString():System.String">

-            <Messages>

-             <Message TypeName="DoNotCatchGeneralExceptionTypes" Category="Microsoft.Design" CheckId="CA1031" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>AbstractQmsMessage.ToString():String</Item>

-               <Item>System.Exception</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="WriteReplyToHeader(Qpid.Client.Message.AbstractQmsMessage+Dest):System.Void">

-            <Messages>

-             <Message Id="System.String.Format(System.String,System.Object,System.Object)" TypeName="SpecifyIFormatProvider" Category="Microsoft.Globalization" CheckId="CA1305" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>AbstractQmsMessage.WriteReplyToHeader(Dest):Void</Item>

-               <Item>System.String.Format(System.String,System.Object,System.Object)</Item>

-               <Item>System.String.Format(System.IFormatProvider,System.String,System.Object[])</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="AbstractQmsMessageFactory">

-          <Messages>

-           <Message Id="Qms" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-            <Issue Name="Type">

-             <Item>Qms</Item>

-             <Item>Qpid.Client.Message.AbstractQmsMessageFactory</Item>

-            </Issue>

-           </Message>

-          </Messages>

-          <Members>

-           <Member Name="CreateMessage(System.Int64,Qpid.Buffer.ByteBuffer,Qpid.Framing.ContentHeaderBody):Qpid.Client.Message.AbstractQmsMessage">

-            <Messages>

-             <Message Id="0#Nbr" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>AbstractQmsMessageFactory.CreateMessage(Int64, ByteBuffer, ContentHeaderBody):AbstractQmsMessage</Item>

-               <Item>Nbr</Item>

-               <Item>messageNbr</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CreateMessage(System.Int64,System.Boolean,Qpid.Framing.ContentHeaderBody,System.Collections.IList):Qpid.Client.Message.AbstractQmsMessage">

-            <Messages>

-             <Message Id="0#" TypeName="ParameterNamesShouldMatchBaseDeclaration" Category="Microsoft.Naming" CheckId="CA1725" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>messageNbr</Item>

-               <Item>AbstractQmsMessageFactory.CreateMessage(Int64, Boolean, ContentHeaderBody, IList):AbstractQmsMessage</Item>

-               <Item>deliverTag</Item>

-               <Item>IMessageFactory.CreateMessage(Int64, Boolean, ContentHeaderBody, IList):AbstractQmsMessage</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CreateMessageWithBody(System.Int64,Qpid.Framing.ContentHeaderBody,System.Collections.IList):Qpid.Client.Message.AbstractQmsMessage">

-            <Messages>

-             <Message Id="0#Nbr" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>AbstractQmsMessageFactory.CreateMessageWithBody(Int64, ContentHeaderBody, IList):AbstractQmsMessage</Item>

-               <Item>Nbr</Item>

-               <Item>messageNbr</Item>

-              </Issue>

-             </Message>

-             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>'bodies'</Item>

-               <Item>AbstractQmsMessageFactory.CreateMessageWithBody(Int64, ContentHeaderBody, IList):AbstractQmsMessage</Item>

-              </Issue>

-              <Issue>

-               <Item>'bodies'</Item>

-               <Item>AbstractQmsMessageFactory.CreateMessageWithBody(Int64, ContentHeaderBody, IList):AbstractQmsMessage</Item>

-              </Issue>

-              <Issue>

-               <Item>'contentHeader'</Item>

-               <Item>AbstractQmsMessageFactory.CreateMessageWithBody(Int64, ContentHeaderBody, IList):AbstractQmsMessage</Item>

-              </Issue>

-              <Issue>

-               <Item>'contentHeader'</Item>

-               <Item>AbstractQmsMessageFactory.CreateMessageWithBody(Int64, ContentHeaderBody, IList):AbstractQmsMessage</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="AMQMessage">

-          <Messages>

-           <Message TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-            <Issue Name="Type">

-             <Item>AMQMessage</Item>

-            </Issue>

-           </Message>

-          </Messages>

-          <Members>

-           <Member Name="_channel">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>_channel</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>_channel</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="_contentHeaderProperties">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>_contentHeaderProperties</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>_contentHeaderProperties</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="MessageFactoryRegistry">

-          <Members>

-           <Member Name="CreateMessage(System.Int64,System.Boolean,Qpid.Framing.ContentHeaderBody,System.Collections.IList):Qpid.Client.Message.AbstractQmsMessage">

-            <Messages>

-             <Message Id="Qpid.AMQException.#ctor(System.String)" TypeName="DoNotPassLiteralsAsLocalizedParameters" Category="Microsoft.Globalization" CheckId="CA1303" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>MessageFactoryRegistry.CreateMessage(Int64, Boolean, ContentHeaderBody, IList):AbstractQmsMessage</Item>

-               <Item>1</Item>

-               <Item>AMQException.AMQException(String)</Item>

-               <Item>Unsupport MIME type of __</Item>

-              </Issue>

-             </Message>

-             <Message Id="0#Nbr" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>MessageFactoryRegistry.CreateMessage(Int64, Boolean, ContentHeaderBody, IList):AbstractQmsMessage</Item>

-               <Item>Nbr</Item>

-               <Item>messageNbr</Item>

-              </Issue>

-             </Message>

-             <Message Id="Unsupport" TypeName="LiteralsShouldBeSpelledCorrectly" Category="Microsoft.Usage" CheckId="CA2204" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Unsupport</Item>

-               <Item>Unsupport MIME type of __</Item>

-              </Issue>

-             </Message>

-             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>'contentHeader'</Item>

-               <Item>MessageFactoryRegistry.CreateMessage(Int64, Boolean, ContentHeaderBody, IList):AbstractQmsMessage</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CreateMessage(System.String):Qpid.Client.Message.AbstractQmsMessage">

-            <Messages>

-             <Message Id="Qpid.AMQException.#ctor(System.String)" TypeName="DoNotPassLiteralsAsLocalizedParameters" Category="Microsoft.Globalization" CheckId="CA1303" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>MessageFactoryRegistry.CreateMessage(String):AbstractQmsMessage</Item>

-               <Item>1</Item>

-               <Item>AMQException.AMQException(String)</Item>

-               <Item>Unsupport MIME type of __</Item>

-              </Issue>

-             </Message>

-             <Message TypeName="InstantiateArgumentExceptionsCorrectly" Category="Microsoft.Usage" CheckId="CA2208" Created="2006-12-04 13:11:47Z">

-              <Issue Name="OneArgumentShouldBeParameterName">

-               <Item>System.ArgumentNullException</Item>

-               <Item>ArgumentNullException.ArgumentNullException(String)</Item>

-               <Item>Mime type must not be null</Item>

-              </Issue>

-             </Message>

-             <Message Id="Unsupport" TypeName="LiteralsShouldBeSpelledCorrectly" Category="Microsoft.Usage" CheckId="CA2204" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Unsupport</Item>

-               <Item>Unsupport MIME type of __</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="RegisterFactory(System.String,Qpid.Client.Message.IMessageFactory):System.Void">

-            <Messages>

-             <Message TypeName="InstantiateArgumentExceptionsCorrectly" Category="Microsoft.Usage" CheckId="CA2208" Created="2006-12-04 13:11:47Z">

-              <Issue Name="OneArgumentShouldBeParameterName">

-               <Item>System.ArgumentNullException</Item>

-               <Item>ArgumentNullException.ArgumentNullException(String)</Item>

-               <Item>Message factory</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="QpidBytesMessage">

-          <Messages>

-           <Message Id="Qpid" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-            <Issue Name="Type">

-             <Item>Qpid</Item>

-             <Item>Qpid.Client.Message.QpidBytesMessage</Item>

-            </Issue>

-           </Message>

-           <Message TypeName="TypesThatOwnDisposableFieldsShouldBeDisposable" Category="Microsoft.Design" CheckId="CA1001" Created="2006-12-04 13:11:47Z" FixCategory="Breaking">

-            <Issue>

-             <Item>Qpid.Client.Message.QpidBytesMessage</Item>

-             <Item>System.IO.MemoryStream, System.IO.BinaryWriter, System.IO.BinaryReader</Item>

-            </Issue>

-           </Message>

-          </Messages>

-          <Members>

-           <Member Name="ReadBytes(System.Byte[]):System.Int32">

-            <Messages>

-             <Message Id="0#" TypeName="ParameterNamesShouldMatchBaseDeclaration" Category="Microsoft.Naming" CheckId="CA1725" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>bytes</Item>

-               <Item>QpidBytesMessage.ReadBytes(Byte[]):Int32</Item>

-               <Item>array</Item>

-               <Item>IBytesMessage.ReadBytes(Byte[]):Int32</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="ReadBytes(System.Byte[],System.Int32):System.Int32">

-            <Messages>

-             <Message TypeName="InstantiateArgumentExceptionsCorrectly" Category="Microsoft.Usage" CheckId="CA2208" Created="2006-12-04 13:11:47Z">

-              <Issue Name="OneArgumentShouldBeParameterName">

-               <Item>System.ArgumentOutOfRangeException</Item>

-               <Item>ArgumentOutOfRangeException.ArgumentOutOfRangeException(String)</Item>

-               <Item>count must be &gt;= 0</Item>

-              </Issue>

-             </Message>

-             <Message Id="0#" TypeName="ParameterNamesShouldMatchBaseDeclaration" Category="Microsoft.Naming" CheckId="CA1725" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>bytes</Item>

-               <Item>QpidBytesMessage.ReadBytes(Byte[], Int32):Int32</Item>

-               <Item>array</Item>

-               <Item>IBytesMessage.ReadBytes(Byte[], Int32):Int32</Item>

-              </Issue>

-             </Message>

-             <Message Id="1#" TypeName="ParameterNamesShouldMatchBaseDeclaration" Category="Microsoft.Naming" CheckId="CA1725" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>count</Item>

-               <Item>QpidBytesMessage.ReadBytes(Byte[], Int32):Int32</Item>

-               <Item>length</Item>

-               <Item>IBytesMessage.ReadBytes(Byte[], Int32):Int32</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Write(System.Double):System.Void">

-            <Messages>

-             <Message Id="0#v" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="ParameterOneLetter">

-               <Item>QpidBytesMessage.Write(Double):Void</Item>

-               <Item>v</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Write(System.Int32):System.Void">

-            <Messages>

-             <Message Id="0#i" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="ParameterOneLetter">

-               <Item>QpidBytesMessage.Write(Int32):Void</Item>

-               <Item>i</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Write(System.Int64):System.Void">

-            <Messages>

-             <Message Id="0#l" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="ParameterOneLetter">

-               <Item>QpidBytesMessage.Write(Int64):Void</Item>

-               <Item>l</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Write(System.Single):System.Void">

-            <Messages>

-             <Message Id="0#v" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="ParameterOneLetter">

-               <Item>QpidBytesMessage.Write(Single):Void</Item>

-               <Item>v</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="WriteBoolean(System.Boolean):System.Void">

-            <Messages>

-             <Message Id="0#" TypeName="ParameterNamesShouldMatchBaseDeclaration" Category="Microsoft.Naming" CheckId="CA1725" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>b</Item>

-               <Item>QpidBytesMessage.WriteBoolean(Boolean):Void</Item>

-               <Item>value</Item>

-               <Item>IBytesMessage.WriteBoolean(Boolean):Void</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="WriteByte(System.Byte):System.Void">

-            <Messages>

-             <Message Id="0#" TypeName="ParameterNamesShouldMatchBaseDeclaration" Category="Microsoft.Naming" CheckId="CA1725" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>b</Item>

-               <Item>QpidBytesMessage.WriteByte(Byte):Void</Item>

-               <Item>value</Item>

-               <Item>IBytesMessage.WriteByte(Byte):Void</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="WriteBytes(System.Byte[]):System.Void">

-            <Messages>

-             <Message Id="0#" TypeName="ParameterNamesShouldMatchBaseDeclaration" Category="Microsoft.Naming" CheckId="CA1725" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>bytes</Item>

-               <Item>QpidBytesMessage.WriteBytes(Byte[]):Void</Item>

-               <Item>value</Item>

-               <Item>IBytesMessage.WriteBytes(Byte[]):Void</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="WriteBytes(System.Byte[],System.Int32,System.Int32):System.Void">

-            <Messages>

-             <Message Id="0#" TypeName="ParameterNamesShouldMatchBaseDeclaration" Category="Microsoft.Naming" CheckId="CA1725" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>bytes</Item>

-               <Item>QpidBytesMessage.WriteBytes(Byte[], Int32, Int32):Void</Item>

-               <Item>value</Item>

-               <Item>IBytesMessage.WriteBytes(Byte[], Int32, Int32):Void</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="WriteChar(System.Char):System.Void">

-            <Messages>

-             <Message Id="0#" TypeName="ParameterNamesShouldMatchBaseDeclaration" Category="Microsoft.Naming" CheckId="CA1725" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>c</Item>

-               <Item>QpidBytesMessage.WriteChar(Char):Void</Item>

-               <Item>value</Item>

-               <Item>IBytesMessage.WriteChar(Char):Void</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="WriteShort(System.Int16):System.Void">

-            <Messages>

-             <Message Id="0#" TypeName="ParameterNamesShouldMatchBaseDeclaration" Category="Microsoft.Naming" CheckId="CA1725" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>i</Item>

-               <Item>QpidBytesMessage.WriteShort(Int16):Void</Item>

-               <Item>value</Item>

-               <Item>IBytesMessage.WriteShort(Int16):Void</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="QpidBytesMessageFactory">

-          <Messages>

-           <Message Id="Qpid" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-            <Issue Name="Type">

-             <Item>Qpid</Item>

-             <Item>Qpid.Client.Message.QpidBytesMessageFactory</Item>

-            </Issue>

-           </Message>

-          </Messages>

-          <Members>

-           <Member Name="CreateMessage(System.Int64,Qpid.Buffer.ByteBuffer,Qpid.Framing.ContentHeaderBody):Qpid.Client.Message.AbstractQmsMessage">

-            <Messages>

-             <Message Id="0#" TypeName="ParameterNamesShouldMatchBaseDeclaration" Category="Microsoft.Naming" CheckId="CA1725" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>deliveryTag</Item>

-               <Item>QpidBytesMessageFactory.CreateMessage(Int64, ByteBuffer, ContentHeaderBody):AbstractQmsMessage</Item>

-               <Item>messageNbr</Item>

-               <Item>AbstractQmsMessageFactory.CreateMessage(Int64, ByteBuffer, ContentHeaderBody):AbstractQmsMessage</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="QpidHeaders">

-          <Members>

-           <Member Name="CheckPropertyName(System.String):System.Void">

-            <Messages>

-             <Message Id="System.ArgumentException.#ctor(System.String)" TypeName="DoNotPassLiteralsAsLocalizedParameters" Category="Microsoft.Globalization" CheckId="CA1303" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>QpidHeaders.CheckPropertyName(String):Void</Item>

-               <Item>1</Item>

-               <Item>ArgumentException.ArgumentException(String)</Item>

-               <Item>Property name must not be the empty string</Item>

-              </Issue>

-             </Message>

-             <Message TypeName="TestForEmptyStringsUsingStringLength" Category="Microsoft.Performance" CheckId="CA1820" Created="2006-12-04 13:11:47Z">

-              <Issue Name="IsNullOrEmpty">

-               <Item>Equals</Item>

-               <Item>""</Item>

-               <Item>QpidHeaders.CheckPropertyName(String):Void</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Clear():System.Void">

-            <Messages>

-             <Message TypeName="AvoidUncalledPrivateCode" Category="Microsoft.Performance" CheckId="CA1811" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>QpidHeaders.Clear():Void</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="QpidTextMessage">

-          <Messages>

-           <Message Id="Qpid" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-            <Issue Name="Type">

-             <Item>Qpid</Item>

-             <Item>Qpid.Client.Message.QpidTextMessage</Item>

-            </Issue>

-           </Message>

-          </Messages>

-          <Members>

-           <Member Name=".ctor(Qpid.Buffer.ByteBuffer)">

-            <Messages>

-             <Message TypeName="AvoidUncalledPrivateCode" Category="Microsoft.Performance" CheckId="CA1811" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>QpidTextMessage.QpidTextMessage(ByteBuffer)</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name=".ctor(System.String)">

-            <Messages>

-             <Message TypeName="AvoidUncalledPrivateCode" Category="Microsoft.Performance" CheckId="CA1811" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>QpidTextMessage.QpidTextMessage(String)</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="QpidTextMessageFactory">

-          <Messages>

-           <Message Id="Qpid" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-            <Issue Name="Type">

-             <Item>Qpid</Item>

-             <Item>Qpid.Client.Message.QpidTextMessageFactory</Item>

-            </Issue>

-           </Message>

-          </Messages>

-          <Members>

-           <Member Name="CreateMessage(System.Int64,Qpid.Buffer.ByteBuffer,Qpid.Framing.ContentHeaderBody):Qpid.Client.Message.AbstractQmsMessage">

-            <Messages>

-             <Message Id="0#" TypeName="ParameterNamesShouldMatchBaseDeclaration" Category="Microsoft.Naming" CheckId="CA1725" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>deliveryTag</Item>

-               <Item>QpidTextMessageFactory.CreateMessage(Int64, ByteBuffer, ContentHeaderBody):AbstractQmsMessage</Item>

-               <Item>messageNbr</Item>

-               <Item>AbstractQmsMessageFactory.CreateMessage(Int64, ByteBuffer, ContentHeaderBody):AbstractQmsMessage</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="UnexpectedBodyReceivedException">

-          <Messages>

-           <Message TypeName="ImplementStandardExceptionConstructors" Category="Microsoft.Design" CheckId="CA1032" Created="2006-12-04 13:11:47Z">

-            <Issue>

-             <Item>Qpid.Client.Message.UnexpectedBodyReceivedException</Item>

-             <Item>protected UnexpectedBodyReceivedException(SerializationInfo, StreamingContext)</Item>

-            </Issue>

-            <Issue>

-             <Item>Qpid.Client.Message.UnexpectedBodyReceivedException</Item>

-             <Item>public UnexpectedBodyReceivedException()</Item>

-            </Issue>

-            <Issue>

-             <Item>Qpid.Client.Message.UnexpectedBodyReceivedException</Item>

-             <Item>public UnexpectedBodyReceivedException(String)</Item>

-            </Issue>

-            <Issue>

-             <Item>Qpid.Client.Message.UnexpectedBodyReceivedException</Item>

-             <Item>public UnexpectedBodyReceivedException(String, Exception)</Item>

-            </Issue>

-           </Message>

-          </Messages>

-          <Members>

-           <Member Name=".ctor(log4net.ILog,System.String,System.Exception)">

-            <Messages>

-             <Message Id="2#t" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="ParameterOneLetter">

-               <Item>UnexpectedBodyReceivedException.UnexpectedBodyReceivedException(ILog, String, Exception)</Item>

-               <Item>t</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="UnprocessedMessage">

-          <Members>

-           <Member Name=".ctor()">

-            <Messages>

-             <Message TypeName="DoNotInitializeUnnecessarily" Category="Microsoft.Performance" CheckId="CA1805" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>UnprocessedMessage.UnprocessedMessage()</Item>

-               <Item>_bytesReceived</Item>

-               <Item>System.UInt64</Item>

-               <Item>0</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Bodies">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Bodies</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="BounceBody">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>BounceBody</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="ChannelId">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>ChannelId</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="ContentHeader">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>ContentHeader</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="DeliverBody">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>DeliverBody</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="ReceiveBody(Qpid.Framing.ContentBody):System.Void">

-            <Messages>

-             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>'body'</Item>

-               <Item>UnprocessedMessage.ReceiveBody(ContentBody):Void</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-        </Types>

-       </Namespace>

-       <Namespace Name="Qpid.Client.Protocol">

-        <Types>

-         <Type Name="AMQMethodEvent">

-          <Messages>

-           <Message TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-            <Issue Name="Type">

-             <Item>AMQMethodEvent</Item>

-            </Issue>

-           </Message>

-          </Messages>

-         </Type>

-         <Type Name="AMQProtocolListener">

-          <Messages>

-           <Message TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-            <Issue Name="Type">

-             <Item>AMQProtocolListener</Item>

-            </Issue>

-           </Message>

-          </Messages>

-          <Members>

-           <Member Name=".ctor(Qpid.Client.AMQConnection,Qpid.Client.State.AMQStateManager)">

-            <Messages>

-             <Message TypeName="DoNotInitializeUnnecessarily" Category="Microsoft.Performance" CheckId="CA1805" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>AMQProtocolListener.AMQProtocolListener(AMQConnection, AMQStateManager)</Item>

-               <Item>_protocolSession</Item>

-               <Item>Qpid.Client.Protocol.AMQProtocolSession</Item>

-               <Item>null</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="OnException(System.Exception):System.Void">

-            <Messages>

-             <Message Id="Qpid.AMQException.#ctor(System.String,System.Exception)" TypeName="DoNotPassLiteralsAsLocalizedParameters" Category="Microsoft.Globalization" CheckId="CA1303" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>AMQProtocolListener.OnException(Exception):Void</Item>

-               <Item>1</Item>

-               <Item>AMQException.AMQException(String, Exception)</Item>

-               <Item>Protocol handler error: __</Item>

-              </Issue>

-             </Message>

-             <Message Id="0#" TypeName="ParameterNamesShouldMatchBaseDeclaration" Category="Microsoft.Naming" CheckId="CA1725" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>cause</Item>

-               <Item>AMQProtocolListener.OnException(Exception):Void</Item>

-               <Item>e</Item>

-               <Item>IProtocolListener.OnException(Exception):Void</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="OnMessage(Qpid.Framing.IDataBlock):System.Void">

-            <Messages>

-             <Message TypeName="DoNotCatchGeneralExceptionTypes" Category="Microsoft.Design" CheckId="CA1031" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>AMQProtocolListener.OnMessage(IDataBlock):Void</Item>

-               <Item>System.Exception</Item>

-              </Issue>

-             </Message>

-             <Message Id="Qpid.AMQException.#ctor(System.String)" TypeName="DoNotPassLiteralsAsLocalizedParameters" Category="Microsoft.Globalization" CheckId="CA1303" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>AMQProtocolListener.OnMessage(IDataBlock):Void</Item>

-               <Item>1</Item>

-               <Item>AMQException.AMQException(String)</Item>

-               <Item>AMQMethodEvent ____ was not processed by any listener.</Item>

-              </Issue>

-             </Message>

-             <Message Id="System.String.Format(System.String,System.Object)" TypeName="SpecifyIFormatProvider" Category="Microsoft.Globalization" CheckId="CA1305" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>AMQProtocolListener.OnMessage(IDataBlock):Void</Item>

-               <Item>System.String.Format(System.String,System.Object)</Item>

-               <Item>System.String.Format(System.IFormatProvider,System.String,System.Object[])</Item>

-              </Issue>

-             </Message>

-             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>'message'</Item>

-               <Item>AMQProtocolListener.OnMessage(IDataBlock):Void</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="PropagateExceptionToWaiters(System.Exception):System.Void">

-            <Messages>

-             <Message Id="0#e" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="ParameterOneLetter">

-               <Item>AMQProtocolListener.PropagateExceptionToWaiters(Exception):Void</Item>

-               <Item>e</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="ProtocolSession">

-            <Messages>

-             <Message TypeName="PropertiesShouldNotBeWriteOnly" Category="Microsoft.Design" CheckId="CA1044" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>ProtocolSession</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="RemoveFrameListener(Qpid.Client.Protocol.Listener.IAMQMethodListener):System.Void">

-            <Messages>

-             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>'listener'</Item>

-               <Item>AMQProtocolListener.RemoveFrameListener(IAMQMethodListener):Void</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="WhenClosed():System.Void">

-            <Messages>

-             <Message Id="Qpid.AMQDisconnectedException.#ctor(System.String)" TypeName="DoNotPassLiteralsAsLocalizedParameters" Category="Microsoft.Globalization" CheckId="CA1303" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>AMQProtocolListener.WhenClosed():Void</Item>

-               <Item>1</Item>

-               <Item>AMQDisconnectedException.AMQDisconnectedException(String)</Item>

-               <Item>Server closed connection and reconnection not permitted.</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="AMQProtocolSession">

-          <Messages>

-           <Message TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-            <Issue Name="Type">

-             <Item>AMQProtocolSession</Item>

-            </Issue>

-           </Message>

-          </Messages>

-          <Members>

-           <Member Name="AddSessionByChannel(System.UInt16,Qpid.Client.AmqChannel):System.Void">

-            <Messages>

-             <Message TypeName="InstantiateArgumentExceptionsCorrectly" Category="Microsoft.Usage" CheckId="CA2208" Created="2006-12-04 13:11:47Z">

-              <Issue Name="OneArgumentShouldBeParameterName">

-               <Item>System.ArgumentNullException</Item>

-               <Item>ArgumentNullException.ArgumentNullException(String)</Item>

-               <Item>Attempt to register a null channel</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="AMQConnection">

-            <Messages>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>AMQProtocolSession.AMQConnection:AMQConnection</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CloseSession(Qpid.Client.AmqChannel):System.Void">

-            <Messages>

-             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>'channel'</Item>

-               <Item>AMQProtocolSession.CloseSession(AmqChannel):Void</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="ConnectionTuneParameters">

-            <Accessors>

-             <Accessor Name="set_ConnectionTuneParameters(Qpid.Client.ConnectionTuneParameters):System.Void">

-              <Messages>

-               <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2006-12-04 13:11:47Z">

-                <Issue>

-                 <Item>'value'</Item>

-                 <Item>AMQProtocolSession.set_ConnectionTuneParameters(ConnectionTuneParameters):Void</Item>

-                </Issue>

-               </Message>

-              </Messages>

-             </Accessor>

-            </Accessors>

-           </Member>

-           <Member Name="MessageContentBodyReceived(System.UInt16,Qpid.Framing.ContentBody):System.Void">

-            <Messages>

-             <Message Id="Qpid.AMQException.#ctor(System.String)" TypeName="DoNotPassLiteralsAsLocalizedParameters" Category="Microsoft.Globalization" CheckId="CA1303" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>AMQProtocolSession.MessageContentBodyReceived(UInt16, ContentBody):Void</Item>

-               <Item>1</Item>

-               <Item>AMQException.AMQException(String)</Item>

-               <Item>Error: received content body without having received a BasicDeliver frame first</Item>

-              </Issue>

-             </Message>

-             <Message TypeName="RethrowToPreserveStackDetails" Category="Microsoft.Usage" CheckId="CA2200" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>AMQProtocolSession.MessageContentBodyReceived(UInt16, ContentBody):Void</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="MessageContentHeaderReceived(System.UInt16,Qpid.Framing.ContentHeaderBody):System.Void">

-            <Messages>

-             <Message Id="Qpid.AMQException.#ctor(System.String)" TypeName="DoNotPassLiteralsAsLocalizedParameters" Category="Microsoft.Globalization" CheckId="CA1303" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>AMQProtocolSession.MessageContentHeaderReceived(UInt16, ContentHeaderBody):Void</Item>

-               <Item>1</Item>

-               <Item>AMQException.AMQException(String)</Item>

-               <Item>Error: received content header without having received a JMSDeliver frame first</Item>

-              </Issue>

-              <Issue>

-               <Item>AMQProtocolSession.MessageContentHeaderReceived(UInt16, ContentHeaderBody):Void</Item>

-               <Item>1</Item>

-               <Item>AMQException.AMQException(String)</Item>

-               <Item>Error: received duplicate content header or did not receive correct number of content body frames</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="UnprocessedMessageReceived(Qpid.Client.Message.UnprocessedMessage):System.Void">

-            <Messages>

-             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>'message'</Item>

-               <Item>AMQProtocolSession.UnprocessedMessageReceived(UnprocessedMessage):Void</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Username">

-            <Messages>

-             <Message Id="Username" TypeName="CompoundWordsShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1702" Created="2006-12-04 13:11:47Z">

-              <Issue Name="ShouldBeCompoundWord">

-               <Item>Username</Item>

-               <Item>property</Item>

-               <Item>Username</Item>

-               <Item>UserName</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="IProtocolListener">

-          <Members>

-           <Member Name="OnException(System.Exception):System.Void">

-            <Messages>

-             <Message Id="0#e" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="ParameterOneLetter">

-               <Item>IProtocolListener.OnException(Exception):Void</Item>

-               <Item>e</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="ProtocolWriter">

-          <Members>

-           <Member Name="SyncWrite(Qpid.Framing.AMQFrame,System.Type):Qpid.Client.Protocol.AMQMethodEvent">

-            <Messages>

-             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>'frame'</Item>

-               <Item>ProtocolWriter.SyncWrite(AMQFrame, Type):AMQMethodEvent</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-        </Types>

-       </Namespace>

-       <Namespace Name="Qpid.Client.Protocol.Listener">

-        <Types>

-         <Type Name="BlockingMethodFrameListener">

-          <Messages>

-           <Message TypeName="AbstractTypesShouldNotHaveConstructors" Category="Microsoft.Design" CheckId="CA1012" Created="2006-12-04 13:11:47Z">

-            <Issue>

-             <Item>BlockingMethodFrameListener</Item>

-            </Issue>

-           </Message>

-           <Message TypeName="TypesThatOwnDisposableFieldsShouldBeDisposable" Category="Microsoft.Design" CheckId="CA1001" Created="2006-12-04 13:11:47Z" FixCategory="Breaking">

-            <Issue>

-             <Item>Qpid.Client.Protocol.Listener.BlockingMethodFrameListener</Item>

-             <Item>System.Threading.ManualResetEvent</Item>

-            </Issue>

-           </Message>

-          </Messages>

-          <Members>

-           <Member Name=".ctor(System.UInt16)">

-            <Messages>

-             <Message TypeName="DoNotInitializeUnnecessarily" Category="Microsoft.Performance" CheckId="CA1805" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>BlockingMethodFrameListener.BlockingMethodFrameListener(UInt16)</Item>

-               <Item>_doneEvt</Item>

-               <Item>Qpid.Client.Protocol.AMQMethodEvent</Item>

-               <Item>null</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="_channelId">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>_channelId</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>_channelId</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="_doneEvt">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>_doneEvt</Item>

-              </Issue>

-             </Message>

-             <Message Id="Evt" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>Evt</Item>

-               <Item>BlockingMethodFrameListener._doneEvt</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>_doneEvt</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="MethodReceived(Qpid.Client.Protocol.AMQMethodEvent):System.Boolean">

-            <Messages>

-             <Message TypeName="RethrowToPreserveStackDetails" Category="Microsoft.Usage" CheckId="CA2200" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>BlockingMethodFrameListener.MethodReceived(AMQMethodEvent):Boolean</Item>

-              </Issue>

-             </Message>

-             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>'evt'</Item>

-               <Item>BlockingMethodFrameListener.MethodReceived(AMQMethodEvent):Boolean</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="IAMQMethodListener">

-          <Messages>

-           <Message TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-            <Issue Name="Type">

-             <Item>IAMQMethodListener</Item>

-            </Issue>

-           </Message>

-          </Messages>

-          <Members>

-           <Member Name="Error(System.Exception):System.Void">

-            <Messages>

-             <Message Id="0#e" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="ParameterOneLetter">

-               <Item>IAMQMethodListener.Error(Exception):Void</Item>

-               <Item>e</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="MethodReceived(Qpid.Client.Protocol.AMQMethodEvent):System.Boolean">

-            <Messages>

-             <Message Id="0#evt" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>IAMQMethodListener.MethodReceived(AMQMethodEvent):Boolean</Item>

-               <Item>evt</Item>

-               <Item>evt</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-        </Types>

-       </Namespace>

-       <Namespace Name="Qpid.Client.qms">

-        <Types>

-         <Type Name="BrokerInfo">

-          <Messages>

-           <Message TypeName="IdentifiersShouldHaveCorrectPrefix" Category="Microsoft.Naming" CheckId="CA1715" Created="2006-12-04 13:11:47Z">

-            <Issue>

-             <Item>BrokerInfo</Item>

-            </Issue>

-           </Message>

-          </Messages>

-          <Members>

-           <Member Name="getHost():System.String">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>getHost</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="getOption(System.String):System.String">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>getOption</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="getPort():System.Int32">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>getPort</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="getTimeout():System.Int64">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>getTimeout</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="getTransport():System.String">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>getTransport</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="setHost(System.String):System.Void">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>setHost</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="setOption(System.String,System.String):System.Void">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>setOption</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="setPort(System.Int32):System.Void">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>setPort</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="setTimeout(System.Int64):System.Void">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>setTimeout</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="setTransport(System.String):System.Void">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>setTransport</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="useSSL():System.Boolean">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>useSSL</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>BrokerInfo.useSSL():Boolean</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="useSSL(System.Boolean):System.Void">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>useSSL</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>BrokerInfo.useSSL(Boolean):Void</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="BrokerInfoConstants">

-          <Members>

-           <Member Name="DEFAULT_CONNECT_TIMEOUT">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>DEFAULT_CONNECT_TIMEOUT</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>BrokerInfoConstants.DEFAULT_CONNECT_TIMEOUT</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="DEFAULT_PORT">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>DEFAULT_PORT</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>BrokerInfoConstants.DEFAULT_PORT</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="DEFAULT_TRANSPORT">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>DEFAULT_TRANSPORT</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>BrokerInfoConstants.DEFAULT_TRANSPORT</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="OPTIONS_CONNECT_TIMEOUT">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>OPTIONS_CONNECT_TIMEOUT</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>BrokerInfoConstants.OPTIONS_CONNECT_TIMEOUT</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="OPTIONS_RETRY">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>OPTIONS_RETRY</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>BrokerInfoConstants.OPTIONS_RETRY</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="OPTIONS_SSL">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>OPTIONS_SSL</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>BrokerInfoConstants.OPTIONS_SSL</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="URL_FORMAT_EXAMPLE">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>URL_FORMAT_EXAMPLE</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>URL_FORMAT_EXAMPLE</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="ConnectionInfo">

-          <Messages>

-           <Message TypeName="IdentifiersShouldHaveCorrectPrefix" Category="Microsoft.Naming" CheckId="CA1715" Created="2006-12-04 13:11:47Z">

-            <Issue>

-             <Item>ConnectionInfo</Item>

-            </Issue>

-           </Message>

-          </Messages>

-          <Members>

-           <Member Name="AsUrl():System.String">

-            <Messages>

-             <Message TypeName="UriReturnValuesShouldNotBeStrings" Category="Microsoft.Design" CheckId="CA1055" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>ConnectionInfo.AsUrl():String</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="GetAllBrokerInfos():System.Collections.IList">

-            <Messages>

-             <Message Id="Infos" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>Infos</Item>

-               <Item>ConnectionInfo.GetAllBrokerInfos():IList</Item>

-              </Issue>

-             </Message>

-             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2006-12-04 13:11:47Z">

-              <Issue Certainty="50">

-               <Item>GetAllBrokerInfos</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="GetBrokerCount():System.Int32">

-            <Messages>

-             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2006-12-04 13:11:47Z">

-              <Issue Certainty="50">

-               <Item>GetBrokerCount</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="GetClientName():System.String">

-            <Messages>

-             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2006-12-04 13:11:47Z">

-              <Issue Certainty="50">

-               <Item>GetClientName</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="GetFailoverMethod():System.String">

-            <Messages>

-             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2006-12-04 13:11:47Z">

-              <Issue Certainty="50">

-               <Item>GetFailoverMethod</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="GetPassword():System.String">

-            <Messages>

-             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2006-12-04 13:11:47Z">

-              <Issue Certainty="50">

-               <Item>GetPassword</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="GetUsername():System.String">

-            <Messages>

-             <Message Id="Username" TypeName="CompoundWordsShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1702" Created="2006-12-04 13:11:47Z">

-              <Issue Name="ShouldBeCompoundWord">

-               <Item>Username</Item>

-               <Item>method</Item>

-               <Item>GetUsername</Item>

-               <Item>UserName</Item>

-              </Issue>

-             </Message>

-             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2006-12-04 13:11:47Z">

-              <Issue Certainty="50">

-               <Item>GetUsername</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="GetVirtualHost():System.String">

-            <Messages>

-             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2006-12-04 13:11:47Z">

-              <Issue Certainty="50">

-               <Item>GetVirtualHost</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="setUsername(System.String):System.Void">

-            <Messages>

-             <Message Id="Username" TypeName="CompoundWordsShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1702" Created="2006-12-04 13:11:47Z">

-              <Issue Name="ShouldBeCompoundWord">

-               <Item>Username</Item>

-               <Item>method</Item>

-               <Item>setUsername</Item>

-               <Item>UserName</Item>

-              </Issue>

-             </Message>

-             <Message Id="username" TypeName="CompoundWordsShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1702" Created="2006-12-04 13:11:47Z">

-              <Issue Name="ShouldBeCompoundWord">

-               <Item>username</Item>

-               <Item>parameter</Item>

-               <Item>username</Item>

-               <Item>userName</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>setUsername</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="ConnectionUrlConstants">

-          <Messages>

-           <Message TypeName="AvoidUninstantiatedInternalClasses" Category="Microsoft.Performance" CheckId="CA1812" Created="2006-12-04 13:11:47Z">

-            <Issue>

-             <Item>Qpid.Client.qms.ConnectionUrlConstants</Item>

-            </Issue>

-           </Message>

-          </Messages>

-         </Type>

-         <Type Name="FailoverPolicy">

-          <Members>

-           <Member Name=".ctor(Qpid.Client.qms.ConnectionInfo)">

-            <Messages>

-             <Message TypeName="DoNotInitializeUnnecessarily" Category="Microsoft.Performance" CheckId="CA1805" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>FailoverPolicy.FailoverPolicy(ConnectionInfo)</Item>

-               <Item>_methodsRetries</Item>

-               <Item>System.Int32</Item>

-               <Item>0</Item>

-              </Issue>

-             </Message>

-             <Message Id="System.NotImplementedException.#ctor(System.String)" TypeName="DoNotPassLiteralsAsLocalizedParameters" Category="Microsoft.Globalization" CheckId="CA1303" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>FailoverPolicy.FailoverPolicy(ConnectionInfo)</Item>

-               <Item>1</Item>

-               <Item>NotImplementedException.NotImplementedException(String)</Item>

-               <Item>Dynamic loading of FailoverMethods not yet implemented.</Item>

-              </Issue>

-             </Message>

-             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>'connectionInfo'</Item>

-               <Item>FailoverPolicy.FailoverPolicy(ConnectionInfo)</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="addMethod(Qpid.Client.qms.failover.FailoverMethod):System.Void">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>addMethod</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="attainedConnection():System.Void">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>attainedConnection</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="GetCurrentBrokerInfo():Qpid.Client.qms.BrokerInfo">

-            <Messages>

-             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2006-12-04 13:11:47Z">

-              <Issue Certainty="50">

-               <Item>GetCurrentBrokerInfo</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="getCurrentMethod():Qpid.Client.qms.failover.FailoverMethod">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>getCurrentMethod</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="GetNextBrokerInfo():Qpid.Client.qms.BrokerInfo">

-            <Messages>

-             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2006-12-04 13:11:47Z">

-              <Issue Certainty="50">

-               <Item>GetNextBrokerInfo</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="setBroker(Qpid.Client.qms.BrokerInfo):System.Void">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>setBroker</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="setMethodRetries(System.Int32):System.Void">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>setMethodRetries</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="toString():System.String">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>toString</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="UrlSyntaxException">

-          <Messages>

-           <Message TypeName="ImplementStandardExceptionConstructors" Category="Microsoft.Design" CheckId="CA1032" Created="2006-12-04 13:11:47Z">

-            <Issue>

-             <Item>Qpid.Client.qms.UrlSyntaxException</Item>

-             <Item>protected UrlSyntaxException(SerializationInfo, StreamingContext)</Item>

-            </Issue>

-            <Issue>

-             <Item>Qpid.Client.qms.UrlSyntaxException</Item>

-             <Item>public UrlSyntaxException()</Item>

-            </Issue>

-            <Issue>

-             <Item>Qpid.Client.qms.UrlSyntaxException</Item>

-             <Item>public UrlSyntaxException(String)</Item>

-            </Issue>

-            <Issue>

-             <Item>Qpid.Client.qms.UrlSyntaxException</Item>

-             <Item>public UrlSyntaxException(String, Exception)</Item>

-            </Issue>

-           </Message>

-           <Message TypeName="MarkISerializableTypesWithSerializable" Category="Microsoft.Usage" CheckId="CA2237" Created="2006-12-04 13:11:47Z">

-            <Issue Level="Error">

-             <Item>UrlSyntaxException</Item>

-            </Issue>

-           </Message>

-          </Messages>

-          <Members>

-           <Member Name=".ctor(System.String,System.String,System.Int32,System.Int32)">

-            <Messages>

-             <Message Id="0#" TypeName="UriParametersShouldNotBeStrings" Category="Microsoft.Design" CheckId="CA1054" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>url</Item>

-               <Item>UrlSyntaxException.UrlSyntaxException(String, String, Int32, Int32)</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="GetIndex():System.Int32">

-            <Messages>

-             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>GetIndex</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="GetReason():System.String">

-            <Messages>

-             <Message TypeName="MarkMembersAsStatic" Category="Microsoft.Performance" CheckId="CA1822" Created="2006-12-04 13:11:47Z" FixCategory="Breaking">

-              <Issue>

-               <Item>UrlSyntaxException.GetReason():String</Item>

-              </Issue>

-             </Message>

-             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2006-12-04 13:11:47Z">

-              <Issue Certainty="50">

-               <Item>GetReason</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="toString():System.String">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>toString</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-        </Types>

-       </Namespace>

-       <Namespace Name="Qpid.Client.qms.failover">

-        <Types>

-         <Type Name="FailoverMethod">

-          <Messages>

-           <Message TypeName="IdentifiersShouldHaveCorrectPrefix" Category="Microsoft.Naming" CheckId="CA1715" Created="2006-12-04 13:11:47Z">

-            <Issue>

-             <Item>FailoverMethod</Item>

-            </Issue>

-           </Message>

-          </Messages>

-          <Members>

-           <Member Name="attainedConnection():System.Void">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>attainedConnection</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="failoverAllowed():System.Boolean">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>failoverAllowed</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="GetCurrentBrokerInfo():Qpid.Client.qms.BrokerInfo">

-            <Messages>

-             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2006-12-04 13:11:47Z">

-              <Issue Certainty="50">

-               <Item>GetCurrentBrokerInfo</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="getNextBrokerDetails():Qpid.Client.qms.BrokerInfo">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>getNextBrokerDetails</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="methodName():System.String">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>methodName</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="reset():System.Void">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>reset</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="setBroker(Qpid.Client.qms.BrokerInfo):System.Void">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>setBroker</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="setRetries(System.Int32):System.Void">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>setRetries</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="FailoverMethodConstants">

-          <Members>

-           <Member Name="RANDOM">

-            <Messages>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>FailoverMethodConstants.RANDOM</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="ROUND_ROBIN">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>ROUND_ROBIN</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>FailoverMethodConstants.ROUND_ROBIN</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="FailoverRoundRobin">

-          <Members>

-           <Member Name=".ctor(Qpid.Client.qms.ConnectionInfo)">

-            <Messages>

-             <Message TypeName="DoNotInitializeUnnecessarily" Category="Microsoft.Performance" CheckId="CA1805" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>FailoverRoundRobin.FailoverRoundRobin(ConnectionInfo)</Item>

-               <Item>_currentCycleRetries</Item>

-               <Item>System.Int32</Item>

-               <Item>0</Item>

-              </Issue>

-              <Issue>

-               <Item>FailoverRoundRobin.FailoverRoundRobin(ConnectionInfo)</Item>

-               <Item>_cycleRetries</Item>

-               <Item>System.Int32</Item>

-               <Item>0</Item>

-              </Issue>

-              <Issue>

-               <Item>FailoverRoundRobin.FailoverRoundRobin(ConnectionInfo)</Item>

-               <Item>_serverRetries</Item>

-               <Item>System.Int32</Item>

-               <Item>0</Item>

-              </Issue>

-             </Message>

-             <Message Id="System.ArgumentException.#ctor(System.String)" TypeName="DoNotPassLiteralsAsLocalizedParameters" Category="Microsoft.Globalization" CheckId="CA1303" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>FailoverRoundRobin.FailoverRoundRobin(ConnectionInfo)</Item>

-               <Item>1</Item>

-               <Item>ArgumentException.ArgumentException(String)</Item>

-               <Item>At least one broker details must be specified.</Item>

-              </Issue>

-             </Message>

-             <Message Id="System.Int32.Parse(System.String)" TypeName="SpecifyIFormatProvider" Category="Microsoft.Globalization" CheckId="CA1305" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>FailoverRoundRobin.FailoverRoundRobin(ConnectionInfo)</Item>

-               <Item>System.Int32.Parse(System.String)</Item>

-               <Item>System.Int32.Parse(System.String,System.IFormatProvider)</Item>

-              </Issue>

-             </Message>

-             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>'connectionDetails'</Item>

-               <Item>FailoverRoundRobin.FailoverRoundRobin(ConnectionInfo)</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="DEFAULT_CYCLE_RETRIES">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>DEFAULT_CYCLE_RETRIES</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>FailoverRoundRobin.DEFAULT_CYCLE_RETRIES</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="DEFAULT_SERVER_RETRIES">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>DEFAULT_SERVER_RETRIES</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>FailoverRoundRobin.DEFAULT_SERVER_RETRIES</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="setBroker(Qpid.Client.qms.BrokerInfo):System.Void">

-            <Messages>

-             <Message Id="System.Int32.Parse(System.String)" TypeName="SpecifyIFormatProvider" Category="Microsoft.Globalization" CheckId="CA1305" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>FailoverRoundRobin.setBroker(BrokerInfo):Void</Item>

-               <Item>System.Int32.Parse(System.String)</Item>

-               <Item>System.Int32.Parse(System.String,System.IFormatProvider)</Item>

-              </Issue>

-             </Message>

-             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>'broker'</Item>

-               <Item>FailoverRoundRobin.setBroker(BrokerInfo):Void</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="FailoverSingleServer">

-          <Members>

-           <Member Name=".ctor(Qpid.Client.qms.ConnectionInfo)">

-            <Messages>

-             <Message Id="System.ArgumentException.#ctor(System.String)" TypeName="DoNotPassLiteralsAsLocalizedParameters" Category="Microsoft.Globalization" CheckId="CA1303" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>FailoverSingleServer.FailoverSingleServer(ConnectionInfo)</Item>

-               <Item>1</Item>

-               <Item>ArgumentException.ArgumentException(String)</Item>

-               <Item>BrokerInfo details required for connection.</Item>

-              </Issue>

-             </Message>

-             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>'connectionDetails'</Item>

-               <Item>FailoverSingleServer.FailoverSingleServer(ConnectionInfo)</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="DEFAULT_SERVER_RETRIES">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>DEFAULT_SERVER_RETRIES</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>FailoverSingleServer.DEFAULT_SERVER_RETRIES</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="setBroker(Qpid.Client.qms.BrokerInfo):System.Void">

-            <Messages>

-             <Message Id="System.ArgumentException.#ctor(System.String)" TypeName="DoNotPassLiteralsAsLocalizedParameters" Category="Microsoft.Globalization" CheckId="CA1303" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>FailoverSingleServer.setBroker(BrokerInfo):Void</Item>

-               <Item>1</Item>

-               <Item>ArgumentException.ArgumentException(String)</Item>

-               <Item>BrokerInfo details cannot be null</Item>

-              </Issue>

-             </Message>

-             <Message Id="System.Int32.Parse(System.String)" TypeName="SpecifyIFormatProvider" Category="Microsoft.Globalization" CheckId="CA1305" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>FailoverSingleServer.setBroker(BrokerInfo):Void</Item>

-               <Item>System.Int32.Parse(System.String)</Item>

-               <Item>System.Int32.Parse(System.String,System.IFormatProvider)</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="setRetries(System.Int32):System.Void">

-            <Messages>

-             <Message Id="0#" TypeName="ParameterNamesShouldMatchBaseDeclaration" Category="Microsoft.Naming" CheckId="CA1725" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>retries</Item>

-               <Item>FailoverSingleServer.setRetries(Int32):Void</Item>

-               <Item>maxRetries</Item>

-               <Item>FailoverMethod.setRetries(Int32):Void</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="toString():System.String">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>toString</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-        </Types>

-       </Namespace>

-       <Namespace Name="Qpid.Client.State">

-        <Types>

-         <Type Name="AMQState">

-          <Messages>

-           <Message TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-            <Issue Name="Type">

-             <Item>AMQState</Item>

-            </Issue>

-           </Message>

-          </Messages>

-          <Members>

-           <Member Name="ALL">

-            <Messages>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>AMQState.ALL</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CONNECTION_CLOSED">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>CONNECTION_CLOSED</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>AMQState.CONNECTION_CLOSED</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CONNECTION_CLOSING">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>CONNECTION_CLOSING</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>AMQState.CONNECTION_CLOSING</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CONNECTION_NOT_OPENED">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>CONNECTION_NOT_OPENED</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>AMQState.CONNECTION_NOT_OPENED</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CONNECTION_NOT_STARTED">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>CONNECTION_NOT_STARTED</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>AMQState.CONNECTION_NOT_STARTED</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CONNECTION_NOT_TUNED">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>CONNECTION_NOT_TUNED</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>AMQState.CONNECTION_NOT_TUNED</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CONNECTION_OPEN">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>CONNECTION_OPEN</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>AMQState.CONNECTION_OPEN</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="AMQStateChangedEvent">

-          <Messages>

-           <Message TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-            <Issue Name="Type">

-             <Item>AMQStateChangedEvent</Item>

-            </Issue>

-           </Message>

-          </Messages>

-         </Type>

-         <Type Name="AMQStateManager">

-          <Messages>

-           <Message TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-            <Issue Name="Type">

-             <Item>AMQStateManager</Item>

-            </Issue>

-           </Message>

-          </Messages>

-          <Members>

-           <Member Name="AttainState(Qpid.Client.State.AMQState):System.Void">

-            <Messages>

-             <Message Id="0#s" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="ParameterOneLetter">

-               <Item>AMQStateManager.AttainState(AMQState):Void</Item>

-               <Item>s</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="MethodReceived(Qpid.Client.Protocol.AMQMethodEvent):System.Boolean">

-            <Messages>

-             <Message Id="System.String.Format(System.String,System.Object,System.Object)" TypeName="SpecifyIFormatProvider" Category="Microsoft.Globalization" CheckId="CA1305" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>AMQStateManager.MethodReceived(AMQMethodEvent):Boolean</Item>

-               <Item>System.String.Format(System.String,System.Object,System.Object)</Item>

-               <Item>System.String.Format(System.IFormatProvider,System.String,System.Object[])</Item>

-              </Issue>

-             </Message>

-             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>'evt'</Item>

-               <Item>AMQStateManager.MethodReceived(AMQMethodEvent):Boolean</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="IAMQStateListener">

-          <Messages>

-           <Message TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-            <Issue Name="Type">

-             <Item>IAMQStateListener</Item>

-            </Issue>

-           </Message>

-          </Messages>

-          <Members>

-           <Member Name="StateChanged(Qpid.Client.State.AMQStateChangedEvent):System.Void">

-            <Messages>

-             <Message Id="0#evt" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>IAMQStateListener.StateChanged(AMQStateChangedEvent):Void</Item>

-               <Item>evt</Item>

-               <Item>evt</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="IllegalStateTransitionException">

-          <Messages>

-           <Message TypeName="ImplementStandardExceptionConstructors" Category="Microsoft.Design" CheckId="CA1032" Created="2006-12-04 13:11:47Z">

-            <Issue>

-             <Item>Qpid.Client.State.IllegalStateTransitionException</Item>

-             <Item>protected IllegalStateTransitionException(SerializationInfo, StreamingContext)</Item>

-            </Issue>

-            <Issue>

-             <Item>Qpid.Client.State.IllegalStateTransitionException</Item>

-             <Item>public IllegalStateTransitionException()</Item>

-            </Issue>

-            <Issue>

-             <Item>Qpid.Client.State.IllegalStateTransitionException</Item>

-             <Item>public IllegalStateTransitionException(String)</Item>

-            </Issue>

-            <Issue>

-             <Item>Qpid.Client.State.IllegalStateTransitionException</Item>

-             <Item>public IllegalStateTransitionException(String, Exception)</Item>

-            </Issue>

-           </Message>

-          </Messages>

-          <Members>

-           <Member Name=".ctor(Qpid.Client.State.AMQState,System.Type)">

-            <Messages>

-             <Message Id="Qpid.AMQException.#ctor(System.String)" TypeName="DoNotPassLiteralsAsLocalizedParameters" Category="Microsoft.Globalization" CheckId="CA1303" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>IllegalStateTransitionException.IllegalStateTransitionException(AMQState, Type)</Item>

-               <Item>1</Item>

-               <Item>AMQException.AMQException(String)</Item>

-               <Item>No valid state transition defined for receiving frame ____ from state __</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="IStateAwareMethodListener">

-          <Members>

-           <Member Name="MethodReceived(Qpid.Client.State.AMQStateManager,Qpid.Client.Protocol.AMQMethodEvent):System.Void">

-            <Messages>

-             <Message Id="1#evt" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>IStateAwareMethodListener.MethodReceived(AMQStateManager, AMQMethodEvent):Void</Item>

-               <Item>evt</Item>

-               <Item>evt</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="IStateListener">

-          <Members>

-           <Member Name="Error(System.Exception):System.Void">

-            <Messages>

-             <Message Id="0#e" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="ParameterOneLetter">

-               <Item>IStateListener.Error(Exception):Void</Item>

-               <Item>e</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="StateWaiter">

-          <Messages>

-           <Message TypeName="TypesThatOwnDisposableFieldsShouldBeDisposable" Category="Microsoft.Design" CheckId="CA1001" Created="2006-12-04 13:11:47Z" FixCategory="Breaking">

-            <Issue>

-             <Item>Qpid.Client.State.StateWaiter</Item>

-             <Item>System.Threading.ManualResetEvent</Item>

-            </Issue>

-           </Message>

-          </Messages>

-          <Members>

-           <Member Name="WaituntilStateHasChanged():System.Void">

-            <Messages>

-             <Message Id="Qpid.AMQException.#ctor(System.String,System.Exception)" TypeName="DoNotPassLiteralsAsLocalizedParameters" Category="Microsoft.Globalization" CheckId="CA1303" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>StateWaiter.WaituntilStateHasChanged():Void</Item>

-               <Item>1</Item>

-               <Item>AMQException.AMQException(String, Exception)</Item>

-               <Item>Error: __</Item>

-              </Issue>

-             </Message>

-             <Message Id="Waituntil" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>Waituntil</Item>

-               <Item>StateWaiter.WaituntilStateHasChanged():Void</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-        </Types>

-       </Namespace>

-       <Namespace Name="Qpid.Client.Transport">

-        <Types>

-         <Type Name="AmqpChannel">

-          <Messages>

-           <Message Id="Amqp" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-            <Issue Name="Type">

-             <Item>Amqp</Item>

-             <Item>Qpid.Client.Transport.AmqpChannel</Item>

-            </Issue>

-           </Message>

-          </Messages>

-          <Members>

-           <Member Name=".ctor(Qpid.Client.Transport.IByteChannel)">

-            <Messages>

-             <Message Id="0#" TypeName="AvoidTypeNamesInParameters" Category="Microsoft.Naming" CheckId="CA1720" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>byteChannel</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Read():System.Collections.Queue">

-            <Messages>

-             <Message Id="System.String.Format(System.String,System.Object)" TypeName="SpecifyIFormatProvider" Category="Microsoft.Globalization" CheckId="CA1305" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>AmqpChannel.Read():Queue</Item>

-               <Item>System.String.Format(System.String,System.Object)</Item>

-               <Item>System.String.Format(System.IFormatProvider,System.String,System.Object[])</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Write(Qpid.Framing.IDataBlock):System.Void">

-            <Messages>

-             <Message Id="System.String.Format(System.String,System.Object)" TypeName="SpecifyIFormatProvider" Category="Microsoft.Globalization" CheckId="CA1305" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>AmqpChannel.Write(IDataBlock):Void</Item>

-               <Item>System.String.Format(System.String,System.Object)</Item>

-               <Item>System.String.Format(System.IFormatProvider,System.String,System.Object[])</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="AMQProtocolProvider">

-          <Messages>

-           <Message TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-            <Issue Name="Type">

-             <Item>AMQProtocolProvider</Item>

-            </Issue>

-           </Message>

-          </Messages>

-         </Type>

-         <Type Name="IProtocolWriter">

-          <Members>

-           <Member Name="Write(Qpid.Framing.IDataBlock):System.Void">

-            <Messages>

-             <Message Id="0#o" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="ParameterOneLetter">

-               <Item>IProtocolWriter.Write(IDataBlock):Void</Item>

-               <Item>o</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="ITransport">

-          <Members>

-           <Member Name="getLocalEndPoint():System.String">

-            <Messages>

-             <Message Id="EndPoint" TypeName="CompoundWordsShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1702" Created="2006-12-04 13:11:47Z">

-              <Issue Name="ShouldBeDiscreteTerm">

-               <Item>EndPoint</Item>

-               <Item>method</Item>

-               <Item>getLocalEndPoint</Item>

-               <Item>Endpoint</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>getLocalEndPoint</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="SingleProtocolEncoderOutput">

-          <Members>

-           <Member Name="buffer">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>buffer</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Write(Qpid.Buffer.ByteBuffer):System.Void">

-            <Messages>

-             <Message Id="System.InvalidOperationException.#ctor(System.String)" TypeName="DoNotPassLiteralsAsLocalizedParameters" Category="Microsoft.Globalization" CheckId="CA1303" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>SingleProtocolEncoderOutput.Write(ByteBuffer):Void</Item>

-               <Item>1</Item>

-               <Item>InvalidOperationException.InvalidOperationException(String)</Item>

-               <Item>{0} does not allow the writing of more than one buffer</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-        </Types>

-       </Namespace>

-      </Namespaces>

-     </Module>

-    </Modules>

-   </Target>

-   <Target Name="$(ProjectDir)/Qpid.Client.Tests/bin/Debug/Qpid.Client.Tests.dll">

-    <Modules>

-     <Module Name="qpid.client.tests.dll">

-      <Messages>

-       <Message TypeName="AssembliesShouldDeclareMinimumSecurity" Category="Microsoft.Usage" CheckId="CA2209" Created="2006-12-04 13:11:47Z">

-        <Issue>

-         <Item>Qpid.Client.Tests</Item>

-        </Issue>

-       </Message>

-       <Message TypeName="AssembliesShouldHaveValidStrongNames" Category="Microsoft.Design" CheckId="CA2210" Created="2006-12-04 13:11:47Z">

-        <Issue Name="NoStrongName">

-         <Item>Qpid.Client.Tests</Item>

-        </Issue>

-       </Message>

-       <Message TypeName="MarkAssembliesWithClsCompliant" Category="Microsoft.Design" CheckId="CA1014" Created="2006-12-04 13:11:47Z">

-        <Issue Name="NoAttr">

-         <Item>Qpid.Client.Tests</Item>

-        </Issue>

-       </Message>

-      </Messages>

-      <Namespaces>

-       <Namespace Name="Qpid.Client.Tests">

-        <Types>

-         <Type Name="Avergager">

-          <Members>

-           <Member Name=".ctor()">

-            <Messages>

-             <Message TypeName="DoNotInitializeUnnecessarily" Category="Microsoft.Performance" CheckId="CA1805" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Avergager.Avergager()</Item>

-               <Item>num</Item>

-               <Item>System.Int64</Item>

-               <Item>0</Item>

-              </Issue>

-              <Issue>

-               <Item>Avergager.Avergager()</Item>

-               <Item>sum</Item>

-               <Item>System.Int64</Item>

-               <Item>0</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="ToString():System.String">

-            <Messages>

-             <Message Id="System.String.Format(System.String,System.Object,System.Object,System.Object)" TypeName="SpecifyIFormatProvider" Category="Microsoft.Globalization" CheckId="CA1305" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Avergager.ToString():String</Item>

-               <Item>System.String.Format(System.String,System.Object,System.Object,System.Object)</Item>

-               <Item>System.String.Format(System.IFormatProvider,System.String,System.Object[])</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="BaseMessagingTestFixture">

-          <Messages>

-           <Message TypeName="TypesThatOwnDisposableFieldsShouldBeDisposable" Category="Microsoft.Design" CheckId="CA1001" Created="2006-12-04 13:11:47Z" FixCategory="Breaking">

-            <Issue>

-             <Item>Qpid.Client.Tests.BaseMessagingTestFixture</Item>

-             <Item>Qpid.Client.AMQConnection</Item>

-            </Issue>

-           </Message>

-          </Messages>

-          <Members>

-           <Member Name="_channel">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>_channel</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>_channel</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="_connection">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>_connection</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>_connection</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Init():System.Void">

-            <Messages>

-             <Message TypeName="RethrowToPreserveStackDetails" Category="Microsoft.Usage" CheckId="CA2200" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>BaseMessagingTestFixture.Init():Void</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="HeadersMatchingConsumer">

-          <Messages>

-           <Message TypeName="TypesThatOwnDisposableFieldsShouldBeDisposable" Category="Microsoft.Design" CheckId="CA1001" Created="2006-12-04 13:11:47Z" FixCategory="Breaking">

-            <Issue>

-             <Item>Qpid.Client.Tests.HeadersMatchingConsumer</Item>

-             <Item>System.Threading.AutoResetEvent</Item>

-            </Issue>

-           </Message>

-          </Messages>

-          <Members>

-           <Member Name="CreatePatternAsFieldTable():Qpid.Framing.FieldTable">

-            <Messages>

-             <Message TypeName="MarkMembersAsStatic" Category="Microsoft.Performance" CheckId="CA1822" Created="2006-12-04 13:11:47Z" FixCategory="NonBreaking">

-              <Issue>

-               <Item>HeadersMatchingConsumer.CreatePatternAsFieldTable():FieldTable</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="OnException(System.Exception):System.Void">

-            <Messages>

-             <Message Id="0#e" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="ParameterOneLetter">

-               <Item>HeadersMatchingConsumer.OnException(Exception):Void</Item>

-               <Item>e</Item>

-              </Issue>

-             </Message>

-             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>'e'</Item>

-               <Item>HeadersMatchingConsumer.OnException(Exception):Void</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="OnMessage(Qpid.Messaging.IMessage):System.Void">

-            <Messages>

-             <Message Id="System.String.Format(System.String,System.Object)" TypeName="SpecifyIFormatProvider" Category="Microsoft.Globalization" CheckId="CA1305" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>HeadersMatchingConsumer.OnMessage(IMessage):Void</Item>

-               <Item>System.String.Format(System.String,System.Object)</Item>

-               <Item>System.String.Format(System.IFormatProvider,System.String,System.Object[])</Item>

-              </Issue>

-             </Message>

-             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>'message'</Item>

-               <Item>HeadersMatchingConsumer.OnMessage(IMessage):Void</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="ProducerMultiConsumer">

-          <Messages>

-           <Message Id="Multi" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-            <Issue Name="Type">

-             <Item>Multi</Item>

-             <Item>Qpid.Client.Tests.ProducerMultiConsumer</Item>

-            </Issue>

-           </Message>

-           <Message TypeName="TypesThatOwnDisposableFieldsShouldBeDisposable" Category="Microsoft.Design" CheckId="CA1001" Created="2006-12-04 13:11:47Z" FixCategory="Breaking">

-            <Issue>

-             <Item>Qpid.Client.Tests.ProducerMultiConsumer</Item>

-             <Item>System.Threading.AutoResetEvent</Item>

-            </Issue>

-           </Message>

-          </Messages>

-          <Members>

-           <Member Name=".ctor()">

-            <Messages>

-             <Message TypeName="DoNotInitializeUnnecessarily" Category="Microsoft.Performance" CheckId="CA1805" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>ProducerMultiConsumer.ProducerMultiConsumer()</Item>

-               <Item>_messageReceivedCount</Item>

-               <Item>System.Int32</Item>

-               <Item>0</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="OnMessage(Qpid.Messaging.IMessage):System.Void">

-            <Messages>

-             <Message Id="0#m" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="ParameterOneLetter">

-               <Item>ProducerMultiConsumer.OnMessage(IMessage):Void</Item>

-               <Item>m</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="RunTest():System.Void">

-            <Messages>

-             <Message TypeName="DoNotCatchGeneralExceptionTypes" Category="Microsoft.Design" CheckId="CA1031" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>ProducerMultiConsumer.RunTest():Void</Item>

-               <Item>System.Exception</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="ServiceProvidingClient">

-          <Messages>

-           <Message TypeName="TypesThatOwnDisposableFieldsShouldBeDisposable" Category="Microsoft.Design" CheckId="CA1001" Created="2006-12-04 13:11:47Z" FixCategory="Breaking">

-            <Issue>

-             <Item>Qpid.Client.Tests.ServiceProvidingClient</Item>

-             <Item>System.Threading.AutoResetEvent</Item>

-            </Issue>

-           </Message>

-          </Messages>

-          <Members>

-           <Member Name=".ctor()">

-            <Messages>

-             <Message TypeName="DoNotInitializeUnnecessarily" Category="Microsoft.Performance" CheckId="CA1805" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>ServiceProvidingClient.ServiceProvidingClient()</Item>

-               <Item>_selector</Item>

-               <Item>System.String</Item>

-               <Item>null</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="OnMessage(Qpid.Messaging.IMessage):System.Void">

-            <Messages>

-             <Message TypeName="RethrowToPreserveStackDetails" Category="Microsoft.Usage" CheckId="CA2200" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>ServiceProvidingClient.OnMessage(IMessage):Void</Item>

-              </Issue>

-              <Issue>

-               <Item>ServiceProvidingClient.OnMessage(IMessage):Void</Item>

-              </Issue>

-             </Message>

-             <Message Id="System.String.Format(System.String,System.Object,System.Object)" TypeName="SpecifyIFormatProvider" Category="Microsoft.Globalization" CheckId="CA1305" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>ServiceProvidingClient.OnMessage(IMessage):Void</Item>

-               <Item>System.String.Format(System.String,System.Object,System.Object)</Item>

-               <Item>System.String.Format(System.IFormatProvider,System.String,System.Object[])</Item>

-              </Issue>

-              <Issue>

-               <Item>ServiceProvidingClient.OnMessage(IMessage):Void</Item>

-               <Item>System.String.Format(System.String,System.Object,System.Object)</Item>

-               <Item>System.String.Format(System.IFormatProvider,System.String,System.Object[])</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="ServiceRequestingClient">

-          <Messages>

-           <Message TypeName="TypesThatOwnDisposableFieldsShouldBeDisposable" Category="Microsoft.Design" CheckId="CA1001" Created="2006-12-04 13:11:47Z" FixCategory="Breaking">

-            <Issue>

-             <Item>Qpid.Client.Tests.ServiceRequestingClient</Item>

-             <Item>System.Threading.AutoResetEvent</Item>

-            </Issue>

-           </Message>

-          </Messages>

-          <Members>

-           <Member Name="Main(System.String[]):System.Void">

-            <Messages>

-             <Message Id="args" TypeName="ReviewUnusedParameters" Category="Microsoft.Usage" CheckId="CA1801" Created="2006-12-04 13:11:47Z" FixCategory="Breaking">

-              <Issue>

-               <Item>args</Item>

-               <Item>ServiceRequestingClient.Main(String[]):Void</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="OnMessage(Qpid.Messaging.IMessage):System.Void">

-            <Messages>

-             <Message Id="System.Exception.#ctor(System.String)" TypeName="DoNotPassLiteralsAsLocalizedParameters" Category="Microsoft.Globalization" CheckId="CA1303" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>ServiceRequestingClient.OnMessage(IMessage):Void</Item>

-               <Item>1</Item>

-               <Item>Exception.Exception(String)</Item>

-               <Item>Set timeSent!</Item>

-              </Issue>

-             </Message>

-             <Message TypeName="DoNotRaiseReservedExceptionTypes" Category="Microsoft.Usage" CheckId="CA2201" Created="2006-12-04 13:11:47Z">

-              <Issue Name="TooGeneric">

-               <Item>ServiceRequestingClient.OnMessage(IMessage):Void</Item>

-               <Item>System.Exception</Item>

-              </Issue>

-             </Message>

-             <Message Id="0#m" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="ParameterOneLetter">

-               <Item>ServiceRequestingClient.OnMessage(IMessage):Void</Item>

-               <Item>m</Item>

-              </Issue>

-             </Message>

-             <Message Id="System.Int64.Parse(System.String)" TypeName="SpecifyIFormatProvider" Category="Microsoft.Globalization" CheckId="CA1305" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>ServiceRequestingClient.OnMessage(IMessage):Void</Item>

-               <Item>System.Int64.Parse(System.String)</Item>

-               <Item>System.Int64.Parse(System.String,System.IFormatProvider)</Item>

-              </Issue>

-             </Message>

-             <Message Id="System.String.Format(System.String,System.Object)" TypeName="SpecifyIFormatProvider" Category="Microsoft.Globalization" CheckId="CA1305" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>ServiceRequestingClient.OnMessage(IMessage):Void</Item>

-               <Item>System.String.Format(System.String,System.Object)</Item>

-               <Item>System.String.Format(System.IFormatProvider,System.String,System.Object[])</Item>

-              </Issue>

-              <Issue>

-               <Item>ServiceRequestingClient.OnMessage(IMessage):Void</Item>

-               <Item>System.String.Format(System.String,System.Object)</Item>

-               <Item>System.String.Format(System.IFormatProvider,System.String,System.Object[])</Item>

-              </Issue>

-             </Message>

-             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>'m'</Item>

-               <Item>ServiceRequestingClient.OnMessage(IMessage):Void</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="SendMessages():System.Void">

-            <Messages>

-             <Message TypeName="DoNotCatchGeneralExceptionTypes" Category="Microsoft.Design" CheckId="CA1031" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>ServiceRequestingClient.SendMessages():Void</Item>

-               <Item>System.Exception</Item>

-              </Issue>

-              <Issue>

-               <Item>ServiceRequestingClient.SendMessages():Void</Item>

-               <Item>System.Exception</Item>

-              </Issue>

-              <Issue>

-               <Item>ServiceRequestingClient.SendMessages():Void</Item>

-               <Item>System.Exception</Item>

-              </Issue>

-             </Message>

-             <Message Id="System.String.Format(System.String,System.Object)" TypeName="SpecifyIFormatProvider" Category="Microsoft.Globalization" CheckId="CA1305" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>ServiceRequestingClient.SendMessages():Void</Item>

-               <Item>System.String.Format(System.String,System.Object)</Item>

-               <Item>System.String.Format(System.IFormatProvider,System.String,System.Object[])</Item>

-              </Issue>

-              <Issue>

-               <Item>ServiceRequestingClient.SendMessages():Void</Item>

-               <Item>System.String.Format(System.String,System.Object)</Item>

-               <Item>System.String.Format(System.IFormatProvider,System.String,System.Object[])</Item>

-              </Issue>

-              <Issue>

-               <Item>ServiceRequestingClient.SendMessages():Void</Item>

-               <Item>System.String.Format(System.String,System.Object)</Item>

-               <Item>System.String.Format(System.IFormatProvider,System.String,System.Object[])</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="UndeliverableTest">

-          <Members>

-           <Member Name="OnException(System.Exception):System.Void">

-            <Messages>

-             <Message TypeName="DoNotCastUnnecessarily" Category="Microsoft.Performance" CheckId="CA1800" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>e</Item>

-               <Item>Qpid.Messaging.QpidException</Item>

-               <Item>UndeliverableTest.OnException(Exception):Void</Item>

-               <Item>castclass</Item>

-              </Issue>

-             </Message>

-             <Message Id="0#e" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="ParameterOneLetter">

-               <Item>UndeliverableTest.OnException(Exception):Void</Item>

-               <Item>e</Item>

-              </Issue>

-             </Message>

-             <Message Id="System.String.Format(System.String,System.Object)" TypeName="SpecifyIFormatProvider" Category="Microsoft.Globalization" CheckId="CA1305" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>UndeliverableTest.OnException(Exception):Void</Item>

-               <Item>System.String.Format(System.String,System.Object)</Item>

-               <Item>System.String.Format(System.IFormatProvider,System.String,System.Object[])</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-        </Types>

-       </Namespace>

-       <Namespace Name="Qpid.Client.Tests.connection">

-        <Types>

-         <Type Name="ConnectionTest">

-          <Members>

-           <Member Name="passwordFailureConnection():System.Void">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>passwordFailureConnection</Item>

-              </Issue>

-             </Message>

-             <Message TypeName="MarkMembersAsStatic" Category="Microsoft.Performance" CheckId="CA1822" Created="2006-12-04 13:11:47Z" FixCategory="Breaking">

-              <Issue>

-               <Item>ConnectionTest.passwordFailureConnection():Void</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="simpleConnection():System.Void">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>simpleConnection</Item>

-              </Issue>

-             </Message>

-             <Message TypeName="MarkMembersAsStatic" Category="Microsoft.Performance" CheckId="CA1822" Created="2006-12-04 13:11:47Z" FixCategory="Breaking">

-              <Issue>

-               <Item>ConnectionTest.simpleConnection():Void</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-        </Types>

-       </Namespace>

-       <Namespace Name="Qpid.Client.Tests.failover">

-        <Types>

-         <Type Name="FailoverTest">

-          <Members>

-           <Member Name="DoFailoverTest(Qpid.Messaging.IConnection):System.Void">

-            <Messages>

-             <Message Id="Qpid.Client.Tests.failover.FailoverTest+MsgListener" TypeName="DoNotIgnoreMethodResults" Category="Microsoft.Usage" CheckId="CA1806" Created="2006-12-04 13:11:47Z">

-              <Issue Name="ObjectCreation">

-               <Item>FailoverTest.DoFailoverTest(IConnection):Void</Item>

-               <Item>Qpid.Client.Tests.failover.FailoverTest+MsgListener</Item>

-              </Issue>

-             </Message>

-             <Message Id="System.String.Format(System.String,System.Object)" TypeName="SpecifyIFormatProvider" Category="Microsoft.Globalization" CheckId="CA1305" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>FailoverTest.DoFailoverTest(IConnection):Void</Item>

-               <Item>System.String.Format(System.String,System.Object)</Item>

-               <Item>System.String.Format(System.IFormatProvider,System.String,System.Object[])</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="OnMessage(Qpid.Messaging.IMessage):System.Void">

-            <Messages>

-             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>'message'</Item>

-               <Item>FailoverTest.OnMessage(IMessage):Void</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="TestWithBasicInfo():System.Void">

-            <Messages>

-             <Message TypeName="DoNotCatchGeneralExceptionTypes" Category="Microsoft.Design" CheckId="CA1031" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>FailoverTest.TestWithBasicInfo():Void</Item>

-               <Item>System.Exception</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="FailoverTest+MsgListener">

-          <Members>

-           <Member Name="init(Qpid.Messaging.IMessage):Qpid.Messaging.IMessagePublisher">

-            <Messages>

-             <Message Id="System.String.Format(System.String,System.Object,System.Object)" TypeName="SpecifyIFormatProvider" Category="Microsoft.Globalization" CheckId="CA1305" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>MsgListener.init(IMessage):IMessagePublisher</Item>

-               <Item>System.String.Format(System.String,System.Object,System.Object)</Item>

-               <Item>System.String.Format(System.IFormatProvider,System.String,System.Object[])</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="FailoverTxTest">

-          <Messages>

-           <Message TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-            <Issue Name="Type">

-             <Item>Tx</Item>

-             <Item>Qpid.Client.Tests.failover.FailoverTxTest</Item>

-            </Issue>

-           </Message>

-           <Message TypeName="TypesThatOwnDisposableFieldsShouldBeDisposable" Category="Microsoft.Design" CheckId="CA1001" Created="2006-12-04 13:11:47Z" FixCategory="Breaking">

-            <Issue>

-             <Item>Qpid.Client.Tests.failover.FailoverTxTest</Item>

-             <Item>Qpid.Client.AMQConnection</Item>

-            </Issue>

-           </Message>

-          </Messages>

-          <Members>

-           <Member Name="OnMessage(Qpid.Messaging.IMessage):System.Void">

-            <Messages>

-             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>'message'</Item>

-               <Item>FailoverTxTest.OnMessage(IMessage):Void</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="TestWithBasicInfo():System.Void">

-            <Messages>

-             <Message TypeName="DoNotCatchGeneralExceptionTypes" Category="Microsoft.Design" CheckId="CA1031" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>FailoverTxTest.TestWithBasicInfo():Void</Item>

-               <Item>System.Exception</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-        </Types>

-       </Namespace>

-       <Namespace Name="Qpid.Client.Transport">

-        <Types>

-         <Type Name="BlockingIo">

-          <Messages>

-           <Message TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-            <Issue Name="Type">

-             <Item>Io</Item>

-             <Item>Qpid.Client.Transport.BlockingIo</Item>

-            </Issue>

-           </Message>

-          </Messages>

-          <Members>

-           <Member Name="connectFromOutside():System.Void">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>connectFromOutside</Item>

-              </Issue>

-             </Message>

-             <Message TypeName="MarkMembersAsStatic" Category="Microsoft.Performance" CheckId="CA1822" Created="2006-12-04 13:11:47Z" FixCategory="Breaking">

-              <Issue>

-               <Item>BlockingIo.connectFromOutside():Void</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="connectionAndSleepForHeartbeats():System.Void">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>connectionAndSleepForHeartbeats</Item>

-              </Issue>

-             </Message>

-             <Message TypeName="MarkMembersAsStatic" Category="Microsoft.Performance" CheckId="CA1822" Created="2006-12-04 13:11:47Z" FixCategory="Breaking">

-              <Issue>

-               <Item>BlockingIo.connectionAndSleepForHeartbeats():Void</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="regularConnection():System.Void">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>regularConnection</Item>

-              </Issue>

-             </Message>

-             <Message TypeName="MarkMembersAsStatic" Category="Microsoft.Performance" CheckId="CA1822" Created="2006-12-04 13:11:47Z" FixCategory="Breaking">

-              <Issue>

-               <Item>BlockingIo.regularConnection():Void</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-        </Types>

-       </Namespace>

-      </Namespaces>

-     </Module>

-    </Modules>

-   </Target>

-   <Target Name="$(ProjectDir)/Qpid.Client.Tests/bin/Debug/Qpid.Client.Transport.Socket.Blocking.dll">

-    <Modules>

-     <Module Name="qpid.client.transport.socket.blocking.dll">

-      <Messages>

-       <Message TypeName="AssembliesShouldDeclareMinimumSecurity" Category="Microsoft.Usage" CheckId="CA2209" Created="2006-12-04 13:11:47Z">

-        <Issue>

-         <Item>Qpid.Client.Transport.Socket.Blocking</Item>

-        </Issue>

-       </Message>

-       <Message TypeName="AssembliesShouldHaveValidStrongNames" Category="Microsoft.Design" CheckId="CA2210" Created="2006-12-04 13:11:47Z">

-        <Issue Name="NoStrongName">

-         <Item>Qpid.Client.Transport.Socket.Blocking</Item>

-        </Issue>

-       </Message>

-       <Message TypeName="MarkAssembliesWithClsCompliant" Category="Microsoft.Design" CheckId="CA1014" Created="2006-12-04 13:11:47Z">

-        <Issue Name="NoAttr">

-         <Item>Qpid.Client.Transport.Socket.Blocking</Item>

-        </Issue>

-       </Message>

-      </Messages>

-      <Namespaces>

-       <Namespace Name="Qpid.Client.Transport.Socket.Blocking">

-        <Types>

-         <Type Name="BlockingSocketProcessor">

-          <Members>

-           <Member Name="Write(Qpid.Buffer.ByteBuffer):System.Void">

-            <Messages>

-             <Message TypeName="DoNotCatchGeneralExceptionTypes" Category="Microsoft.Design" CheckId="CA1031" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>BlockingSocketProcessor.Write(ByteBuffer):Void</Item>

-               <Item>System.Exception</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="BlockingSocketTransport">

-          <Members>

-           <Member Name=".ctor(System.String,System.Int32,Qpid.Client.AMQConnection)">

-            <Messages>

-             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>'connection'</Item>

-               <Item>BlockingSocketTransport.BlockingSocketTransport(String, Int32, AMQConnection)</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="_log">

-            <Messages>

-             <Message TypeName="AvoidUnusedPrivateFields" Category="Microsoft.Performance" CheckId="CA1823" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>BlockingSocketTransport._log</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="BlockingSocketTransport+ReaderRunner">

-          <Members>

-           <Member Name="Run():System.Void">

-            <Messages>

-             <Message TypeName="DoNotCatchGeneralExceptionTypes" Category="Microsoft.Design" CheckId="CA1031" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>ReaderRunner.Run():Void</Item>

-               <Item>System.Exception</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="ByteChannel">

-          <Members>

-           <Member Name="Read():Qpid.Buffer.ByteBuffer">

-            <Messages>

-             <Message Id="System.String.Format(System.String,System.Object)" TypeName="SpecifyIFormatProvider" Category="Microsoft.Globalization" CheckId="CA1305" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>ByteChannel.Read():ByteBuffer</Item>

-               <Item>System.String.Format(System.String,System.Object)</Item>

-               <Item>System.String.Format(System.IFormatProvider,System.String,System.Object[])</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Write(Qpid.Buffer.ByteBuffer):System.Void">

-            <Messages>

-             <Message Id="System.String.Format(System.String,System.Object)" TypeName="SpecifyIFormatProvider" Category="Microsoft.Globalization" CheckId="CA1305" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>ByteChannel.Write(ByteBuffer):Void</Item>

-               <Item>System.String.Format(System.String,System.Object)</Item>

-               <Item>System.String.Format(System.IFormatProvider,System.String,System.Object[])</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-        </Types>

-       </Namespace>

-      </Namespaces>

-     </Module>

-    </Modules>

-   </Target>

-   <Target Name="$(ProjectDir)/Qpid.Client.Tests/bin/Debug/Qpid.Codec.dll">

-    <Modules>

-     <Module Name="qpid.codec.dll">

-      <Messages>

-       <Message TypeName="AssembliesShouldDeclareMinimumSecurity" Category="Microsoft.Usage" CheckId="CA2209" Created="2006-12-04 13:11:47Z">

-        <Issue>

-         <Item>Qpid.Codec</Item>

-        </Issue>

-       </Message>

-       <Message TypeName="AssembliesShouldHaveValidStrongNames" Category="Microsoft.Design" CheckId="CA2210" Created="2006-12-04 13:11:47Z">

-        <Issue Name="NoStrongName">

-         <Item>Qpid.Codec</Item>

-        </Issue>

-       </Message>

-       <Message TypeName="MarkAssembliesWithClsCompliant" Category="Microsoft.Design" CheckId="CA1014" Created="2006-12-04 13:11:47Z">

-        <Issue Name="NoAttr">

-         <Item>Qpid.Codec</Item>

-        </Issue>

-       </Message>

-      </Messages>

-      <Namespaces>

-       <Namespace Name="Qpid.Codec">

-        <Types>

-         <Type Name="CumulativeProtocolDecoder">

-          <Members>

-           <Member Name="DecodeAll(Qpid.Buffer.ByteBuffer,Qpid.Codec.IProtocolDecoderOutput):System.Void">

-            <Messages>

-             <Message Id="System.Exception.#ctor(System.String)" TypeName="DoNotPassLiteralsAsLocalizedParameters" Category="Microsoft.Globalization" CheckId="CA1303" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>CumulativeProtocolDecoder.DecodeAll(ByteBuffer, IProtocolDecoderOutput):Void</Item>

-               <Item>1</Item>

-               <Item>Exception.Exception(String)</Item>

-               <Item>doDecode() can't return true when buffer is not consumed.</Item>

-              </Issue>

-             </Message>

-             <Message TypeName="DoNotRaiseReservedExceptionTypes" Category="Microsoft.Usage" CheckId="CA2201" Created="2006-12-04 13:11:47Z">

-              <Issue Name="TooGeneric">

-               <Item>CumulativeProtocolDecoder.DecodeAll(ByteBuffer, IProtocolDecoderOutput):Void</Item>

-               <Item>System.Exception</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Dispose():System.Void">

-            <Messages>

-             <Message TypeName="ImplementIDisposableCorrectly" Category="Microsoft.Design" CheckId="CA1063" Created="2006-12-04 13:11:47Z">

-              <Issue Name="DisposeImplementation">

-               <Item>CumulativeProtocolDecoder.Dispose():Void</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="IProtocolEncoderOutput">

-          <Members>

-           <Member Name="Write(Qpid.Buffer.ByteBuffer):System.Void">

-            <Messages>

-             <Message Id="0#buf" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>IProtocolEncoderOutput.Write(ByteBuffer):Void</Item>

-               <Item>buf</Item>

-               <Item>buf</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="ProtocolCodecException">

-          <Messages>

-           <Message TypeName="ImplementStandardExceptionConstructors" Category="Microsoft.Design" CheckId="CA1032" Created="2006-12-04 13:11:47Z">

-            <Issue>

-             <Item>Qpid.Codec.ProtocolCodecException</Item>

-             <Item>protected ProtocolCodecException(SerializationInfo, StreamingContext)</Item>

-            </Issue>

-            <Issue>

-             <Item>Qpid.Codec.ProtocolCodecException</Item>

-             <Item>public ProtocolCodecException(String, Exception)</Item>

-            </Issue>

-           </Message>

-           <Message TypeName="MarkISerializableTypesWithSerializable" Category="Microsoft.Usage" CheckId="CA2237" Created="2006-12-04 13:11:47Z">

-            <Issue Level="Error">

-             <Item>ProtocolCodecException</Item>

-            </Issue>

-           </Message>

-          </Messages>

-          <Members>

-           <Member Name=".ctor(System.Exception)">

-            <Messages>

-             <Message Id="System.Exception.#ctor(System.String,System.Exception)" TypeName="DoNotPassLiteralsAsLocalizedParameters" Category="Microsoft.Globalization" CheckId="CA1303" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>ProtocolCodecException.ProtocolCodecException(Exception)</Item>

-               <Item>1</Item>

-               <Item>Exception.Exception(String, Exception)</Item>

-               <Item>Codec Exception</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="ProtocolDecoderException">

-          <Messages>

-           <Message TypeName="ImplementStandardExceptionConstructors" Category="Microsoft.Design" CheckId="CA1032" Created="2006-12-04 13:11:47Z">

-            <Issue>

-             <Item>Qpid.Codec.ProtocolDecoderException</Item>

-             <Item>protected ProtocolDecoderException(SerializationInfo, StreamingContext)</Item>

-            </Issue>

-            <Issue>

-             <Item>Qpid.Codec.ProtocolDecoderException</Item>

-             <Item>public ProtocolDecoderException(String, Exception)</Item>

-            </Issue>

-           </Message>

-          </Messages>

-         </Type>

-         <Type Name="ProtocolEncoderException">

-          <Messages>

-           <Message TypeName="ImplementStandardExceptionConstructors" Category="Microsoft.Design" CheckId="CA1032" Created="2006-12-04 13:11:47Z">

-            <Issue>

-             <Item>Qpid.Codec.ProtocolEncoderException</Item>

-             <Item>protected ProtocolEncoderException(SerializationInfo, StreamingContext)</Item>

-            </Issue>

-            <Issue>

-             <Item>Qpid.Codec.ProtocolEncoderException</Item>

-             <Item>public ProtocolEncoderException(String, Exception)</Item>

-            </Issue>

-           </Message>

-          </Messages>

-         </Type>

-        </Types>

-       </Namespace>

-       <Namespace Name="Qpid.Codec.Demux">

-        <Types>

-         <Type Name="DemuxingProtocolCodecFactory">

-          <Messages>

-           <Message Id="Demuxing" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-            <Issue Name="Type">

-             <Item>Demuxing</Item>

-             <Item>Qpid.Codec.Demux.DemuxingProtocolCodecFactory</Item>

-            </Issue>

-           </Message>

-          </Messages>

-          <Members>

-           <Member Name="DisposeCodecResources():System.Void">

-            <Messages>

-             <Message TypeName="MarkMembersAsStatic" Category="Microsoft.Performance" CheckId="CA1822" Created="2006-12-04 13:11:47Z" FixCategory="Breaking">

-              <Issue>

-               <Item>DemuxingProtocolCodecFactory.DisposeCodecResources():Void</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Register(System.Type):System.Void">

-            <Messages>

-             <Message Id="System.ArgumentException.#ctor(System.String)" TypeName="DoNotPassLiteralsAsLocalizedParameters" Category="Microsoft.Globalization" CheckId="CA1303" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>DemuxingProtocolCodecFactory.Register(Type):Void</Item>

-               <Item>1</Item>

-               <Item>ArgumentException.ArgumentException(String)</Item>

-               <Item>Unregisterable type: __</Item>

-              </Issue>

-             </Message>

-             <Message Id="Unregisterable" TypeName="LiteralsShouldBeSpelledCorrectly" Category="Microsoft.Usage" CheckId="CA2204" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Unregisterable</Item>

-               <Item>Unregisterable type: __</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="DemuxingProtocolCodecFactory+DefaultConstructorMessageDecoderFactory">

-          <Members>

-           <Member Name=".ctor(System.Type)">

-            <Messages>

-             <Message Id="System.ArgumentException.#ctor(System.String)" TypeName="DoNotPassLiteralsAsLocalizedParameters" Category="Microsoft.Globalization" CheckId="CA1303" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>DefaultConstructorMessageDecoderFactory.DefaultConstructorMessageDecoderFactory(Type)</Item>

-               <Item>1</Item>

-               <Item>ArgumentException.ArgumentException(String)</Item>

-               <Item>decoderClass is not assignable to MessageDecoder</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="NewDecoder():Qpid.Codec.Demux.IMessageDecoder">

-            <Messages>

-             <Message Id="System.Exception.#ctor(System.String,System.Exception)" TypeName="DoNotPassLiteralsAsLocalizedParameters" Category="Microsoft.Globalization" CheckId="CA1303" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>DefaultConstructorMessageDecoderFactory.NewDecoder():IMessageDecoder</Item>

-               <Item>1</Item>

-               <Item>Exception.Exception(String, Exception)</Item>

-               <Item>Failed to create a new instance of __</Item>

-              </Issue>

-             </Message>

-             <Message TypeName="DoNotRaiseReservedExceptionTypes" Category="Microsoft.Usage" CheckId="CA2201" Created="2006-12-04 13:11:47Z">

-              <Issue Name="TooGeneric">

-               <Item>DefaultConstructorMessageDecoderFactory.NewDecoder():IMessageDecoder</Item>

-               <Item>System.Exception</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="DemuxingProtocolCodecFactory+DefaultConstructorMessageEncoderFactory">

-          <Members>

-           <Member Name=".ctor(System.Type)">

-            <Messages>

-             <Message Id="System.ArgumentException.#ctor(System.String)" TypeName="DoNotPassLiteralsAsLocalizedParameters" Category="Microsoft.Globalization" CheckId="CA1303" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>DefaultConstructorMessageEncoderFactory.DefaultConstructorMessageEncoderFactory(Type)</Item>

-               <Item>1</Item>

-               <Item>ArgumentException.ArgumentException(String)</Item>

-               <Item>encoderClass is not assignable to MessageEncoder</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="NewEncoder():Qpid.Codec.Demux.IMessageEncoder">

-            <Messages>

-             <Message Id="System.Exception.#ctor(System.String,System.Exception)" TypeName="DoNotPassLiteralsAsLocalizedParameters" Category="Microsoft.Globalization" CheckId="CA1303" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>DefaultConstructorMessageEncoderFactory.NewEncoder():IMessageEncoder</Item>

-               <Item>1</Item>

-               <Item>Exception.Exception(String, Exception)</Item>

-               <Item>Failed to create a new instance of __</Item>

-              </Issue>

-             </Message>

-             <Message TypeName="DoNotRaiseReservedExceptionTypes" Category="Microsoft.Usage" CheckId="CA2201" Created="2006-12-04 13:11:47Z">

-              <Issue Name="TooGeneric">

-               <Item>DefaultConstructorMessageEncoderFactory.NewEncoder():IMessageEncoder</Item>

-               <Item>System.Exception</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="DemuxingProtocolCodecFactory+ProtocolDecoderImpl">

-          <Members>

-           <Member Name="DoDecode(Qpid.Buffer.ByteBuffer,Qpid.Codec.IProtocolDecoderOutput):System.Boolean">

-            <Messages>

-             <Message Id="Qpid.Codec.ProtocolDecoderException.#ctor(System.String)" TypeName="DoNotPassLiteralsAsLocalizedParameters" Category="Microsoft.Globalization" CheckId="CA1303" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>ProtocolDecoderImpl.DoDecode(ByteBuffer, IProtocolDecoderOutput):Boolean</Item>

-               <Item>1</Item>

-               <Item>ProtocolDecoderException.ProtocolDecoderException(String)</Item>

-               <Item>Message decoder returned NOT_OK.</Item>

-              </Issue>

-             </Message>

-             <Message Id="System.Exception.#ctor(System.String)" TypeName="DoNotPassLiteralsAsLocalizedParameters" Category="Microsoft.Globalization" CheckId="CA1303" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>ProtocolDecoderImpl.DoDecode(ByteBuffer, IProtocolDecoderOutput):Boolean</Item>

-               <Item>1</Item>

-               <Item>Exception.Exception(String)</Item>

-               <Item>Unexpected decode result (see your decode()): __</Item>

-              </Issue>

-             </Message>

-             <Message TypeName="DoNotRaiseReservedExceptionTypes" Category="Microsoft.Usage" CheckId="CA2201" Created="2006-12-04 13:11:47Z">

-              <Issue Name="TooGeneric">

-               <Item>ProtocolDecoderImpl.DoDecode(ByteBuffer, IProtocolDecoderOutput):Boolean</Item>

-               <Item>System.Exception</Item>

-              </Issue>

-              <Issue Name="TooGeneric">

-               <Item>ProtocolDecoderImpl.DoDecode(ByteBuffer, IProtocolDecoderOutput):Boolean</Item>

-               <Item>System.Exception</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="MessageDecoderResult">

-          <Members>

-           <Member Name="NEED_DATA">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>NEED_DATA</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>MessageDecoderResult.NEED_DATA</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="NOT_OK">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>NOT_OK</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberOk">

-               <Item>MessageDecoderResult.NOT_OK</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="OK">

-            <Messages>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberOk">

-               <Item>MessageDecoderResult.OK</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-        </Types>

-       </Namespace>

-      </Namespaces>

-     </Module>

-    </Modules>

-   </Target>

-   <Target Name="$(ProjectDir)/Qpid.Client.Tests/bin/Debug/Qpid.Common.dll">

-    <Modules>

-     <Module Name="qpid.common.dll">

-      <Messages>

-       <Message TypeName="AssembliesShouldDeclareMinimumSecurity" Category="Microsoft.Usage" CheckId="CA2209" Created="2006-12-04 13:11:47Z">

-        <Issue>

-         <Item>Qpid.Common</Item>

-        </Issue>

-       </Message>

-       <Message TypeName="AssembliesShouldHaveValidStrongNames" Category="Microsoft.Design" CheckId="CA2210" Created="2006-12-04 13:11:47Z">

-        <Issue Name="NoStrongName">

-         <Item>Qpid.Common</Item>

-        </Issue>

-       </Message>

-       <Message TypeName="MarkAssembliesWithClsCompliant" Category="Microsoft.Design" CheckId="CA1014" Created="2006-12-04 13:11:47Z">

-        <Issue Name="NoAttr">

-         <Item>Qpid.Common</Item>

-        </Issue>

-       </Message>

-      </Messages>

-      <Namespaces>

-       <Namespace Name="Qpid">

-        <Types>

-         <Type Name="AMQChannelClosedException">

-          <Messages>

-           <Message TypeName="ImplementStandardExceptionConstructors" Category="Microsoft.Design" CheckId="CA1032" Created="2006-12-04 13:11:47Z">

-            <Issue>

-             <Item>Qpid.AMQChannelClosedException</Item>

-             <Item>protected AMQChannelClosedException(SerializationInfo, StreamingContext)</Item>

-            </Issue>

-            <Issue>

-             <Item>Qpid.AMQChannelClosedException</Item>

-             <Item>public AMQChannelClosedException()</Item>

-            </Issue>

-            <Issue>

-             <Item>Qpid.AMQChannelClosedException</Item>

-             <Item>public AMQChannelClosedException(String)</Item>

-            </Issue>

-            <Issue>

-             <Item>Qpid.AMQChannelClosedException</Item>

-             <Item>public AMQChannelClosedException(String, Exception)</Item>

-            </Issue>

-           </Message>

-           <Message TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-            <Issue Name="Type">

-             <Item>AMQChannelClosedException</Item>

-            </Issue>

-           </Message>

-          </Messages>

-         </Type>

-         <Type Name="AMQConnectionClosedException">

-          <Messages>

-           <Message TypeName="ImplementStandardExceptionConstructors" Category="Microsoft.Design" CheckId="CA1032" Created="2006-12-04 13:11:47Z">

-            <Issue>

-             <Item>Qpid.AMQConnectionClosedException</Item>

-             <Item>protected AMQConnectionClosedException(SerializationInfo, StreamingContext)</Item>

-            </Issue>

-            <Issue>

-             <Item>Qpid.AMQConnectionClosedException</Item>

-             <Item>public AMQConnectionClosedException()</Item>

-            </Issue>

-            <Issue>

-             <Item>Qpid.AMQConnectionClosedException</Item>

-             <Item>public AMQConnectionClosedException(String)</Item>

-            </Issue>

-            <Issue>

-             <Item>Qpid.AMQConnectionClosedException</Item>

-             <Item>public AMQConnectionClosedException(String, Exception)</Item>

-            </Issue>

-           </Message>

-           <Message TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-            <Issue Name="Type">

-             <Item>AMQConnectionClosedException</Item>

-            </Issue>

-           </Message>

-          </Messages>

-         </Type>

-         <Type Name="AMQDisconnectedException">

-          <Messages>

-           <Message TypeName="ImplementStandardExceptionConstructors" Category="Microsoft.Design" CheckId="CA1032" Created="2006-12-04 13:11:47Z">

-            <Issue>

-             <Item>Qpid.AMQDisconnectedException</Item>

-             <Item>protected AMQDisconnectedException(SerializationInfo, StreamingContext)</Item>

-            </Issue>

-            <Issue>

-             <Item>Qpid.AMQDisconnectedException</Item>

-             <Item>public AMQDisconnectedException()</Item>

-            </Issue>

-            <Issue>

-             <Item>Qpid.AMQDisconnectedException</Item>

-             <Item>public AMQDisconnectedException(String, Exception)</Item>

-            </Issue>

-           </Message>

-           <Message TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-            <Issue Name="Type">

-             <Item>AMQDisconnectedException</Item>

-            </Issue>

-           </Message>

-          </Messages>

-         </Type>

-         <Type Name="AMQException">

-          <Messages>

-           <Message TypeName="ImplementStandardExceptionConstructors" Category="Microsoft.Design" CheckId="CA1032" Created="2006-12-04 13:11:47Z">

-            <Issue>

-             <Item>Qpid.AMQException</Item>

-             <Item>protected AMQException(SerializationInfo, StreamingContext)</Item>

-            </Issue>

-            <Issue>

-             <Item>Qpid.AMQException</Item>

-             <Item>public AMQException()</Item>

-            </Issue>

-           </Message>

-           <Message TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-            <Issue Name="Type">

-             <Item>AMQException</Item>

-            </Issue>

-           </Message>

-           <Message TypeName="MarkISerializableTypesWithSerializable" Category="Microsoft.Usage" CheckId="CA2237" Created="2006-12-04 13:11:47Z">

-            <Issue Level="Error">

-             <Item>AMQException</Item>

-            </Issue>

-           </Message>

-          </Messages>

-          <Members>

-           <Member Name=".ctor(log4net.ILog,System.Int32,System.String)">

-            <Messages>

-             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>'logger'</Item>

-               <Item>AMQException.AMQException(ILog, Int32, String)</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name=".ctor(log4net.ILog,System.Int32,System.String,System.Exception)">

-            <Messages>

-             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>'logger'</Item>

-               <Item>AMQException.AMQException(ILog, Int32, String, Exception)</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name=".ctor(log4net.ILog,System.String)">

-            <Messages>

-             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>'logger'</Item>

-               <Item>AMQException.AMQException(ILog, String)</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name=".ctor(log4net.ILog,System.String,System.Exception)">

-            <Messages>

-             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>'logger'</Item>

-               <Item>AMQException.AMQException(ILog, String, Exception)</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="AMQUndeliveredException">

-          <Messages>

-           <Message TypeName="ImplementStandardExceptionConstructors" Category="Microsoft.Design" CheckId="CA1032" Created="2006-12-04 13:11:47Z">

-            <Issue>

-             <Item>Qpid.AMQUndeliveredException</Item>

-             <Item>protected AMQUndeliveredException(SerializationInfo, StreamingContext)</Item>

-            </Issue>

-            <Issue>

-             <Item>Qpid.AMQUndeliveredException</Item>

-             <Item>public AMQUndeliveredException()</Item>

-            </Issue>

-            <Issue>

-             <Item>Qpid.AMQUndeliveredException</Item>

-             <Item>public AMQUndeliveredException(String)</Item>

-            </Issue>

-            <Issue>

-             <Item>Qpid.AMQUndeliveredException</Item>

-             <Item>public AMQUndeliveredException(String, Exception)</Item>

-            </Issue>

-           </Message>

-           <Message TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-            <Issue Name="Type">

-             <Item>AMQUndeliveredException</Item>

-            </Issue>

-           </Message>

-          </Messages>

-          <Members>

-           <Member Name="GetUndeliveredMessage():System.Object">

-            <Messages>

-             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2006-12-04 13:11:47Z">

-              <Issue Certainty="50">

-               <Item>GetUndeliveredMessage</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-        </Types>

-       </Namespace>

-       <Namespace Name="Qpid.Collections">

-        <Types>

-         <Type Name="BlockingQueue">

-          <Members>

-           <Member Name="EnqueueBlocking(System.Object):System.Void">

-            <Messages>

-             <Message Id="0#e" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="ParameterOneLetter">

-               <Item>BlockingQueue.EnqueueBlocking(Object):Void</Item>

-               <Item>e</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="EnqueueNoThrow(System.Object):System.Boolean">

-            <Messages>

-             <Message Id="0#e" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="ParameterOneLetter">

-               <Item>BlockingQueue.EnqueueNoThrow(Object):Boolean</Item>

-               <Item>e</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="LinkedBlockingQueue">

-          <Messages>

-           <Message TypeName="ICollectionImplementationsHaveStronglyTypedMembers" Category="Microsoft.Design" CheckId="CA1035" Created="2006-12-04 13:11:47Z">

-            <Issue>

-             <Item>LinkedBlockingQueue</Item>

-            </Issue>

-           </Message>

-          </Messages>

-          <Members>

-           <Member Name=".ctor(System.Int32)">

-            <Messages>

-             <Message Id="System.ArgumentException.#ctor(System.String)" TypeName="DoNotPassLiteralsAsLocalizedParameters" Category="Microsoft.Globalization" CheckId="CA1303" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>LinkedBlockingQueue.LinkedBlockingQueue(Int32)</Item>

-               <Item>1</Item>

-               <Item>ArgumentException.ArgumentException(String)</Item>

-               <Item>Capacity must be positive, was passed __</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="EnqueueBlocking(System.Object):System.Void">

-            <Messages>

-             <Message TypeName="InstantiateArgumentExceptionsCorrectly" Category="Microsoft.Usage" CheckId="CA2208" Created="2006-12-04 13:11:47Z">

-              <Issue Name="OneArgumentShouldBeParameterName">

-               <Item>System.ArgumentNullException</Item>

-               <Item>ArgumentNullException.ArgumentNullException(String)</Item>

-               <Item>Object must not be null</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="EnqueueNoThrow(System.Object):System.Boolean">

-            <Messages>

-             <Message TypeName="InstantiateArgumentExceptionsCorrectly" Category="Microsoft.Usage" CheckId="CA2208" Created="2006-12-04 13:11:47Z">

-              <Issue Name="OneArgumentShouldBeParameterName">

-               <Item>System.ArgumentNullException</Item>

-               <Item>ArgumentNullException.ArgumentNullException(String)</Item>

-               <Item>e must not be null</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="LinkedHashtable">

-          <Messages>

-           <Message TypeName="ICollectionImplementationsHaveStronglyTypedMembers" Category="Microsoft.Design" CheckId="CA1035" Created="2006-12-04 13:11:47Z">

-            <Issue>

-             <Item>LinkedHashtable</Item>

-            </Issue>

-           </Message>

-           <Message TypeName="IdentifiersShouldHaveCorrectSuffix" Category="Microsoft.Naming" CheckId="CA1710" Created="2006-12-04 13:11:47Z">

-            <Issue>

-             <Item>Qpid.Collections.LinkedHashtable</Item>

-             <Item>Dictionary</Item>

-            </Issue>

-           </Message>

-          </Messages>

-          <Members>

-           <Member Name="Add(System.Object,System.Object):System.Void">

-            <Messages>

-             <Message Id="System.ArgumentException.#ctor(System.String)" TypeName="DoNotPassLiteralsAsLocalizedParameters" Category="Microsoft.Globalization" CheckId="CA1303" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>LinkedHashtable.Add(Object, Object):Void</Item>

-               <Item>1</Item>

-               <Item>ArgumentException.ArgumentException(String)</Item>

-               <Item>LinkedHashtable already contains key. key=__</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="MoveToHead(System.Object):System.Void">

-            <Messages>

-             <Message Id="System.ArgumentException.#ctor(System.String)" TypeName="DoNotPassLiteralsAsLocalizedParameters" Category="Microsoft.Globalization" CheckId="CA1303" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>LinkedHashtable.MoveToHead(Object):Void</Item>

-               <Item>1</Item>

-               <Item>ArgumentException.ArgumentException(String)</Item>

-               <Item>Key ____ not found</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Tail">

-            <Accessors>

-             <Accessor Name="get_Tail():Qpid.Collections.LinkedHashtable+LinkedDictionaryEntry">

-              <Messages>

-               <Message TypeName="AvoidUncalledPrivateCode" Category="Microsoft.Performance" CheckId="CA1811" Created="2006-12-04 13:11:47Z">

-                <Issue>

-                 <Item>LinkedHashtable.get_Tail():LinkedDictionaryEntry</Item>

-                </Issue>

-               </Message>

-              </Messages>

-             </Accessor>

-            </Accessors>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="LinkedHashtable+LHTEnumerator">

-          <Members>

-           <Member Name=".ctor(Qpid.Collections.LinkedHashtable)">

-            <Messages>

-             <Message TypeName="DoNotInitializeUnnecessarily" Category="Microsoft.Performance" CheckId="CA1805" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>LHTEnumerator.LHTEnumerator(LinkedHashtable)</Item>

-               <Item>_needsReset</Item>

-               <Item>System.Boolean</Item>

-               <Item>false</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Current">

-            <Accessors>

-             <Accessor Name="get_Current():System.Object">

-              <Messages>

-               <Message TypeName="DoNotRaiseReservedExceptionTypes" Category="Microsoft.Usage" CheckId="CA2201" Created="2006-12-04 13:11:47Z">

-                <Issue Name="TooGeneric">

-                 <Item>LHTEnumerator.get_Current():Object</Item>

-                 <Item>System.Exception</Item>

-                </Issue>

-               </Message>

-              </Messages>

-             </Accessor>

-            </Accessors>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="SynchronousQueue">

-          <Messages>

-           <Message TypeName="ICollectionImplementationsHaveStronglyTypedMembers" Category="Microsoft.Design" CheckId="CA1035" Created="2006-12-04 13:11:47Z">

-            <Issue>

-             <Item>SynchronousQueue</Item>

-            </Issue>

-           </Message>

-          </Messages>

-          <Members>

-           <Member Name=".ctor(System.Boolean)">

-            <Messages>

-             <Message Id="strict" TypeName="ReviewUnusedParameters" Category="Microsoft.Usage" CheckId="CA1801" Created="2006-12-04 13:11:47Z" FixCategory="Breaking">

-              <Issue>

-               <Item>strict</Item>

-               <Item>SynchronousQueue.SynchronousQueue(Boolean)</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="_qlock">

-            <Messages>

-             <Message TypeName="AvoidUnusedPrivateFields" Category="Microsoft.Performance" CheckId="CA1823" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>SynchronousQueue._qlock</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="_waitingConsumers">

-            <Messages>

-             <Message TypeName="AvoidUnusedPrivateFields" Category="Microsoft.Performance" CheckId="CA1823" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>SynchronousQueue._waitingConsumers</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="_waitingProducers">

-            <Messages>

-             <Message TypeName="AvoidUnusedPrivateFields" Category="Microsoft.Performance" CheckId="CA1823" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>SynchronousQueue._waitingProducers</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="SynchronousQueue+FifoWaitQueue">

-          <Messages>

-           <Message TypeName="AvoidUninstantiatedInternalClasses" Category="Microsoft.Performance" CheckId="CA1812" Created="2006-12-04 13:11:47Z">

-            <Issue>

-             <Item>Qpid.Collections.SynchronousQueue+FifoWaitQueue</Item>

-            </Issue>

-           </Message>

-          </Messages>

-         </Type>

-         <Type Name="SynchronousQueue+LifoWaitQueue">

-          <Messages>

-           <Message TypeName="AvoidUninstantiatedInternalClasses" Category="Microsoft.Performance" CheckId="CA1812" Created="2006-12-04 13:11:47Z">

-            <Issue>

-             <Item>Qpid.Collections.SynchronousQueue+LifoWaitQueue</Item>

-            </Issue>

-           </Message>

-          </Messages>

-         </Type>

-         <Type Name="SynchronousQueue+Node">

-          <Members>

-           <Member Name=".ctor(System.Object)">

-            <Messages>

-             <Message TypeName="DoNotInitializeUnnecessarily" Category="Microsoft.Performance" CheckId="CA1805" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Node.Node(Object)</Item>

-               <Item>state</Item>

-               <Item>System.Int32</Item>

-               <Item>0</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name=".ctor(System.Object,Qpid.Collections.SynchronousQueue+Node)">

-            <Messages>

-             <Message TypeName="DoNotInitializeUnnecessarily" Category="Microsoft.Performance" CheckId="CA1805" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Node.Node(Object, Node)</Item>

-               <Item>state</Item>

-               <Item>System.Int32</Item>

-               <Item>0</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Attempt(System.Int64):System.Boolean">

-            <Messages>

-             <Message TypeName="AvoidUncalledPrivateCode" Category="Microsoft.Performance" CheckId="CA1811" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Node.Attempt(Int64):Boolean</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Extract():System.Object">

-            <Messages>

-             <Message TypeName="AvoidUncalledPrivateCode" Category="Microsoft.Performance" CheckId="CA1811" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Node.Extract():Object</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="GetItem():System.Object">

-            <Messages>

-             <Message TypeName="AvoidUncalledPrivateCode" Category="Microsoft.Performance" CheckId="CA1811" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Node.GetItem():Object</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="SetItem(System.Object):System.Boolean">

-            <Messages>

-             <Message TypeName="AvoidUncalledPrivateCode" Category="Microsoft.Performance" CheckId="CA1811" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Node.SetItem(Object):Boolean</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="WaitForPut():System.Object">

-            <Messages>

-             <Message TypeName="AvoidUncalledPrivateCode" Category="Microsoft.Performance" CheckId="CA1811" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Node.WaitForPut():Object</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="WaitForPut(System.Int64):System.Object">

-            <Messages>

-             <Message TypeName="AvoidUncalledPrivateCode" Category="Microsoft.Performance" CheckId="CA1811" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Node.WaitForPut(Int64):Object</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="WaitForTake():System.Void">

-            <Messages>

-             <Message TypeName="AvoidUncalledPrivateCode" Category="Microsoft.Performance" CheckId="CA1811" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Node.WaitForTake():Void</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="WaitForTake(System.Int64):System.Boolean">

-            <Messages>

-             <Message TypeName="AvoidUncalledPrivateCode" Category="Microsoft.Performance" CheckId="CA1811" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Node.WaitForTake(Int64):Boolean</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-        </Types>

-       </Namespace>

-       <Namespace Name="Qpid.Common">

-        <Types>

-         <Type Name="AssemblySettings">

-          <Members>

-           <Member Name="GetConfig(System.Reflection.Assembly):System.Collections.IDictionary">

-            <Messages>

-             <Message TypeName="DoNotCatchGeneralExceptionTypes" Category="Microsoft.Design" CheckId="CA1031" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>AssemblySettings.GetConfig(Assembly):IDictionary</Item>

-               <Item>System.Exception</Item>

-              </Issue>

-             </Message>

-             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>'asm'</Item>

-               <Item>AssemblySettings.GetConfig(Assembly):IDictionary</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-        </Types>

-       </Namespace>

-       <Namespace Name="Qpid.Framing">

-        <Types>

-         <Type Name="AccessRequestBody">

-          <Members>

-           <Member Name="Active">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Active</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CLASS_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>AccessRequestBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>AccessRequestBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CreateAMQFrame(System.UInt16,System.String,System.Boolean,System.Boolean,System.Boolean,System.Boolean,System.Boolean):Qpid.Framing.AMQFrame">

-            <Messages>

-             <Message Id="1#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Realm</Item>

-              </Issue>

-             </Message>

-             <Message Id="2#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Exclusive</Item>

-              </Issue>

-             </Message>

-             <Message Id="3#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Passive</Item>

-              </Issue>

-             </Message>

-             <Message Id="4#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Active</Item>

-              </Issue>

-             </Message>

-             <Message Id="5#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Write</Item>

-              </Issue>

-             </Message>

-             <Message Id="6#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Read</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>AccessRequestBody.CreateAMQFrame(UInt16, String, Boolean, Boolean, Boolean, Boolean, Boolean):AMQFrame</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Exclusive">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Exclusive</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="METHOD_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>AccessRequestBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>AccessRequestBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Passive">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Passive</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Read">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Read</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Realm">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Realm</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Write">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Write</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="AccessRequestOkBody">

-          <Members>

-           <Member Name="CLASS_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>AccessRequestOkBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>AccessRequestOkBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CreateAMQFrame(System.UInt16,System.UInt16):Qpid.Framing.AMQFrame">

-            <Messages>

-             <Message Id="1#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Ticket</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>AccessRequestOkBody.CreateAMQFrame(UInt16, UInt16):AMQFrame</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="METHOD_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>AccessRequestOkBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>AccessRequestOkBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Ticket">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Ticket</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="AMQDataBlockDecoder">

-          <Messages>

-           <Message TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-            <Issue Name="Type">

-             <Item>AMQDataBlockDecoder</Item>

-            </Issue>

-           </Message>

-          </Messages>

-          <Members>

-           <Member Name=".ctor()">

-            <Messages>

-             <Message TypeName="DoNotInitializeUnnecessarily" Category="Microsoft.Performance" CheckId="CA1805" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>AMQDataBlockDecoder.AMQDataBlockDecoder()</Item>

-               <Item>_disabled</Item>

-               <Item>System.Boolean</Item>

-               <Item>false</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CreateAndPopulateFrame(Qpid.Buffer.ByteBuffer):System.Object">

-            <Messages>

-             <Message Id="Qpid.Framing.AMQFrameDecodingException.#ctor(System.String)" TypeName="DoNotPassLiteralsAsLocalizedParameters" Category="Microsoft.Globalization" CheckId="CA1303" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>AMQDataBlockDecoder.CreateAndPopulateFrame(ByteBuffer):Object</Item>

-               <Item>1</Item>

-               <Item>AMQFrameDecodingException.AMQFrameDecodingException(String)</Item>

-               <Item>Unsupported body type: __</Item>

-              </Issue>

-             </Message>

-             <Message Id="marker" TypeName="RemoveUnusedLocals" Category="Microsoft.Performance" CheckId="CA1804" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>AMQDataBlockDecoder.CreateAndPopulateFrame(ByteBuffer):Object</Item>

-               <Item>marker</Item>

-               <Item>System.Byte</Item>

-              </Issue>

-             </Message>

-             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>'input'</Item>

-               <Item>AMQDataBlockDecoder.CreateAndPopulateFrame(ByteBuffer):Object</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Decodable(Qpid.Buffer.ByteBuffer):Qpid.Codec.Demux.MessageDecoderResult">

-            <Messages>

-             <Message Id="0#" TypeName="ParameterNamesShouldMatchBaseDeclaration" Category="Microsoft.Naming" CheckId="CA1725" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>input</Item>

-               <Item>AMQDataBlockDecoder.Decodable(ByteBuffer):MessageDecoderResult</Item>

-               <Item>buffer</Item>

-               <Item>IMessageDecoder.Decodable(ByteBuffer):MessageDecoderResult</Item>

-              </Issue>

-             </Message>

-             <Message Id="System.String.Format(System.String,System.Object,System.Object,System.Object)" TypeName="SpecifyIFormatProvider" Category="Microsoft.Globalization" CheckId="CA1305" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>AMQDataBlockDecoder.Decodable(ByteBuffer):MessageDecoderResult</Item>

-               <Item>System.String.Format(System.String,System.Object,System.Object,System.Object)</Item>

-               <Item>System.String.Format(System.IFormatProvider,System.String,System.Object[])</Item>

-              </Issue>

-             </Message>

-             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>'input'</Item>

-               <Item>AMQDataBlockDecoder.Decodable(ByteBuffer):MessageDecoderResult</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Decode(Qpid.Buffer.ByteBuffer,Qpid.Codec.IProtocolDecoderOutput):Qpid.Codec.Demux.MessageDecoderResult">

-            <Messages>

-             <Message Id="0#" TypeName="ParameterNamesShouldMatchBaseDeclaration" Category="Microsoft.Naming" CheckId="CA1725" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>input</Item>

-               <Item>AMQDataBlockDecoder.Decode(ByteBuffer, IProtocolDecoderOutput):MessageDecoderResult</Item>

-               <Item>buffer</Item>

-               <Item>IMessageDecoder.Decode(ByteBuffer, IProtocolDecoderOutput):MessageDecoderResult</Item>

-              </Issue>

-             </Message>

-             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>'output'</Item>

-               <Item>AMQDataBlockDecoder.Decode(ByteBuffer, IProtocolDecoderOutput):MessageDecoderResult</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Disabled">

-            <Messages>

-             <Message TypeName="PropertiesShouldNotBeWriteOnly" Category="Microsoft.Design" CheckId="CA1044" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Disabled</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="AMQDataBlockEncoder">

-          <Messages>

-           <Message TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-            <Issue Name="Type">

-             <Item>AMQDataBlockEncoder</Item>

-            </Issue>

-           </Message>

-          </Messages>

-          <Members>

-           <Member Name="Encode(System.Object,Qpid.Codec.IProtocolEncoderOutput):System.Void">

-            <Messages>

-             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>'output'</Item>

-               <Item>AMQDataBlockEncoder.Encode(Object, IProtocolEncoderOutput):Void</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="AMQFrame">

-          <Messages>

-           <Message TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-            <Issue Name="Type">

-             <Item>AMQFrame</Item>

-            </Issue>

-           </Message>

-          </Messages>

-          <Members>

-           <Member Name="PopulateFromBuffer(Qpid.Buffer.ByteBuffer,System.UInt16,System.UInt32,Qpid.Framing.IBodyFactory):System.Void">

-            <Messages>

-             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>'bodyFactory'</Item>

-               <Item>AMQFrame.PopulateFromBuffer(ByteBuffer, UInt16, UInt32, IBodyFactory):Void</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="WritePayload(Qpid.Buffer.ByteBuffer):System.Void">

-            <Messages>

-             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>'buffer'</Item>

-               <Item>AMQFrame.WritePayload(ByteBuffer):Void</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="AMQFrameDecodingException">

-          <Messages>

-           <Message TypeName="ImplementStandardExceptionConstructors" Category="Microsoft.Design" CheckId="CA1032" Created="2006-12-04 13:11:47Z">

-            <Issue>

-             <Item>Qpid.Framing.AMQFrameDecodingException</Item>

-             <Item>protected AMQFrameDecodingException(SerializationInfo, StreamingContext)</Item>

-            </Issue>

-            <Issue>

-             <Item>Qpid.Framing.AMQFrameDecodingException</Item>

-             <Item>public AMQFrameDecodingException()</Item>

-            </Issue>

-           </Message>

-           <Message TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-            <Issue Name="Type">

-             <Item>AMQFrameDecodingException</Item>

-            </Issue>

-           </Message>

-          </Messages>

-         </Type>

-         <Type Name="AMQMethodBody">

-          <Messages>

-           <Message TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-            <Issue Name="Type">

-             <Item>AMQMethodBody</Item>

-            </Issue>

-           </Message>

-          </Messages>

-          <Members>

-           <Member Name="Clazz">

-            <Messages>

-             <Message Id="Clazz" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>Clazz</Item>

-               <Item>AMQMethodBody.Clazz:UInt16</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="ToString():System.String">

-            <Messages>

-             <Message Id="System.String.Format(System.String,System.Object,System.Object,System.Object)" TypeName="SpecifyIFormatProvider" Category="Microsoft.Globalization" CheckId="CA1305" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>AMQMethodBody.ToString():String</Item>

-               <Item>System.String.Format(System.String,System.Object,System.Object,System.Object)</Item>

-               <Item>System.String.Format(System.IFormatProvider,System.String,System.Object[])</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="TYPE">

-            <Messages>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>AMQMethodBody.TYPE</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="WritePayload(Qpid.Buffer.ByteBuffer):System.Void">

-            <Messages>

-             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>'buffer'</Item>

-               <Item>AMQMethodBody.WritePayload(ByteBuffer):Void</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="AMQMethodBodyFactory">

-          <Messages>

-           <Message TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-            <Issue Name="Type">

-             <Item>AMQMethodBodyFactory</Item>

-            </Issue>

-           </Message>

-          </Messages>

-          <Members>

-           <Member Name="CreateBody(Qpid.Buffer.ByteBuffer):Qpid.Framing.IBody">

-            <Messages>

-             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>'inbuf'</Item>

-               <Item>AMQMethodBodyFactory.CreateBody(ByteBuffer):IBody</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="GetInstance():Qpid.Framing.AMQMethodBodyFactory">

-            <Messages>

-             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>GetInstance</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="AMQProtocolHeaderException">

-          <Messages>

-           <Message TypeName="ImplementStandardExceptionConstructors" Category="Microsoft.Design" CheckId="CA1032" Created="2006-12-04 13:11:47Z">

-            <Issue>

-             <Item>Qpid.Framing.AMQProtocolHeaderException</Item>

-             <Item>protected AMQProtocolHeaderException(SerializationInfo, StreamingContext)</Item>

-            </Issue>

-            <Issue>

-             <Item>Qpid.Framing.AMQProtocolHeaderException</Item>

-             <Item>public AMQProtocolHeaderException()</Item>

-            </Issue>

-            <Issue>

-             <Item>Qpid.Framing.AMQProtocolHeaderException</Item>

-             <Item>public AMQProtocolHeaderException(String, Exception)</Item>

-            </Issue>

-           </Message>

-           <Message TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-            <Issue Name="Type">

-             <Item>AMQProtocolHeaderException</Item>

-            </Issue>

-           </Message>

-          </Messages>

-         </Type>

-         <Type Name="BasicAckBody">

-          <Messages>

-           <Message Id="Ack" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-            <Issue Name="Type">

-             <Item>Ack</Item>

-             <Item>Qpid.Framing.BasicAckBody</Item>

-            </Issue>

-           </Message>

-          </Messages>

-          <Members>

-           <Member Name="CLASS_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>BasicAckBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>BasicAckBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CreateAMQFrame(System.UInt16,System.UInt64,System.Boolean):Qpid.Framing.AMQFrame">

-            <Messages>

-             <Message Id="1#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>DeliveryTag</Item>

-              </Issue>

-             </Message>

-             <Message Id="2#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Multiple</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>BasicAckBody.CreateAMQFrame(UInt16, UInt64, Boolean):AMQFrame</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="DeliveryTag">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>DeliveryTag</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="METHOD_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>BasicAckBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>BasicAckBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Multiple">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Multiple</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="BasicCancelBody">

-          <Members>

-           <Member Name="CLASS_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>BasicCancelBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>BasicCancelBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="ConsumerTag">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>ConsumerTag</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CreateAMQFrame(System.UInt16,System.String,System.Boolean):Qpid.Framing.AMQFrame">

-            <Messages>

-             <Message Id="1#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>ConsumerTag</Item>

-              </Issue>

-             </Message>

-             <Message Id="2#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Nowait</Item>

-              </Issue>

-             </Message>

-             <Message Id="2#Nowait" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>BasicCancelBody.CreateAMQFrame(UInt16, String, Boolean):AMQFrame</Item>

-               <Item>Nowait</Item>

-               <Item>Nowait</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>BasicCancelBody.CreateAMQFrame(UInt16, String, Boolean):AMQFrame</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="METHOD_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>BasicCancelBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>BasicCancelBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Nowait">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Nowait</Item>

-              </Issue>

-             </Message>

-             <Message Id="Nowait" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>Nowait</Item>

-               <Item>BasicCancelBody.Nowait</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="BasicCancelOkBody">

-          <Members>

-           <Member Name="CLASS_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>BasicCancelOkBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>BasicCancelOkBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="ConsumerTag">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>ConsumerTag</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CreateAMQFrame(System.UInt16,System.String):Qpid.Framing.AMQFrame">

-            <Messages>

-             <Message Id="1#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>ConsumerTag</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>BasicCancelOkBody.CreateAMQFrame(UInt16, String):AMQFrame</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="METHOD_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>BasicCancelOkBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>BasicCancelOkBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="BasicConsumeBody">

-          <Members>

-           <Member Name="CLASS_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>BasicConsumeBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>BasicConsumeBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="ConsumerTag">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>ConsumerTag</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CreateAMQFrame(System.UInt16,System.UInt16,System.String,System.String,System.Boolean,System.Boolean,System.Boolean,System.Boolean):Qpid.Framing.AMQFrame">

-            <Messages>

-             <Message Id="1#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Ticket</Item>

-              </Issue>

-             </Message>

-             <Message Id="2#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Queue</Item>

-              </Issue>

-             </Message>

-             <Message Id="3#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>ConsumerTag</Item>

-              </Issue>

-             </Message>

-             <Message Id="4#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>NoLocal</Item>

-              </Issue>

-             </Message>

-             <Message Id="5#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>NoAck</Item>

-              </Issue>

-             </Message>

-             <Message Id="6#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Exclusive</Item>

-              </Issue>

-             </Message>

-             <Message Id="7#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Nowait</Item>

-              </Issue>

-             </Message>

-             <Message Id="5#Ack" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>BasicConsumeBody.CreateAMQFrame(UInt16, UInt16, String, String, Boolean, Boolean, Boolean, Boolean):AMQFrame</Item>

-               <Item>Ack</Item>

-               <Item>NoAck</Item>

-              </Issue>

-             </Message>

-             <Message Id="7#Nowait" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>BasicConsumeBody.CreateAMQFrame(UInt16, UInt16, String, String, Boolean, Boolean, Boolean, Boolean):AMQFrame</Item>

-               <Item>Nowait</Item>

-               <Item>Nowait</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>BasicConsumeBody.CreateAMQFrame(UInt16, UInt16, String, String, Boolean, Boolean, Boolean, Boolean):AMQFrame</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Exclusive">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Exclusive</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="METHOD_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>BasicConsumeBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>BasicConsumeBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="NoAck">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>NoAck</Item>

-              </Issue>

-             </Message>

-             <Message Id="Ack" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>Ack</Item>

-               <Item>BasicConsumeBody.NoAck</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="NoLocal">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>NoLocal</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Nowait">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Nowait</Item>

-              </Issue>

-             </Message>

-             <Message Id="Nowait" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>Nowait</Item>

-               <Item>BasicConsumeBody.Nowait</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Queue">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Queue</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Ticket">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Ticket</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="BasicConsumeOkBody">

-          <Members>

-           <Member Name="CLASS_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>BasicConsumeOkBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>BasicConsumeOkBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="ConsumerTag">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>ConsumerTag</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CreateAMQFrame(System.UInt16,System.String):Qpid.Framing.AMQFrame">

-            <Messages>

-             <Message Id="1#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>ConsumerTag</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>BasicConsumeOkBody.CreateAMQFrame(UInt16, String):AMQFrame</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="METHOD_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>BasicConsumeOkBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>BasicConsumeOkBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="BasicContentHeaderProperties">

-          <Members>

-           <Member Name="AppId">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>AppId</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="ClusterId">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>ClusterId</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="ContentType">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>ContentType</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CorrelationId">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>CorrelationId</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="DeliveryMode">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>DeliveryMode</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Encoding">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Encoding</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Expiration">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Expiration</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Headers">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Headers</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="MessageId">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>MessageId</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="PopulatePropertiesFromBuffer(Qpid.Buffer.ByteBuffer,System.UInt16):System.Void">

-            <Messages>

-             <Message Id="System.UInt32.Parse(System.String)" TypeName="SpecifyIFormatProvider" Category="Microsoft.Globalization" CheckId="CA1305" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>BasicContentHeaderProperties.PopulatePropertiesFromBuffer(ByteBuffer, UInt16):Void</Item>

-               <Item>System.UInt32.Parse(System.String)</Item>

-               <Item>System.UInt32.Parse(System.String,System.IFormatProvider)</Item>

-              </Issue>

-             </Message>

-             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>'buffer'</Item>

-               <Item>BasicContentHeaderProperties.PopulatePropertiesFromBuffer(ByteBuffer, UInt16):Void</Item>

-              </Issue>

-              <Issue>

-               <Item>'buffer'</Item>

-               <Item>BasicContentHeaderProperties.PopulatePropertiesFromBuffer(ByteBuffer, UInt16):Void</Item>

-              </Issue>

-              <Issue>

-               <Item>'buffer'</Item>

-               <Item>BasicContentHeaderProperties.PopulatePropertiesFromBuffer(ByteBuffer, UInt16):Void</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Priority">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Priority</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="PropertyListSize">

-            <Accessors>

-             <Accessor Name="get_PropertyListSize():System.UInt32">

-              <Messages>

-               <Message Id="System.String.Format(System.String,System.Object)" TypeName="SpecifyIFormatProvider" Category="Microsoft.Globalization" CheckId="CA1305" Created="2006-12-04 13:11:47Z">

-                <Issue>

-                 <Item>BasicContentHeaderProperties.get_PropertyListSize():UInt32</Item>

-                 <Item>System.String.Format(System.String,System.Object)</Item>

-                 <Item>System.String.Format(System.IFormatProvider,System.String,System.Object[])</Item>

-                </Issue>

-               </Message>

-              </Messages>

-             </Accessor>

-            </Accessors>

-           </Member>

-           <Member Name="ReplyTo">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>ReplyTo</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Timestamp">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Timestamp</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Type">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Type</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="UserId">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>UserId</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="WritePropertyListPayload(Qpid.Buffer.ByteBuffer):System.Void">

-            <Messages>

-             <Message Id="System.String.Format(System.String,System.Object)" TypeName="SpecifyIFormatProvider" Category="Microsoft.Globalization" CheckId="CA1305" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>BasicContentHeaderProperties.WritePropertyListPayload(ByteBuffer):Void</Item>

-               <Item>System.String.Format(System.String,System.Object)</Item>

-               <Item>System.String.Format(System.IFormatProvider,System.String,System.Object[])</Item>

-              </Issue>

-             </Message>

-             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>'buffer'</Item>

-               <Item>BasicContentHeaderProperties.WritePropertyListPayload(ByteBuffer):Void</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="BasicDeliverBody">

-          <Members>

-           <Member Name="CLASS_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>BasicDeliverBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>BasicDeliverBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="ConsumerTag">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>ConsumerTag</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CreateAMQFrame(System.UInt16,System.String,System.UInt64,System.Boolean,System.String,System.String):Qpid.Framing.AMQFrame">

-            <Messages>

-             <Message Id="1#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>ConsumerTag</Item>

-              </Issue>

-             </Message>

-             <Message Id="2#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>DeliveryTag</Item>

-              </Issue>

-             </Message>

-             <Message Id="3#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Redelivered</Item>

-              </Issue>

-             </Message>

-             <Message Id="4#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Exchange</Item>

-              </Issue>

-             </Message>

-             <Message Id="5#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>RoutingKey</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>BasicDeliverBody.CreateAMQFrame(UInt16, String, UInt64, Boolean, String, String):AMQFrame</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="DeliveryTag">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>DeliveryTag</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Exchange">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Exchange</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="METHOD_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>BasicDeliverBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>BasicDeliverBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Redelivered">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Redelivered</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="RoutingKey">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>RoutingKey</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="BasicGetBody">

-          <Members>

-           <Member Name="CLASS_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>BasicGetBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>BasicGetBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CreateAMQFrame(System.UInt16,System.UInt16,System.String,System.Boolean):Qpid.Framing.AMQFrame">

-            <Messages>

-             <Message Id="1#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Ticket</Item>

-              </Issue>

-             </Message>

-             <Message Id="2#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Queue</Item>

-              </Issue>

-             </Message>

-             <Message Id="3#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>NoAck</Item>

-              </Issue>

-             </Message>

-             <Message Id="3#Ack" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>BasicGetBody.CreateAMQFrame(UInt16, UInt16, String, Boolean):AMQFrame</Item>

-               <Item>Ack</Item>

-               <Item>NoAck</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>BasicGetBody.CreateAMQFrame(UInt16, UInt16, String, Boolean):AMQFrame</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="METHOD_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>BasicGetBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>BasicGetBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="NoAck">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>NoAck</Item>

-              </Issue>

-             </Message>

-             <Message Id="Ack" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>Ack</Item>

-               <Item>BasicGetBody.NoAck</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Queue">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Queue</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Ticket">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Ticket</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="BasicGetEmptyBody">

-          <Members>

-           <Member Name="CLASS_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>BasicGetEmptyBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>BasicGetEmptyBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="ClusterId">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>ClusterId</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CreateAMQFrame(System.UInt16,System.String):Qpid.Framing.AMQFrame">

-            <Messages>

-             <Message Id="1#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>ClusterId</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>BasicGetEmptyBody.CreateAMQFrame(UInt16, String):AMQFrame</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="METHOD_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>BasicGetEmptyBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>BasicGetEmptyBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="BasicGetOkBody">

-          <Members>

-           <Member Name="CLASS_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>BasicGetOkBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>BasicGetOkBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CreateAMQFrame(System.UInt16,System.UInt64,System.Boolean,System.String,System.String,System.UInt32):Qpid.Framing.AMQFrame">

-            <Messages>

-             <Message Id="1#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>DeliveryTag</Item>

-              </Issue>

-             </Message>

-             <Message Id="2#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Redelivered</Item>

-              </Issue>

-             </Message>

-             <Message Id="3#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Exchange</Item>

-              </Issue>

-             </Message>

-             <Message Id="4#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>RoutingKey</Item>

-              </Issue>

-             </Message>

-             <Message Id="5#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>MessageCount</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>BasicGetOkBody.CreateAMQFrame(UInt16, UInt64, Boolean, String, String, UInt32):AMQFrame</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="DeliveryTag">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>DeliveryTag</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Exchange">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Exchange</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="MessageCount">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>MessageCount</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="METHOD_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>BasicGetOkBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>BasicGetOkBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Redelivered">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Redelivered</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="RoutingKey">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>RoutingKey</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="BasicPublishBody">

-          <Members>

-           <Member Name="CLASS_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>BasicPublishBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>BasicPublishBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CreateAMQFrame(System.UInt16,System.UInt16,System.String,System.String,System.Boolean,System.Boolean):Qpid.Framing.AMQFrame">

-            <Messages>

-             <Message Id="1#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Ticket</Item>

-              </Issue>

-             </Message>

-             <Message Id="2#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Exchange</Item>

-              </Issue>

-             </Message>

-             <Message Id="3#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>RoutingKey</Item>

-              </Issue>

-             </Message>

-             <Message Id="4#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Mandatory</Item>

-              </Issue>

-             </Message>

-             <Message Id="5#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Immediate</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>BasicPublishBody.CreateAMQFrame(UInt16, UInt16, String, String, Boolean, Boolean):AMQFrame</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Exchange">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Exchange</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Immediate">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Immediate</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Mandatory">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Mandatory</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="METHOD_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>BasicPublishBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>BasicPublishBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="RoutingKey">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>RoutingKey</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Ticket">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Ticket</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="BasicQosBody">

-          <Messages>

-           <Message Id="Qos" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-            <Issue Name="Type">

-             <Item>Qos</Item>

-             <Item>Qpid.Framing.BasicQosBody</Item>

-            </Issue>

-           </Message>

-          </Messages>

-          <Members>

-           <Member Name="CLASS_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>BasicQosBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>BasicQosBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CreateAMQFrame(System.UInt16,System.UInt32,System.UInt16,System.Boolean):Qpid.Framing.AMQFrame">

-            <Messages>

-             <Message Id="1#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>PrefetchSize</Item>

-              </Issue>

-             </Message>

-             <Message Id="2#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>PrefetchCount</Item>

-              </Issue>

-             </Message>

-             <Message Id="3#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Global</Item>

-              </Issue>

-             </Message>

-             <Message Id="1#Prefetch" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>BasicQosBody.CreateAMQFrame(UInt16, UInt32, UInt16, Boolean):AMQFrame</Item>

-               <Item>Prefetch</Item>

-               <Item>PrefetchSize</Item>

-              </Issue>

-             </Message>

-             <Message Id="2#Prefetch" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>BasicQosBody.CreateAMQFrame(UInt16, UInt32, UInt16, Boolean):AMQFrame</Item>

-               <Item>Prefetch</Item>

-               <Item>PrefetchCount</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>BasicQosBody.CreateAMQFrame(UInt16, UInt32, UInt16, Boolean):AMQFrame</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Global">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Global</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="METHOD_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>BasicQosBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>BasicQosBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="PrefetchCount">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>PrefetchCount</Item>

-              </Issue>

-             </Message>

-             <Message Id="Prefetch" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>Prefetch</Item>

-               <Item>BasicQosBody.PrefetchCount</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="PrefetchSize">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>PrefetchSize</Item>

-              </Issue>

-             </Message>

-             <Message Id="Prefetch" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>Prefetch</Item>

-               <Item>BasicQosBody.PrefetchSize</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="BasicQosOkBody">

-          <Messages>

-           <Message Id="Qos" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-            <Issue Name="Type">

-             <Item>Qos</Item>

-             <Item>Qpid.Framing.BasicQosOkBody</Item>

-            </Issue>

-           </Message>

-          </Messages>

-          <Members>

-           <Member Name="CLASS_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>BasicQosOkBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>BasicQosOkBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CreateAMQFrame(System.UInt16):Qpid.Framing.AMQFrame">

-            <Messages>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>BasicQosOkBody.CreateAMQFrame(UInt16):AMQFrame</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="METHOD_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>BasicQosOkBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>BasicQosOkBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="BasicRecoverBody">

-          <Members>

-           <Member Name="CLASS_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>BasicRecoverBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>BasicRecoverBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CreateAMQFrame(System.UInt16,System.Boolean):Qpid.Framing.AMQFrame">

-            <Messages>

-             <Message Id="1#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Requeue</Item>

-              </Issue>

-             </Message>

-             <Message Id="1#Requeue" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>BasicRecoverBody.CreateAMQFrame(UInt16, Boolean):AMQFrame</Item>

-               <Item>Requeue</Item>

-               <Item>Requeue</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>BasicRecoverBody.CreateAMQFrame(UInt16, Boolean):AMQFrame</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="METHOD_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>BasicRecoverBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>BasicRecoverBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Requeue">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Requeue</Item>

-              </Issue>

-             </Message>

-             <Message Id="Requeue" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>Requeue</Item>

-               <Item>BasicRecoverBody.Requeue</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="BasicRejectBody">

-          <Members>

-           <Member Name="CLASS_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>BasicRejectBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>BasicRejectBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CreateAMQFrame(System.UInt16,System.UInt64,System.Boolean):Qpid.Framing.AMQFrame">

-            <Messages>

-             <Message Id="1#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>DeliveryTag</Item>

-              </Issue>

-             </Message>

-             <Message Id="2#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Requeue</Item>

-              </Issue>

-             </Message>

-             <Message Id="2#Requeue" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>BasicRejectBody.CreateAMQFrame(UInt16, UInt64, Boolean):AMQFrame</Item>

-               <Item>Requeue</Item>

-               <Item>Requeue</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>BasicRejectBody.CreateAMQFrame(UInt16, UInt64, Boolean):AMQFrame</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="DeliveryTag">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>DeliveryTag</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="METHOD_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>BasicRejectBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>BasicRejectBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Requeue">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Requeue</Item>

-              </Issue>

-             </Message>

-             <Message Id="Requeue" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>Requeue</Item>

-               <Item>BasicRejectBody.Requeue</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="BasicReturnBody">

-          <Members>

-           <Member Name="CLASS_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>BasicReturnBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>BasicReturnBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CreateAMQFrame(System.UInt16,System.UInt16,System.String,System.String,System.String):Qpid.Framing.AMQFrame">

-            <Messages>

-             <Message Id="1#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>ReplyCode</Item>

-              </Issue>

-             </Message>

-             <Message Id="2#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>ReplyText</Item>

-              </Issue>

-             </Message>

-             <Message Id="3#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Exchange</Item>

-              </Issue>

-             </Message>

-             <Message Id="4#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>RoutingKey</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>BasicReturnBody.CreateAMQFrame(UInt16, UInt16, String, String, String):AMQFrame</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Exchange">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Exchange</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="METHOD_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>BasicReturnBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>BasicReturnBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="ReplyCode">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>ReplyCode</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="ReplyText">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>ReplyText</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="RoutingKey">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>RoutingKey</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="ChannelAlertBody">

-          <Members>

-           <Member Name="CLASS_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>ChannelAlertBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>ChannelAlertBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CreateAMQFrame(System.UInt16,System.UInt16,System.String,Qpid.Framing.FieldTable):Qpid.Framing.AMQFrame">

-            <Messages>

-             <Message Id="1#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>ReplyCode</Item>

-              </Issue>

-             </Message>

-             <Message Id="2#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>ReplyText</Item>

-              </Issue>

-             </Message>

-             <Message Id="3#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Details</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>ChannelAlertBody.CreateAMQFrame(UInt16, UInt16, String, FieldTable):AMQFrame</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Details">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Details</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="METHOD_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>ChannelAlertBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>ChannelAlertBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="ReplyCode">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>ReplyCode</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="ReplyText">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>ReplyText</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="ChannelCloseBody">

-          <Members>

-           <Member Name="CLASS_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>ChannelCloseBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>ChannelCloseBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="ClassId">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>ClassId</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CreateAMQFrame(System.UInt16,System.UInt16,System.String,System.UInt16,System.UInt16):Qpid.Framing.AMQFrame">

-            <Messages>

-             <Message Id="1#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>ReplyCode</Item>

-              </Issue>

-             </Message>

-             <Message Id="2#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>ReplyText</Item>

-              </Issue>

-             </Message>

-             <Message Id="3#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>ClassId</Item>

-              </Issue>

-             </Message>

-             <Message Id="4#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>MethodId</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>ChannelCloseBody.CreateAMQFrame(UInt16, UInt16, String, UInt16, UInt16):AMQFrame</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="METHOD_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>ChannelCloseBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>ChannelCloseBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="MethodId">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>MethodId</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="ReplyCode">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>ReplyCode</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="ReplyText">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>ReplyText</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="ChannelCloseOkBody">

-          <Members>

-           <Member Name="CLASS_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>ChannelCloseOkBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>ChannelCloseOkBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CreateAMQFrame(System.UInt16):Qpid.Framing.AMQFrame">

-            <Messages>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>ChannelCloseOkBody.CreateAMQFrame(UInt16):AMQFrame</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="METHOD_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>ChannelCloseOkBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>ChannelCloseOkBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="ChannelFlowBody">

-          <Members>

-           <Member Name="Active">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Active</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CLASS_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>ChannelFlowBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>ChannelFlowBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CreateAMQFrame(System.UInt16,System.Boolean):Qpid.Framing.AMQFrame">

-            <Messages>

-             <Message Id="1#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Active</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>ChannelFlowBody.CreateAMQFrame(UInt16, Boolean):AMQFrame</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="METHOD_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>ChannelFlowBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>ChannelFlowBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="ChannelFlowOkBody">

-          <Members>

-           <Member Name="Active">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Active</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CLASS_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>ChannelFlowOkBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>ChannelFlowOkBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CreateAMQFrame(System.UInt16,System.Boolean):Qpid.Framing.AMQFrame">

-            <Messages>

-             <Message Id="1#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Active</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>ChannelFlowOkBody.CreateAMQFrame(UInt16, Boolean):AMQFrame</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="METHOD_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>ChannelFlowOkBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>ChannelFlowOkBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="ChannelOpenBody">

-          <Members>

-           <Member Name="CLASS_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>ChannelOpenBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>ChannelOpenBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CreateAMQFrame(System.UInt16,System.String):Qpid.Framing.AMQFrame">

-            <Messages>

-             <Message Id="1#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>OutOfBand</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>ChannelOpenBody.CreateAMQFrame(UInt16, String):AMQFrame</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="METHOD_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>ChannelOpenBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>ChannelOpenBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="OutOfBand">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>OutOfBand</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="ChannelOpenOkBody">

-          <Members>

-           <Member Name="CLASS_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>ChannelOpenOkBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>ChannelOpenOkBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CreateAMQFrame(System.UInt16):Qpid.Framing.AMQFrame">

-            <Messages>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>ChannelOpenOkBody.CreateAMQFrame(UInt16):AMQFrame</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="METHOD_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>ChannelOpenOkBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>ChannelOpenOkBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="CompositeAMQDataBlock">

-          <Messages>

-           <Message TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-            <Issue Name="Type">

-             <Item>CompositeAMQDataBlock</Item>

-            </Issue>

-           </Message>

-          </Messages>

-          <Members>

-           <Member Name="Blocks">

-            <Messages>

-             <Message TypeName="PropertiesShouldNotReturnArrays" Category="Microsoft.Performance" CheckId="CA1819" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>CompositeAMQDataBlock.Blocks:IDataBlock[]</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="ConnectionCloseBody">

-          <Members>

-           <Member Name="CLASS_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>ConnectionCloseBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>ConnectionCloseBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="ClassId">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>ClassId</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CreateAMQFrame(System.UInt16,System.UInt16,System.String,System.UInt16,System.UInt16):Qpid.Framing.AMQFrame">

-            <Messages>

-             <Message Id="1#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>ReplyCode</Item>

-              </Issue>

-             </Message>

-             <Message Id="2#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>ReplyText</Item>

-              </Issue>

-             </Message>

-             <Message Id="3#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>ClassId</Item>

-              </Issue>

-             </Message>

-             <Message Id="4#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>MethodId</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>ConnectionCloseBody.CreateAMQFrame(UInt16, UInt16, String, UInt16, UInt16):AMQFrame</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="METHOD_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>ConnectionCloseBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>ConnectionCloseBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="MethodId">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>MethodId</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="ReplyCode">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>ReplyCode</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="ReplyText">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>ReplyText</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="ConnectionCloseOkBody">

-          <Members>

-           <Member Name="CLASS_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>ConnectionCloseOkBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>ConnectionCloseOkBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CreateAMQFrame(System.UInt16):Qpid.Framing.AMQFrame">

-            <Messages>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>ConnectionCloseOkBody.CreateAMQFrame(UInt16):AMQFrame</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="METHOD_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>ConnectionCloseOkBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>ConnectionCloseOkBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="ConnectionOpenBody">

-          <Members>

-           <Member Name="Capabilities">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Capabilities</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CLASS_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>ConnectionOpenBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>ConnectionOpenBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CreateAMQFrame(System.UInt16,System.String,System.String,System.Boolean):Qpid.Framing.AMQFrame">

-            <Messages>

-             <Message Id="1#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>VirtualHost</Item>

-              </Issue>

-             </Message>

-             <Message Id="2#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Capabilities</Item>

-              </Issue>

-             </Message>

-             <Message Id="3#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Insist</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>ConnectionOpenBody.CreateAMQFrame(UInt16, String, String, Boolean):AMQFrame</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Insist">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Insist</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="METHOD_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>ConnectionOpenBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>ConnectionOpenBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="VirtualHost">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>VirtualHost</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="ConnectionOpenOkBody">

-          <Members>

-           <Member Name="CLASS_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>ConnectionOpenOkBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>ConnectionOpenOkBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CreateAMQFrame(System.UInt16,System.String):Qpid.Framing.AMQFrame">

-            <Messages>

-             <Message Id="1#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>KnownHosts</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>ConnectionOpenOkBody.CreateAMQFrame(UInt16, String):AMQFrame</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="KnownHosts">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>KnownHosts</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="METHOD_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>ConnectionOpenOkBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>ConnectionOpenOkBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="ConnectionRedirectBody">

-          <Members>

-           <Member Name="CLASS_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>ConnectionRedirectBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>ConnectionRedirectBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CreateAMQFrame(System.UInt16,System.String,System.String):Qpid.Framing.AMQFrame">

-            <Messages>

-             <Message Id="1#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Host</Item>

-              </Issue>

-             </Message>

-             <Message Id="2#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>KnownHosts</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>ConnectionRedirectBody.CreateAMQFrame(UInt16, String, String):AMQFrame</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Host">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Host</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="KnownHosts">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>KnownHosts</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="METHOD_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>ConnectionRedirectBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>ConnectionRedirectBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="ConnectionSecureBody">

-          <Members>

-           <Member Name="Challenge">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Challenge</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CLASS_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>ConnectionSecureBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>ConnectionSecureBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CreateAMQFrame(System.UInt16,System.Byte[]):Qpid.Framing.AMQFrame">

-            <Messages>

-             <Message Id="1#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Challenge</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>ConnectionSecureBody.CreateAMQFrame(UInt16, Byte[]):AMQFrame</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="METHOD_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>ConnectionSecureBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>ConnectionSecureBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="ConnectionSecureOkBody">

-          <Members>

-           <Member Name="CLASS_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>ConnectionSecureOkBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>ConnectionSecureOkBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CreateAMQFrame(System.UInt16,System.Byte[]):Qpid.Framing.AMQFrame">

-            <Messages>

-             <Message Id="1#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Response</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>ConnectionSecureOkBody.CreateAMQFrame(UInt16, Byte[]):AMQFrame</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="METHOD_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>ConnectionSecureOkBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>ConnectionSecureOkBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Response">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Response</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="ConnectionStartBody">

-          <Members>

-           <Member Name="CLASS_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>ConnectionStartBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>ConnectionStartBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CreateAMQFrame(System.UInt16,System.Byte,System.Byte,Qpid.Framing.FieldTable,System.Byte[],System.Byte[]):Qpid.Framing.AMQFrame">

-            <Messages>

-             <Message Id="1#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>VersionMajor</Item>

-              </Issue>

-             </Message>

-             <Message Id="2#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>VersionMinor</Item>

-              </Issue>

-             </Message>

-             <Message Id="3#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>ServerProperties</Item>

-              </Issue>

-             </Message>

-             <Message Id="4#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Mechanisms</Item>

-              </Issue>

-             </Message>

-             <Message Id="5#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Locales</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>ConnectionStartBody.CreateAMQFrame(UInt16, Byte, Byte, FieldTable, Byte[], Byte[]):AMQFrame</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Locales">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Locales</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Mechanisms">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Mechanisms</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="METHOD_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>ConnectionStartBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>ConnectionStartBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="ServerProperties">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>ServerProperties</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="VersionMajor">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>VersionMajor</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="VersionMinor">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>VersionMinor</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="ConnectionStartOkBody">

-          <Members>

-           <Member Name="CLASS_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>ConnectionStartOkBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>ConnectionStartOkBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="ClientProperties">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>ClientProperties</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CreateAMQFrame(System.UInt16,Qpid.Framing.FieldTable,System.String,System.Byte[],System.String):Qpid.Framing.AMQFrame">

-            <Messages>

-             <Message Id="1#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>ClientProperties</Item>

-              </Issue>

-             </Message>

-             <Message Id="2#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Mechanism</Item>

-              </Issue>

-             </Message>

-             <Message Id="3#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Response</Item>

-              </Issue>

-             </Message>

-             <Message Id="4#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Locale</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>ConnectionStartOkBody.CreateAMQFrame(UInt16, FieldTable, String, Byte[], String):AMQFrame</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Locale">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Locale</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Mechanism">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Mechanism</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="METHOD_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>ConnectionStartOkBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>ConnectionStartOkBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Response">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Response</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="ConnectionTuneBody">

-          <Members>

-           <Member Name="ChannelMax">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>ChannelMax</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CLASS_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>ConnectionTuneBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>ConnectionTuneBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CreateAMQFrame(System.UInt16,System.UInt16,System.UInt32,System.UInt16):Qpid.Framing.AMQFrame">

-            <Messages>

-             <Message Id="1#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>ChannelMax</Item>

-              </Issue>

-             </Message>

-             <Message Id="2#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>FrameMax</Item>

-              </Issue>

-             </Message>

-             <Message Id="3#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Heartbeat</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>ConnectionTuneBody.CreateAMQFrame(UInt16, UInt16, UInt32, UInt16):AMQFrame</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="FrameMax">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>FrameMax</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Heartbeat">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Heartbeat</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="METHOD_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>ConnectionTuneBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>ConnectionTuneBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="ConnectionTuneOkBody">

-          <Members>

-           <Member Name="ChannelMax">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>ChannelMax</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CLASS_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>ConnectionTuneOkBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>ConnectionTuneOkBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CreateAMQFrame(System.UInt16,System.UInt16,System.UInt32,System.UInt16):Qpid.Framing.AMQFrame">

-            <Messages>

-             <Message Id="1#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>ChannelMax</Item>

-              </Issue>

-             </Message>

-             <Message Id="2#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>FrameMax</Item>

-              </Issue>

-             </Message>

-             <Message Id="3#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Heartbeat</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>ConnectionTuneOkBody.CreateAMQFrame(UInt16, UInt16, UInt32, UInt16):AMQFrame</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="FrameMax">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>FrameMax</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Heartbeat">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Heartbeat</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="METHOD_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>ConnectionTuneOkBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>ConnectionTuneOkBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="ContentBody">

-          <Members>

-           <Member Name="CreateAMQFrame(System.UInt16,Qpid.Framing.ContentBody):Qpid.Framing.AMQFrame">

-            <Messages>

-             <Message TypeName="ConsiderPassingBaseTypesAsParameters" Category="Microsoft.Design" CheckId="CA1011" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>body</Item>

-               <Item>ContentBody.CreateAMQFrame(UInt16, ContentBody):AMQFrame</Item>

-               <Item>Qpid.Framing.ContentBody</Item>

-               <Item>Qpid.Framing.IBody</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>ContentBody.CreateAMQFrame(UInt16, ContentBody):AMQFrame</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Payload">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Payload</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="PopulateFromBuffer(Qpid.Buffer.ByteBuffer,System.UInt32):System.Void">

-            <Messages>

-             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>'buffer'</Item>

-               <Item>ContentBody.PopulateFromBuffer(ByteBuffer, UInt32):Void</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="TYPE">

-            <Messages>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>ContentBody.TYPE</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="WritePayload(Qpid.Buffer.ByteBuffer):System.Void">

-            <Messages>

-             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>'buffer'</Item>

-               <Item>ContentBody.WritePayload(ByteBuffer):Void</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="ContentBodyFactory">

-          <Members>

-           <Member Name="GetInstance():Qpid.Framing.ContentBodyFactory">

-            <Messages>

-             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>GetInstance</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="ContentHeaderBody">

-          <Members>

-           <Member Name="BodySize">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>BodySize</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="ClassId">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>ClassId</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CreateAMQFrame(System.UInt16,Qpid.Framing.ContentHeaderBody):Qpid.Framing.AMQFrame">

-            <Messages>

-             <Message TypeName="ConsiderPassingBaseTypesAsParameters" Category="Microsoft.Design" CheckId="CA1011" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>body</Item>

-               <Item>ContentHeaderBody.CreateAMQFrame(UInt16, ContentHeaderBody):AMQFrame</Item>

-               <Item>Qpid.Framing.ContentHeaderBody</Item>

-               <Item>Qpid.Framing.IBody</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>ContentHeaderBody.CreateAMQFrame(UInt16, ContentHeaderBody):AMQFrame</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CreateAMQFrame(System.UInt16,System.UInt16,System.UInt16,Qpid.Framing.BasicContentHeaderProperties,System.UInt32):Qpid.Framing.AMQFrame">

-            <Messages>

-             <Message TypeName="ConsiderPassingBaseTypesAsParameters" Category="Microsoft.Design" CheckId="CA1011" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>properties</Item>

-               <Item>ContentHeaderBody.CreateAMQFrame(UInt16, UInt16, UInt16, BasicContentHeaderProperties, UInt32):AMQFrame</Item>

-               <Item>Qpid.Framing.BasicContentHeaderProperties</Item>

-               <Item>Qpid.Framing.IContentHeaderProperties</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>ContentHeaderBody.CreateAMQFrame(UInt16, UInt16, UInt16, BasicContentHeaderProperties, UInt32):AMQFrame</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="PopulateFromBuffer(Qpid.Buffer.ByteBuffer,System.UInt32):System.Void">

-            <Messages>

-             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>'buffer'</Item>

-               <Item>ContentHeaderBody.PopulateFromBuffer(ByteBuffer, UInt32):Void</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Properties">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Properties</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="ToString():System.String">

-            <Messages>

-             <Message Id="System.String.Format(System.String,System.Object[])" TypeName="SpecifyIFormatProvider" Category="Microsoft.Globalization" CheckId="CA1305" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>ContentHeaderBody.ToString():String</Item>

-               <Item>System.String.Format(System.String,System.Object[])</Item>

-               <Item>System.String.Format(System.IFormatProvider,System.String,System.Object[])</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="TYPE">

-            <Messages>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>ContentHeaderBody.TYPE</Item>

-              </Issue>

-             </Message>

-             <Message TypeName="UseLiteralsWhereAppropriate" Category="Microsoft.Performance" CheckId="CA1802" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>TYPE</Item>

-               <Item>2</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Weight">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Weight</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="WritePayload(Qpid.Buffer.ByteBuffer):System.Void">

-            <Messages>

-             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>'buffer'</Item>

-               <Item>ContentHeaderBody.WritePayload(ByteBuffer):Void</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="ContentHeaderBodyFactory">

-          <Members>

-           <Member Name="GetInstance():Qpid.Framing.ContentHeaderBodyFactory">

-            <Messages>

-             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>GetInstance</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="ContentHeaderPropertiesFactory">

-          <Members>

-           <Member Name="CreateContentHeaderProperties(System.UInt16,System.UInt16,Qpid.Buffer.ByteBuffer):Qpid.Framing.IContentHeaderProperties">

-            <Messages>

-             <Message Id="Qpid.Framing.AMQFrameDecodingException.#ctor(System.String)" TypeName="DoNotPassLiteralsAsLocalizedParameters" Category="Microsoft.Globalization" CheckId="CA1303" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>ContentHeaderPropertiesFactory.CreateContentHeaderProperties(UInt16, UInt16, ByteBuffer):IContentHeaderProperties</Item>

-               <Item>1</Item>

-               <Item>AMQFrameDecodingException.AMQFrameDecodingException(String)</Item>

-               <Item>Unsupport content header class id: __</Item>

-              </Issue>

-             </Message>

-             <Message Id="Unsupport" TypeName="LiteralsShouldBeSpelledCorrectly" Category="Microsoft.Usage" CheckId="CA2204" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Unsupport</Item>

-               <Item>Unsupport content header class id: __</Item>

-              </Issue>

-             </Message>

-             <Message TypeName="MarkMembersAsStatic" Category="Microsoft.Performance" CheckId="CA1822" Created="2006-12-04 13:11:47Z" FixCategory="Breaking">

-              <Issue>

-               <Item>ContentHeaderPropertiesFactory.CreateContentHeaderProperties(UInt16, UInt16, ByteBuffer):IContentHeaderProperties</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="GetInstance():Qpid.Framing.ContentHeaderPropertiesFactory">

-            <Messages>

-             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>GetInstance</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="DtxSelectBody">

-          <Messages>

-           <Message Id="Dtx" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-            <Issue Name="Type">

-             <Item>Dtx</Item>

-             <Item>Qpid.Framing.DtxSelectBody</Item>

-            </Issue>

-           </Message>

-          </Messages>

-          <Members>

-           <Member Name="CLASS_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>DtxSelectBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>DtxSelectBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CreateAMQFrame(System.UInt16):Qpid.Framing.AMQFrame">

-            <Messages>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>DtxSelectBody.CreateAMQFrame(UInt16):AMQFrame</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="METHOD_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>DtxSelectBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>DtxSelectBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="DtxSelectOkBody">

-          <Messages>

-           <Message Id="Dtx" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-            <Issue Name="Type">

-             <Item>Dtx</Item>

-             <Item>Qpid.Framing.DtxSelectOkBody</Item>

-            </Issue>

-           </Message>

-          </Messages>

-          <Members>

-           <Member Name="CLASS_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>DtxSelectOkBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>DtxSelectOkBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CreateAMQFrame(System.UInt16):Qpid.Framing.AMQFrame">

-            <Messages>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>DtxSelectOkBody.CreateAMQFrame(UInt16):AMQFrame</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="METHOD_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>DtxSelectOkBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>DtxSelectOkBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="DtxStartBody">

-          <Messages>

-           <Message Id="Dtx" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-            <Issue Name="Type">

-             <Item>Dtx</Item>

-             <Item>Qpid.Framing.DtxStartBody</Item>

-            </Issue>

-           </Message>

-          </Messages>

-          <Members>

-           <Member Name="CLASS_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>DtxStartBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>DtxStartBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CreateAMQFrame(System.UInt16,System.String):Qpid.Framing.AMQFrame">

-            <Messages>

-             <Message Id="1#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>DtxIdentifier</Item>

-              </Issue>

-             </Message>

-             <Message Id="1#Dtx" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>DtxStartBody.CreateAMQFrame(UInt16, String):AMQFrame</Item>

-               <Item>Dtx</Item>

-               <Item>DtxIdentifier</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>DtxStartBody.CreateAMQFrame(UInt16, String):AMQFrame</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="DtxIdentifier">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>DtxIdentifier</Item>

-              </Issue>

-             </Message>

-             <Message Id="Dtx" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>Dtx</Item>

-               <Item>DtxStartBody.DtxIdentifier</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="METHOD_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>DtxStartBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>DtxStartBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="DtxStartOkBody">

-          <Messages>

-           <Message Id="Dtx" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-            <Issue Name="Type">

-             <Item>Dtx</Item>

-             <Item>Qpid.Framing.DtxStartOkBody</Item>

-            </Issue>

-           </Message>

-          </Messages>

-          <Members>

-           <Member Name="CLASS_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>DtxStartOkBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>DtxStartOkBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CreateAMQFrame(System.UInt16):Qpid.Framing.AMQFrame">

-            <Messages>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>DtxStartOkBody.CreateAMQFrame(UInt16):AMQFrame</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="METHOD_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>DtxStartOkBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>DtxStartOkBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="EncodingUtils">

-          <Messages>

-           <Message Id="Utils" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-            <Issue Name="Type">

-             <Item>Utils</Item>

-             <Item>Qpid.Framing.EncodingUtils</Item>

-            </Issue>

-           </Message>

-           <Message TypeName="StaticHolderTypesShouldNotHaveConstructors" Category="Microsoft.Design" CheckId="CA1053" Created="2006-12-04 13:11:47Z">

-            <Issue>

-             <Item>EncodingUtils</Item>

-            </Issue>

-           </Message>

-          </Messages>

-          <Members>

-           <Member Name="EncodedLongStringLength(System.String):System.UInt32">

-            <Messages>

-             <Message Id="0#s" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="ParameterOneLetter">

-               <Item>EncodingUtils.EncodedLongStringLength(String):UInt32</Item>

-               <Item>s</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="EncodedLongstrLength(System.Byte[]):System.Int32">

-            <Messages>

-             <Message Id="Longstr" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>Longstr</Item>

-               <Item>EncodingUtils.EncodedLongstrLength(Byte[]):Int32</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="EncodedShortStringLength(System.String):System.UInt16">

-            <Messages>

-             <Message Id="0#s" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="ParameterOneLetter">

-               <Item>EncodingUtils.EncodedShortStringLength(String):UInt16</Item>

-               <Item>s</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="ReadBooleans(Qpid.Buffer.ByteBuffer):System.Boolean[]">

-            <Messages>

-             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>'buffer'</Item>

-               <Item>EncodingUtils.ReadBooleans(ByteBuffer):Boolean[]</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="ReadFieldTable(Qpid.Buffer.ByteBuffer):Qpid.Framing.FieldTable">

-            <Messages>

-             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>'buffer'</Item>

-               <Item>EncodingUtils.ReadFieldTable(ByteBuffer):FieldTable</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="ReadLongstr(Qpid.Buffer.ByteBuffer):System.Byte[]">

-            <Messages>

-             <Message Id="Longstr" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>Longstr</Item>

-               <Item>EncodingUtils.ReadLongstr(ByteBuffer):Byte[]</Item>

-              </Issue>

-             </Message>

-             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>'buffer'</Item>

-               <Item>EncodingUtils.ReadLongstr(ByteBuffer):Byte[]</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="ReadLongString(Qpid.Buffer.ByteBuffer):System.String">

-            <Messages>

-             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>'buffer'</Item>

-               <Item>EncodingUtils.ReadLongString(ByteBuffer):String</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="ReadShortString(Qpid.Buffer.ByteBuffer):System.String">

-            <Messages>

-             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>'buffer'</Item>

-               <Item>EncodingUtils.ReadShortString(ByteBuffer):String</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="WriteBooleans(Qpid.Buffer.ByteBuffer,System.Boolean[]):System.Void">

-            <Messages>

-             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>'buffer'</Item>

-               <Item>EncodingUtils.WriteBooleans(ByteBuffer, Boolean[]):Void</Item>

-              </Issue>

-              <Issue>

-               <Item>'values'</Item>

-               <Item>EncodingUtils.WriteBooleans(ByteBuffer, Boolean[]):Void</Item>

-              </Issue>

-              <Issue>

-               <Item>'values'</Item>

-               <Item>EncodingUtils.WriteBooleans(ByteBuffer, Boolean[]):Void</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="WriteFieldTableBytes(Qpid.Buffer.ByteBuffer,Qpid.Framing.FieldTable):System.Void">

-            <Messages>

-             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>'buffer'</Item>

-               <Item>EncodingUtils.WriteFieldTableBytes(ByteBuffer, FieldTable):Void</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="WriteLongstr(Qpid.Buffer.ByteBuffer,System.Byte[]):System.Void">

-            <Messages>

-             <Message Id="Longstr" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>Longstr</Item>

-               <Item>EncodingUtils.WriteLongstr(ByteBuffer, Byte[]):Void</Item>

-              </Issue>

-             </Message>

-             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>'buffer'</Item>

-               <Item>EncodingUtils.WriteLongstr(ByteBuffer, Byte[]):Void</Item>

-              </Issue>

-              <Issue>

-               <Item>'buffer'</Item>

-               <Item>EncodingUtils.WriteLongstr(ByteBuffer, Byte[]):Void</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="WriteLongStringBytes(Qpid.Buffer.ByteBuffer,System.String):System.Void">

-            <Messages>

-             <Message Id="System.ArgumentException.#ctor(System.String)" TypeName="DoNotPassLiteralsAsLocalizedParameters" Category="Microsoft.Globalization" CheckId="CA1303" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>EncodingUtils.WriteLongStringBytes(ByteBuffer, String):Void</Item>

-               <Item>1</Item>

-               <Item>ArgumentException.ArgumentException(String)</Item>

-               <Item>String too long</Item>

-              </Issue>

-             </Message>

-             <Message Id="1#s" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="ParameterOneLetter">

-               <Item>EncodingUtils.WriteLongStringBytes(ByteBuffer, String):Void</Item>

-               <Item>s</Item>

-              </Issue>

-             </Message>

-             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>'buffer'</Item>

-               <Item>EncodingUtils.WriteLongStringBytes(ByteBuffer, String):Void</Item>

-              </Issue>

-              <Issue>

-               <Item>'buffer'</Item>

-               <Item>EncodingUtils.WriteLongStringBytes(ByteBuffer, String):Void</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="WriteShortStringBytes(Qpid.Buffer.ByteBuffer,System.String):System.Void">

-            <Messages>

-             <Message Id="1#s" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="ParameterOneLetter">

-               <Item>EncodingUtils.WriteShortStringBytes(ByteBuffer, String):Void</Item>

-               <Item>s</Item>

-              </Issue>

-             </Message>

-             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>'buffer'</Item>

-               <Item>EncodingUtils.WriteShortStringBytes(ByteBuffer, String):Void</Item>

-              </Issue>

-              <Issue>

-               <Item>'buffer'</Item>

-               <Item>EncodingUtils.WriteShortStringBytes(ByteBuffer, String):Void</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="ExchangeDeclareBody">

-          <Members>

-           <Member Name="Arguments">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Arguments</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="AutoDelete">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>AutoDelete</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CLASS_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>ExchangeDeclareBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>ExchangeDeclareBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CreateAMQFrame(System.UInt16,System.UInt16,System.String,System.String,System.Boolean,System.Boolean,System.Boolean,System.Boolean,System.Boolean,Qpid.Framing.FieldTable):Qpid.Framing.AMQFrame">

-            <Messages>

-             <Message Id="1#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Ticket</Item>

-              </Issue>

-             </Message>

-             <Message Id="2#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Exchange</Item>

-              </Issue>

-             </Message>

-             <Message Id="3#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Type</Item>

-              </Issue>

-             </Message>

-             <Message Id="4#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Passive</Item>

-              </Issue>

-             </Message>

-             <Message Id="5#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Durable</Item>

-              </Issue>

-             </Message>

-             <Message Id="6#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>AutoDelete</Item>

-              </Issue>

-             </Message>

-             <Message Id="7#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Internal</Item>

-              </Issue>

-             </Message>

-             <Message Id="8#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Nowait</Item>

-              </Issue>

-             </Message>

-             <Message Id="9#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Arguments</Item>

-              </Issue>

-             </Message>

-             <Message Id="8#Nowait" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>ExchangeDeclareBody.CreateAMQFrame(UInt16, UInt16, String, String, Boolean, Boolean, Boolean, Boolean, Boolean, FieldTable):AMQFrame</Item>

-               <Item>Nowait</Item>

-               <Item>Nowait</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>ExchangeDeclareBody.CreateAMQFrame(UInt16, UInt16, String, String, Boolean, Boolean, Boolean, Boolean, Boolean, FieldTable):AMQFrame</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Durable">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Durable</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Exchange">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Exchange</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Internal">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Internal</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="METHOD_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>ExchangeDeclareBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>ExchangeDeclareBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Nowait">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Nowait</Item>

-              </Issue>

-             </Message>

-             <Message Id="Nowait" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>Nowait</Item>

-               <Item>ExchangeDeclareBody.Nowait</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Passive">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Passive</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Ticket">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Ticket</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Type">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Type</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="ExchangeDeclareOkBody">

-          <Members>

-           <Member Name="CLASS_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>ExchangeDeclareOkBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>ExchangeDeclareOkBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CreateAMQFrame(System.UInt16):Qpid.Framing.AMQFrame">

-            <Messages>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>ExchangeDeclareOkBody.CreateAMQFrame(UInt16):AMQFrame</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="METHOD_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>ExchangeDeclareOkBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>ExchangeDeclareOkBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="ExchangeDeleteBody">

-          <Members>

-           <Member Name="CLASS_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>ExchangeDeleteBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>ExchangeDeleteBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CreateAMQFrame(System.UInt16,System.UInt16,System.String,System.Boolean,System.Boolean):Qpid.Framing.AMQFrame">

-            <Messages>

-             <Message Id="1#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Ticket</Item>

-              </Issue>

-             </Message>

-             <Message Id="2#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Exchange</Item>

-              </Issue>

-             </Message>

-             <Message Id="3#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>IfUnused</Item>

-              </Issue>

-             </Message>

-             <Message Id="4#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Nowait</Item>

-              </Issue>

-             </Message>

-             <Message Id="4#Nowait" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>ExchangeDeleteBody.CreateAMQFrame(UInt16, UInt16, String, Boolean, Boolean):AMQFrame</Item>

-               <Item>Nowait</Item>

-               <Item>Nowait</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>ExchangeDeleteBody.CreateAMQFrame(UInt16, UInt16, String, Boolean, Boolean):AMQFrame</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Exchange">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Exchange</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="IfUnused">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>IfUnused</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="METHOD_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>ExchangeDeleteBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>ExchangeDeleteBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Nowait">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Nowait</Item>

-              </Issue>

-             </Message>

-             <Message Id="Nowait" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>Nowait</Item>

-               <Item>ExchangeDeleteBody.Nowait</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Ticket">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Ticket</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="ExchangeDeleteOkBody">

-          <Members>

-           <Member Name="CLASS_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>ExchangeDeleteOkBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>ExchangeDeleteOkBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CreateAMQFrame(System.UInt16):Qpid.Framing.AMQFrame">

-            <Messages>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>ExchangeDeleteOkBody.CreateAMQFrame(UInt16):AMQFrame</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="METHOD_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>ExchangeDeleteOkBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>ExchangeDeleteOkBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="FieldTable">

-          <Messages>

-           <Message TypeName="CollectionsShouldImplementGenericInterface" Category="Microsoft.Design" CheckId="CA1010" Created="2006-12-04 13:11:47Z">

-            <Issue Certainty="60">

-             <Item>FieldTable</Item>

-             <Item>IEnumerable</Item>

-            </Issue>

-           </Message>

-           <Message TypeName="IdentifiersShouldHaveCorrectSuffix" Category="Microsoft.Naming" CheckId="CA1710" Created="2006-12-04 13:11:47Z">

-            <Issue>

-             <Item>Qpid.Framing.FieldTable</Item>

-             <Item>Collection</Item>

-            </Issue>

-           </Message>

-          </Messages>

-          <Members>

-           <Member Name=".ctor()">

-            <Messages>

-             <Message TypeName="DoNotInitializeUnnecessarily" Category="Microsoft.Performance" CheckId="CA1805" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>FieldTable.FieldTable()</Item>

-               <Item>_encodedSize</Item>

-               <Item>System.UInt32</Item>

-               <Item>0</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name=".ctor(Qpid.Buffer.ByteBuffer,System.UInt32)">

-            <Messages>

-             <Message Id="Qpid.Framing.AMQFrameDecodingException.#ctor(System.String)" TypeName="DoNotPassLiteralsAsLocalizedParameters" Category="Microsoft.Globalization" CheckId="CA1303" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>FieldTable.FieldTable(ByteBuffer, UInt32)</Item>

-               <Item>1</Item>

-               <Item>AMQFrameDecodingException.AMQFrameDecodingException(String)</Item>

-               <Item>Unsupported field table type: __</Item>

-              </Issue>

-             </Message>

-             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>'buffer'</Item>

-               <Item>FieldTable.FieldTable(ByteBuffer, UInt32)</Item>

-              </Issue>

-              <Issue>

-               <Item>'buffer'</Item>

-               <Item>FieldTable.FieldTable(ByteBuffer, UInt32)</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="AddAll(Qpid.Messaging.IFieldTable):System.Void">

-            <Messages>

-             <Message Id="0#" TypeName="ParameterNamesShouldMatchBaseDeclaration" Category="Microsoft.Naming" CheckId="CA1725" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>ft</Item>

-               <Item>FieldTable.AddAll(IFieldTable):Void</Item>

-               <Item>source</Item>

-               <Item>IFieldTable.AddAll(IFieldTable):Void</Item>

-              </Issue>

-             </Message>

-             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>'ft'</Item>

-               <Item>FieldTable.AddAll(IFieldTable):Void</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="AdjustEncodingSizeWhenAdding(System.Object,System.Object):System.Void">

-            <Messages>

-             <Message TypeName="DoNotCastUnnecessarily" Category="Microsoft.Performance" CheckId="CA1800" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>value</Item>

-               <Item>System.String</Item>

-               <Item>FieldTable.AdjustEncodingSizeWhenAdding(Object, Object):Void</Item>

-               <Item>castclass</Item>

-              </Issue>

-             </Message>

-             <Message Id="System.Exception.#ctor(System.String)" TypeName="DoNotPassLiteralsAsLocalizedParameters" Category="Microsoft.Globalization" CheckId="CA1303" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>FieldTable.AdjustEncodingSizeWhenAdding(Object, Object):Void</Item>

-               <Item>1</Item>

-               <Item>Exception.Exception(String)</Item>

-               <Item>Unsupported value type: __</Item>

-              </Issue>

-             </Message>

-             <Message TypeName="DoNotRaiseReservedExceptionTypes" Category="Microsoft.Usage" CheckId="CA2201" Created="2006-12-04 13:11:47Z">

-              <Issue Name="TooGeneric">

-               <Item>FieldTable.AdjustEncodingSizeWhenAdding(Object, Object):Void</Item>

-               <Item>System.Exception</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="AdjustEncodingSizeWhenRemoving(System.Object,System.Object):System.Void">

-            <Messages>

-             <Message TypeName="DoNotCastUnnecessarily" Category="Microsoft.Performance" CheckId="CA1800" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>value</Item>

-               <Item>System.String</Item>

-               <Item>FieldTable.AdjustEncodingSizeWhenRemoving(Object, Object):Void</Item>

-               <Item>castclass</Item>

-              </Issue>

-             </Message>

-             <Message Id="System.Exception.#ctor(System.String)" TypeName="DoNotPassLiteralsAsLocalizedParameters" Category="Microsoft.Globalization" CheckId="CA1303" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>FieldTable.AdjustEncodingSizeWhenRemoving(Object, Object):Void</Item>

-               <Item>1</Item>

-               <Item>Exception.Exception(String)</Item>

-               <Item>Illegal value type: __</Item>

-              </Issue>

-             </Message>

-             <Message TypeName="DoNotRaiseReservedExceptionTypes" Category="Microsoft.Usage" CheckId="CA2201" Created="2006-12-04 13:11:47Z">

-              <Issue Name="TooGeneric">

-               <Item>FieldTable.AdjustEncodingSizeWhenRemoving(Object, Object):Void</Item>

-               <Item>System.Exception</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CheckKey(System.Object):System.Void">

-            <Messages>

-             <Message Id="System.ArgumentException.#ctor(System.String)" TypeName="DoNotPassLiteralsAsLocalizedParameters" Category="Microsoft.Globalization" CheckId="CA1303" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>FieldTable.CheckKey(Object):Void</Item>

-               <Item>1</Item>

-               <Item>ArgumentException.ArgumentException(String)</Item>

-               <Item>All keys must be Strings - was passed: __</Item>

-              </Issue>

-             </Message>

-             <Message TypeName="MarkMembersAsStatic" Category="Microsoft.Performance" CheckId="CA1822" Created="2006-12-04 13:11:47Z" FixCategory="NonBreaking">

-              <Issue>

-               <Item>FieldTable.CheckKey(Object):Void</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CheckValue(System.Object):System.Void">

-            <Messages>

-             <Message Id="System.ArgumentException.#ctor(System.String)" TypeName="DoNotPassLiteralsAsLocalizedParameters" Category="Microsoft.Globalization" CheckId="CA1303" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>FieldTable.CheckValue(Object):Void</Item>

-               <Item>1</Item>

-               <Item>ArgumentException.ArgumentException(String)</Item>

-               <Item>All values must be type string or int or long or uint, was passed: __</Item>

-              </Issue>

-             </Message>

-             <Message TypeName="MarkMembersAsStatic" Category="Microsoft.Performance" CheckId="CA1822" Created="2006-12-04 13:11:47Z" FixCategory="NonBreaking">

-              <Issue>

-               <Item>FieldTable.CheckValue(Object):Void</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="WritePayload(Qpid.Buffer.ByteBuffer):System.Void">

-            <Messages>

-             <Message TypeName="DoNotCastUnnecessarily" Category="Microsoft.Performance" CheckId="CA1800" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Local">

-               <Item>value</Item>

-               <Item>System.Byte[]</Item>

-               <Item>FieldTable.WritePayload(ByteBuffer):Void</Item>

-               <Item>castclass</Item>

-              </Issue>

-              <Issue Name="Local">

-               <Item>value</Item>

-               <Item>System.String</Item>

-               <Item>FieldTable.WritePayload(ByteBuffer):Void</Item>

-               <Item>castclass</Item>

-              </Issue>

-             </Message>

-             <Message Id="System.InvalidOperationException.#ctor(System.String)" TypeName="DoNotPassLiteralsAsLocalizedParameters" Category="Microsoft.Globalization" CheckId="CA1303" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>FieldTable.WritePayload(ByteBuffer):Void</Item>

-               <Item>1</Item>

-               <Item>InvalidOperationException.InvalidOperationException(String)</Item>

-               <Item>Unsupported type in FieldTable: __</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="WriteToBuffer(Qpid.Buffer.ByteBuffer):System.Void">

-            <Messages>

-             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>'buffer'</Item>

-               <Item>FieldTable.WriteToBuffer(ByteBuffer):Void</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="FileAckBody">

-          <Messages>

-           <Message Id="Ack" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-            <Issue Name="Type">

-             <Item>Ack</Item>

-             <Item>Qpid.Framing.FileAckBody</Item>

-            </Issue>

-           </Message>

-          </Messages>

-          <Members>

-           <Member Name="CLASS_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>FileAckBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>FileAckBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CreateAMQFrame(System.UInt16,System.UInt64,System.Boolean):Qpid.Framing.AMQFrame">

-            <Messages>

-             <Message Id="1#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>DeliveryTag</Item>

-              </Issue>

-             </Message>

-             <Message Id="2#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Multiple</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>FileAckBody.CreateAMQFrame(UInt16, UInt64, Boolean):AMQFrame</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="DeliveryTag">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>DeliveryTag</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="METHOD_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>FileAckBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>FileAckBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Multiple">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Multiple</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="FileCancelBody">

-          <Members>

-           <Member Name="CLASS_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>FileCancelBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>FileCancelBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="ConsumerTag">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>ConsumerTag</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CreateAMQFrame(System.UInt16,System.String,System.Boolean):Qpid.Framing.AMQFrame">

-            <Messages>

-             <Message Id="1#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>ConsumerTag</Item>

-              </Issue>

-             </Message>

-             <Message Id="2#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Nowait</Item>

-              </Issue>

-             </Message>

-             <Message Id="2#Nowait" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>FileCancelBody.CreateAMQFrame(UInt16, String, Boolean):AMQFrame</Item>

-               <Item>Nowait</Item>

-               <Item>Nowait</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>FileCancelBody.CreateAMQFrame(UInt16, String, Boolean):AMQFrame</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="METHOD_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>FileCancelBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>FileCancelBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Nowait">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Nowait</Item>

-              </Issue>

-             </Message>

-             <Message Id="Nowait" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>Nowait</Item>

-               <Item>FileCancelBody.Nowait</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="FileCancelOkBody">

-          <Members>

-           <Member Name="CLASS_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>FileCancelOkBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>FileCancelOkBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="ConsumerTag">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>ConsumerTag</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CreateAMQFrame(System.UInt16,System.String):Qpid.Framing.AMQFrame">

-            <Messages>

-             <Message Id="1#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>ConsumerTag</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>FileCancelOkBody.CreateAMQFrame(UInt16, String):AMQFrame</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="METHOD_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>FileCancelOkBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>FileCancelOkBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="FileConsumeBody">

-          <Members>

-           <Member Name="CLASS_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>FileConsumeBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>FileConsumeBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="ConsumerTag">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>ConsumerTag</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CreateAMQFrame(System.UInt16,System.UInt16,System.String,System.String,System.Boolean,System.Boolean,System.Boolean,System.Boolean):Qpid.Framing.AMQFrame">

-            <Messages>

-             <Message Id="1#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Ticket</Item>

-              </Issue>

-             </Message>

-             <Message Id="2#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Queue</Item>

-              </Issue>

-             </Message>

-             <Message Id="3#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>ConsumerTag</Item>

-              </Issue>

-             </Message>

-             <Message Id="4#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>NoLocal</Item>

-              </Issue>

-             </Message>

-             <Message Id="5#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>NoAck</Item>

-              </Issue>

-             </Message>

-             <Message Id="6#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Exclusive</Item>

-              </Issue>

-             </Message>

-             <Message Id="7#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Nowait</Item>

-              </Issue>

-             </Message>

-             <Message Id="5#Ack" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>FileConsumeBody.CreateAMQFrame(UInt16, UInt16, String, String, Boolean, Boolean, Boolean, Boolean):AMQFrame</Item>

-               <Item>Ack</Item>

-               <Item>NoAck</Item>

-              </Issue>

-             </Message>

-             <Message Id="7#Nowait" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>FileConsumeBody.CreateAMQFrame(UInt16, UInt16, String, String, Boolean, Boolean, Boolean, Boolean):AMQFrame</Item>

-               <Item>Nowait</Item>

-               <Item>Nowait</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>FileConsumeBody.CreateAMQFrame(UInt16, UInt16, String, String, Boolean, Boolean, Boolean, Boolean):AMQFrame</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Exclusive">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Exclusive</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="METHOD_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>FileConsumeBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>FileConsumeBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="NoAck">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>NoAck</Item>

-              </Issue>

-             </Message>

-             <Message Id="Ack" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>Ack</Item>

-               <Item>FileConsumeBody.NoAck</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="NoLocal">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>NoLocal</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Nowait">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Nowait</Item>

-              </Issue>

-             </Message>

-             <Message Id="Nowait" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>Nowait</Item>

-               <Item>FileConsumeBody.Nowait</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Queue">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Queue</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Ticket">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Ticket</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="FileConsumeOkBody">

-          <Members>

-           <Member Name="CLASS_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>FileConsumeOkBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>FileConsumeOkBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="ConsumerTag">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>ConsumerTag</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CreateAMQFrame(System.UInt16,System.String):Qpid.Framing.AMQFrame">

-            <Messages>

-             <Message Id="1#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>ConsumerTag</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>FileConsumeOkBody.CreateAMQFrame(UInt16, String):AMQFrame</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="METHOD_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>FileConsumeOkBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>FileConsumeOkBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="FileDeliverBody">

-          <Members>

-           <Member Name="CLASS_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>FileDeliverBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>FileDeliverBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="ConsumerTag">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>ConsumerTag</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CreateAMQFrame(System.UInt16,System.String,System.UInt64,System.Boolean,System.String,System.String,System.String):Qpid.Framing.AMQFrame">

-            <Messages>

-             <Message Id="1#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>ConsumerTag</Item>

-              </Issue>

-             </Message>

-             <Message Id="2#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>DeliveryTag</Item>

-              </Issue>

-             </Message>

-             <Message Id="3#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Redelivered</Item>

-              </Issue>

-             </Message>

-             <Message Id="4#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Exchange</Item>

-              </Issue>

-             </Message>

-             <Message Id="5#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>RoutingKey</Item>

-              </Issue>

-             </Message>

-             <Message Id="6#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Identifier</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>FileDeliverBody.CreateAMQFrame(UInt16, String, UInt64, Boolean, String, String, String):AMQFrame</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="DeliveryTag">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>DeliveryTag</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Exchange">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Exchange</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Identifier">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Identifier</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="METHOD_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>FileDeliverBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>FileDeliverBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Redelivered">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Redelivered</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="RoutingKey">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>RoutingKey</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="FileOpenBody">

-          <Members>

-           <Member Name="CLASS_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>FileOpenBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>FileOpenBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="ContentSize">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>ContentSize</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CreateAMQFrame(System.UInt16,System.String,System.UInt64):Qpid.Framing.AMQFrame">

-            <Messages>

-             <Message Id="1#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Identifier</Item>

-              </Issue>

-             </Message>

-             <Message Id="2#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>ContentSize</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>FileOpenBody.CreateAMQFrame(UInt16, String, UInt64):AMQFrame</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Identifier">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Identifier</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="METHOD_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>FileOpenBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>FileOpenBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="FileOpenOkBody">

-          <Members>

-           <Member Name="CLASS_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>FileOpenOkBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>FileOpenOkBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CreateAMQFrame(System.UInt16,System.UInt64):Qpid.Framing.AMQFrame">

-            <Messages>

-             <Message Id="1#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>StagedSize</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>FileOpenOkBody.CreateAMQFrame(UInt16, UInt64):AMQFrame</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="METHOD_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>FileOpenOkBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>FileOpenOkBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="StagedSize">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>StagedSize</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="FilePublishBody">

-          <Members>

-           <Member Name="CLASS_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>FilePublishBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>FilePublishBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CreateAMQFrame(System.UInt16,System.UInt16,System.String,System.String,System.Boolean,System.Boolean,System.String):Qpid.Framing.AMQFrame">

-            <Messages>

-             <Message Id="1#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Ticket</Item>

-              </Issue>

-             </Message>

-             <Message Id="2#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Exchange</Item>

-              </Issue>

-             </Message>

-             <Message Id="3#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>RoutingKey</Item>

-              </Issue>

-             </Message>

-             <Message Id="4#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Mandatory</Item>

-              </Issue>

-             </Message>

-             <Message Id="5#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Immediate</Item>

-              </Issue>

-             </Message>

-             <Message Id="6#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Identifier</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>FilePublishBody.CreateAMQFrame(UInt16, UInt16, String, String, Boolean, Boolean, String):AMQFrame</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Exchange">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Exchange</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Identifier">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Identifier</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Immediate">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Immediate</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Mandatory">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Mandatory</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="METHOD_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>FilePublishBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>FilePublishBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="RoutingKey">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>RoutingKey</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Ticket">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Ticket</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="FileQosBody">

-          <Messages>

-           <Message Id="Qos" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-            <Issue Name="Type">

-             <Item>Qos</Item>

-             <Item>Qpid.Framing.FileQosBody</Item>

-            </Issue>

-           </Message>

-          </Messages>

-          <Members>

-           <Member Name="CLASS_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>FileQosBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>FileQosBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CreateAMQFrame(System.UInt16,System.UInt32,System.UInt16,System.Boolean):Qpid.Framing.AMQFrame">

-            <Messages>

-             <Message Id="1#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>PrefetchSize</Item>

-              </Issue>

-             </Message>

-             <Message Id="2#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>PrefetchCount</Item>

-              </Issue>

-             </Message>

-             <Message Id="3#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Global</Item>

-              </Issue>

-             </Message>

-             <Message Id="1#Prefetch" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>FileQosBody.CreateAMQFrame(UInt16, UInt32, UInt16, Boolean):AMQFrame</Item>

-               <Item>Prefetch</Item>

-               <Item>PrefetchSize</Item>

-              </Issue>

-             </Message>

-             <Message Id="2#Prefetch" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>FileQosBody.CreateAMQFrame(UInt16, UInt32, UInt16, Boolean):AMQFrame</Item>

-               <Item>Prefetch</Item>

-               <Item>PrefetchCount</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>FileQosBody.CreateAMQFrame(UInt16, UInt32, UInt16, Boolean):AMQFrame</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Global">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Global</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="METHOD_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>FileQosBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>FileQosBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="PrefetchCount">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>PrefetchCount</Item>

-              </Issue>

-             </Message>

-             <Message Id="Prefetch" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>Prefetch</Item>

-               <Item>FileQosBody.PrefetchCount</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="PrefetchSize">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>PrefetchSize</Item>

-              </Issue>

-             </Message>

-             <Message Id="Prefetch" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>Prefetch</Item>

-               <Item>FileQosBody.PrefetchSize</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="FileQosOkBody">

-          <Messages>

-           <Message Id="Qos" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-            <Issue Name="Type">

-             <Item>Qos</Item>

-             <Item>Qpid.Framing.FileQosOkBody</Item>

-            </Issue>

-           </Message>

-          </Messages>

-          <Members>

-           <Member Name="CLASS_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>FileQosOkBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>FileQosOkBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CreateAMQFrame(System.UInt16):Qpid.Framing.AMQFrame">

-            <Messages>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>FileQosOkBody.CreateAMQFrame(UInt16):AMQFrame</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="METHOD_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>FileQosOkBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>FileQosOkBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="FileRejectBody">

-          <Members>

-           <Member Name="CLASS_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>FileRejectBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>FileRejectBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CreateAMQFrame(System.UInt16,System.UInt64,System.Boolean):Qpid.Framing.AMQFrame">

-            <Messages>

-             <Message Id="1#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>DeliveryTag</Item>

-              </Issue>

-             </Message>

-             <Message Id="2#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Requeue</Item>

-              </Issue>

-             </Message>

-             <Message Id="2#Requeue" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>FileRejectBody.CreateAMQFrame(UInt16, UInt64, Boolean):AMQFrame</Item>

-               <Item>Requeue</Item>

-               <Item>Requeue</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>FileRejectBody.CreateAMQFrame(UInt16, UInt64, Boolean):AMQFrame</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="DeliveryTag">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>DeliveryTag</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="METHOD_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>FileRejectBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>FileRejectBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Requeue">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Requeue</Item>

-              </Issue>

-             </Message>

-             <Message Id="Requeue" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>Requeue</Item>

-               <Item>FileRejectBody.Requeue</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="FileReturnBody">

-          <Members>

-           <Member Name="CLASS_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>FileReturnBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>FileReturnBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CreateAMQFrame(System.UInt16,System.UInt16,System.String,System.String,System.String):Qpid.Framing.AMQFrame">

-            <Messages>

-             <Message Id="1#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>ReplyCode</Item>

-              </Issue>

-             </Message>

-             <Message Id="2#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>ReplyText</Item>

-              </Issue>

-             </Message>

-             <Message Id="3#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Exchange</Item>

-              </Issue>

-             </Message>

-             <Message Id="4#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>RoutingKey</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>FileReturnBody.CreateAMQFrame(UInt16, UInt16, String, String, String):AMQFrame</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Exchange">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Exchange</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="METHOD_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>FileReturnBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>FileReturnBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="ReplyCode">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>ReplyCode</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="ReplyText">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>ReplyText</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="RoutingKey">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>RoutingKey</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="FileStageBody">

-          <Members>

-           <Member Name="CLASS_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>FileStageBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>FileStageBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CreateAMQFrame(System.UInt16):Qpid.Framing.AMQFrame">

-            <Messages>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>FileStageBody.CreateAMQFrame(UInt16):AMQFrame</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="METHOD_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>FileStageBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>FileStageBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="HeartbeatBody">

-          <Members>

-           <Member Name="FRAME">

-            <Messages>

-             <Message TypeName="NonConstantFieldsShouldNotBeVisible" Category="Microsoft.Usage" CheckId="CA2211" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>FRAME</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="PopulateFromBuffer(Qpid.Buffer.ByteBuffer,System.UInt32):System.Void">

-            <Messages>

-             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>'buffer'</Item>

-               <Item>HeartbeatBody.PopulateFromBuffer(ByteBuffer, UInt32):Void</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="TYPE">

-            <Messages>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>HeartbeatBody.TYPE</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="HeartbeatBodyFactory">

-          <Members>

-           <Member Name="CreateBody(Qpid.Buffer.ByteBuffer):Qpid.Framing.IBody">

-            <Messages>

-             <Message Id="0#" TypeName="ParameterNamesShouldMatchBaseDeclaration" Category="Microsoft.Naming" CheckId="CA1725" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>input</Item>

-               <Item>HeartbeatBodyFactory.CreateBody(ByteBuffer):IBody</Item>

-               <Item>inbuf</Item>

-               <Item>IBodyFactory.CreateBody(ByteBuffer):IBody</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="IBodyFactory">

-          <Members>

-           <Member Name="CreateBody(Qpid.Buffer.ByteBuffer):Qpid.Framing.IBody">

-            <Messages>

-             <Message Id="0#inbuf" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>IBodyFactory.CreateBody(ByteBuffer):IBody</Item>

-               <Item>inbuf</Item>

-               <Item>inbuf</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="IEncodableAMQDataBlock">

-          <Messages>

-           <Message TypeName="AvoidEmptyInterfaces" Category="Microsoft.Design" CheckId="CA1040" Created="2006-12-04 13:11:47Z">

-            <Issue>

-             <Item>IEncodableAMQDataBlock</Item>

-            </Issue>

-           </Message>

-           <Message TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-            <Issue Name="Type">

-             <Item>IEncodableAMQDataBlock</Item>

-            </Issue>

-           </Message>

-          </Messages>

-         </Type>

-         <Type Name="MainRegistry">

-          <Messages>

-           <Message TypeName="AvoidUninstantiatedInternalClasses" Category="Microsoft.Performance" CheckId="CA1812" Created="2006-12-04 13:11:47Z">

-            <Issue>

-             <Item>Qpid.Framing.MainRegistry</Item>

-            </Issue>

-           </Message>

-          </Messages>

-         </Type>

-         <Type Name="MethodBodyDecoderRegistry">

-          <Messages>

-           <Message TypeName="StaticHolderTypesShouldNotHaveConstructors" Category="Microsoft.Design" CheckId="CA1053" Created="2006-12-04 13:11:47Z">

-            <Issue>

-             <Item>MethodBodyDecoderRegistry</Item>

-            </Issue>

-           </Message>

-          </Messages>

-          <Members>

-           <Member Name=".cctor()">

-            <Messages>

-             <Message TypeName="InitializeReferenceTypeStaticFieldsInline" Category="Microsoft.Performance" CheckId="CA1810" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Qpid.Framing.MethodBodyDecoderRegistry</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Get(System.Int32,System.Int32):Qpid.Framing.AMQMethodBody">

-            <Messages>

-             <Message Id="Qpid.Framing.AMQFrameDecodingException.#ctor(log4net.ILog,System.String)" TypeName="DoNotPassLiteralsAsLocalizedParameters" Category="Microsoft.Globalization" CheckId="CA1303" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>MethodBodyDecoderRegistry.Get(Int32, Int32):AMQMethodBody</Item>

-               <Item>2</Item>

-               <Item>AMQFrameDecodingException.AMQFrameDecodingException(ILog, String)</Item>

-               <Item>Unable to find a suitable decoder for class ____ and method __</Item>

-              </Issue>

-             </Message>

-             <Message Id="Qpid.Framing.AMQFrameDecodingException.#ctor(log4net.ILog,System.String,System.Exception)" TypeName="DoNotPassLiteralsAsLocalizedParameters" Category="Microsoft.Globalization" CheckId="CA1303" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>MethodBodyDecoderRegistry.Get(Int32, Int32):AMQMethodBody</Item>

-               <Item>2</Item>

-               <Item>AMQFrameDecodingException.AMQFrameDecodingException(ILog, String, Exception)</Item>

-               <Item>Unable to instantiate body class for class ____ and method ____: __</Item>

-              </Issue>

-             </Message>

-             <Message Id="0#clazz" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>MethodBodyDecoderRegistry.Get(Int32, Int32):AMQMethodBody</Item>

-               <Item>clazz</Item>

-               <Item>clazz</Item>

-              </Issue>

-             </Message>

-             <Message Id="clazz*1000" TypeName="OperationsShouldNotOverflow" Category="Microsoft.Usage" CheckId="CA2233" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>clazz*1000</Item>

-               <Item>MethodBodyDecoderRegistry.Get(Int32, Int32):AMQMethodBody</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="ProtocolInitiation">

-          <Members>

-           <Member Name=".cctor()">

-            <Messages>

-             <Message TypeName="InitializeReferenceTypeStaticFieldsInline" Category="Microsoft.Performance" CheckId="CA1810" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Qpid.Framing.ProtocolInitiation</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name=".ctor()">

-            <Messages>

-             <Message TypeName="DoNotInitializeUnnecessarily" Category="Microsoft.Performance" CheckId="CA1805" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>ProtocolInitiation.ProtocolInitiation()</Item>

-               <Item>ProtocolMinor</Item>

-               <Item>System.Byte</Item>

-               <Item>0</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CURRENT_PROTOCOL_VERSION_MAJOR">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>CURRENT_PROTOCOL_VERSION_MAJOR</Item>

-              </Issue>

-             </Message>

-             <Message TypeName="NonConstantFieldsShouldNotBeVisible" Category="Microsoft.Usage" CheckId="CA2211" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>CURRENT_PROTOCOL_VERSION_MAJOR</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Header">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Header</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="PopulateFromBuffer(Qpid.Buffer.ByteBuffer):System.Void">

-            <Messages>

-             <Message Id="Qpid.AMQException.#ctor(System.String)" TypeName="DoNotPassLiteralsAsLocalizedParameters" Category="Microsoft.Globalization" CheckId="CA1303" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>ProtocolInitiation.PopulateFromBuffer(ByteBuffer):Void</Item>

-               <Item>1</Item>

-               <Item>AMQException.AMQException(String)</Item>

-               <Item>Method not implemented</Item>

-              </Issue>

-             </Message>

-             <Message TypeName="MarkMembersAsStatic" Category="Microsoft.Performance" CheckId="CA1822" Created="2006-12-04 13:11:47Z" FixCategory="Breaking">

-              <Issue>

-               <Item>ProtocolInitiation.PopulateFromBuffer(ByteBuffer):Void</Item>

-              </Issue>

-             </Message>

-             <Message Id="buffer" TypeName="ReviewUnusedParameters" Category="Microsoft.Usage" CheckId="CA1801" Created="2006-12-04 13:11:47Z" FixCategory="Breaking">

-              <Issue>

-               <Item>buffer</Item>

-               <Item>ProtocolInitiation.PopulateFromBuffer(ByteBuffer):Void</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="ProtocolClass">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>ProtocolClass</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="ProtocolInstance">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>ProtocolInstance</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="ProtocolMajor">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>ProtocolMajor</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="ProtocolMinor">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>ProtocolMinor</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="ToString():System.String">

-            <Messages>

-             <Message Id="System.String.Format(System.String,System.Object[])" TypeName="SpecifyIFormatProvider" Category="Microsoft.Globalization" CheckId="CA1305" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>ProtocolInitiation.ToString():String</Item>

-               <Item>System.String.Format(System.String,System.Object[])</Item>

-               <Item>System.String.Format(System.IFormatProvider,System.String,System.Object[])</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="WritePayload(Qpid.Buffer.ByteBuffer):System.Void">

-            <Messages>

-             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>'buffer'</Item>

-               <Item>ProtocolInitiation.WritePayload(ByteBuffer):Void</Item>

-              </Issue>

-              <Issue>

-               <Item>'buffer'</Item>

-               <Item>ProtocolInitiation.WritePayload(ByteBuffer):Void</Item>

-              </Issue>

-              <Issue>

-               <Item>'buffer'</Item>

-               <Item>ProtocolInitiation.WritePayload(ByteBuffer):Void</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="ProtocolInitiation+Decoder">

-          <Messages>

-           <Message TypeName="NestedTypesShouldNotBeVisible" Category="Microsoft.Design" CheckId="CA1034" Created="2006-12-04 13:11:47Z">

-            <Issue>

-             <Item>Qpid.Framing.ProtocolInitiation+Decoder</Item>

-            </Issue>

-           </Message>

-          </Messages>

-          <Members>

-           <Member Name=".ctor()">

-            <Messages>

-             <Message TypeName="DoNotInitializeUnnecessarily" Category="Microsoft.Performance" CheckId="CA1805" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Decoder.Decoder()</Item>

-               <Item>_disabled</Item>

-               <Item>System.Boolean</Item>

-               <Item>false</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Decodable(Qpid.Buffer.ByteBuffer):Qpid.Codec.Demux.MessageDecoderResult">

-            <Messages>

-             <Message Id="0#" TypeName="ParameterNamesShouldMatchBaseDeclaration" Category="Microsoft.Naming" CheckId="CA1725" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>inbuf</Item>

-               <Item>Decoder.Decodable(ByteBuffer):MessageDecoderResult</Item>

-               <Item>buffer</Item>

-               <Item>IMessageDecoder.Decodable(ByteBuffer):MessageDecoderResult</Item>

-              </Issue>

-             </Message>

-             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>'inbuf'</Item>

-               <Item>Decoder.Decodable(ByteBuffer):MessageDecoderResult</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Decode(Qpid.Buffer.ByteBuffer,Qpid.Codec.IProtocolDecoderOutput):Qpid.Codec.Demux.MessageDecoderResult">

-            <Messages>

-             <Message Id="0#" TypeName="ParameterNamesShouldMatchBaseDeclaration" Category="Microsoft.Naming" CheckId="CA1725" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>inbuf</Item>

-               <Item>Decoder.Decode(ByteBuffer, IProtocolDecoderOutput):MessageDecoderResult</Item>

-               <Item>buffer</Item>

-               <Item>IMessageDecoder.Decode(ByteBuffer, IProtocolDecoderOutput):MessageDecoderResult</Item>

-              </Issue>

-             </Message>

-             <Message TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>'inbuf'</Item>

-               <Item>Decoder.Decode(ByteBuffer, IProtocolDecoderOutput):MessageDecoderResult</Item>

-              </Issue>

-              <Issue>

-               <Item>'output'</Item>

-               <Item>Decoder.Decode(ByteBuffer, IProtocolDecoderOutput):MessageDecoderResult</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Disabled">

-            <Messages>

-             <Message TypeName="PropertiesShouldNotBeWriteOnly" Category="Microsoft.Design" CheckId="CA1044" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Disabled</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="QueueBindBody">

-          <Members>

-           <Member Name="Arguments">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Arguments</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CLASS_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>QueueBindBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>QueueBindBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CreateAMQFrame(System.UInt16,System.UInt16,System.String,System.String,System.String,System.Boolean,Qpid.Framing.FieldTable):Qpid.Framing.AMQFrame">

-            <Messages>

-             <Message Id="1#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Ticket</Item>

-              </Issue>

-             </Message>

-             <Message Id="2#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Queue</Item>

-              </Issue>

-             </Message>

-             <Message Id="3#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Exchange</Item>

-              </Issue>

-             </Message>

-             <Message Id="4#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>RoutingKey</Item>

-              </Issue>

-             </Message>

-             <Message Id="5#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Nowait</Item>

-              </Issue>

-             </Message>

-             <Message Id="6#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Arguments</Item>

-              </Issue>

-             </Message>

-             <Message Id="5#Nowait" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>QueueBindBody.CreateAMQFrame(UInt16, UInt16, String, String, String, Boolean, FieldTable):AMQFrame</Item>

-               <Item>Nowait</Item>

-               <Item>Nowait</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>QueueBindBody.CreateAMQFrame(UInt16, UInt16, String, String, String, Boolean, FieldTable):AMQFrame</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Exchange">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Exchange</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="METHOD_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>QueueBindBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>QueueBindBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Nowait">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Nowait</Item>

-              </Issue>

-             </Message>

-             <Message Id="Nowait" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>Nowait</Item>

-               <Item>QueueBindBody.Nowait</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Queue">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Queue</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="RoutingKey">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>RoutingKey</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Ticket">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Ticket</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="QueueBindOkBody">

-          <Members>

-           <Member Name="CLASS_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>QueueBindOkBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>QueueBindOkBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CreateAMQFrame(System.UInt16):Qpid.Framing.AMQFrame">

-            <Messages>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>QueueBindOkBody.CreateAMQFrame(UInt16):AMQFrame</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="METHOD_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>QueueBindOkBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>QueueBindOkBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="QueueDeclareBody">

-          <Members>

-           <Member Name="Arguments">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Arguments</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="AutoDelete">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>AutoDelete</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CLASS_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>QueueDeclareBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>QueueDeclareBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CreateAMQFrame(System.UInt16,System.UInt16,System.String,System.Boolean,System.Boolean,System.Boolean,System.Boolean,System.Boolean,Qpid.Framing.FieldTable):Qpid.Framing.AMQFrame">

-            <Messages>

-             <Message Id="1#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Ticket</Item>

-              </Issue>

-             </Message>

-             <Message Id="2#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Queue</Item>

-              </Issue>

-             </Message>

-             <Message Id="3#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Passive</Item>

-              </Issue>

-             </Message>

-             <Message Id="4#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Durable</Item>

-              </Issue>

-             </Message>

-             <Message Id="5#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Exclusive</Item>

-              </Issue>

-             </Message>

-             <Message Id="6#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>AutoDelete</Item>

-              </Issue>

-             </Message>

-             <Message Id="7#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Nowait</Item>

-              </Issue>

-             </Message>

-             <Message Id="8#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Arguments</Item>

-              </Issue>

-             </Message>

-             <Message Id="7#Nowait" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>QueueDeclareBody.CreateAMQFrame(UInt16, UInt16, String, Boolean, Boolean, Boolean, Boolean, Boolean, FieldTable):AMQFrame</Item>

-               <Item>Nowait</Item>

-               <Item>Nowait</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>QueueDeclareBody.CreateAMQFrame(UInt16, UInt16, String, Boolean, Boolean, Boolean, Boolean, Boolean, FieldTable):AMQFrame</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Durable">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Durable</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Exclusive">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Exclusive</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="METHOD_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>QueueDeclareBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>QueueDeclareBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Nowait">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Nowait</Item>

-              </Issue>

-             </Message>

-             <Message Id="Nowait" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>Nowait</Item>

-               <Item>QueueDeclareBody.Nowait</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Passive">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Passive</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Queue">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Queue</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Ticket">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Ticket</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="QueueDeclareOkBody">

-          <Members>

-           <Member Name="CLASS_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>QueueDeclareOkBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>QueueDeclareOkBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="ConsumerCount">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>ConsumerCount</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CreateAMQFrame(System.UInt16,System.String,System.UInt32,System.UInt32):Qpid.Framing.AMQFrame">

-            <Messages>

-             <Message Id="1#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Queue</Item>

-              </Issue>

-             </Message>

-             <Message Id="2#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>MessageCount</Item>

-              </Issue>

-             </Message>

-             <Message Id="3#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>ConsumerCount</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>QueueDeclareOkBody.CreateAMQFrame(UInt16, String, UInt32, UInt32):AMQFrame</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="MessageCount">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>MessageCount</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="METHOD_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>QueueDeclareOkBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>QueueDeclareOkBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Queue">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Queue</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="QueueDeleteBody">

-          <Members>

-           <Member Name="CLASS_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>QueueDeleteBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>QueueDeleteBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CreateAMQFrame(System.UInt16,System.UInt16,System.String,System.Boolean,System.Boolean,System.Boolean):Qpid.Framing.AMQFrame">

-            <Messages>

-             <Message Id="1#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Ticket</Item>

-              </Issue>

-             </Message>

-             <Message Id="2#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Queue</Item>

-              </Issue>

-             </Message>

-             <Message Id="3#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>IfUnused</Item>

-              </Issue>

-             </Message>

-             <Message Id="4#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>IfEmpty</Item>

-              </Issue>

-             </Message>

-             <Message Id="5#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Nowait</Item>

-              </Issue>

-             </Message>

-             <Message Id="5#Nowait" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>QueueDeleteBody.CreateAMQFrame(UInt16, UInt16, String, Boolean, Boolean, Boolean):AMQFrame</Item>

-               <Item>Nowait</Item>

-               <Item>Nowait</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>QueueDeleteBody.CreateAMQFrame(UInt16, UInt16, String, Boolean, Boolean, Boolean):AMQFrame</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="IfEmpty">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>IfEmpty</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="IfUnused">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>IfUnused</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="METHOD_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>QueueDeleteBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>QueueDeleteBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Nowait">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Nowait</Item>

-              </Issue>

-             </Message>

-             <Message Id="Nowait" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>Nowait</Item>

-               <Item>QueueDeleteBody.Nowait</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Queue">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Queue</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Ticket">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Ticket</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="QueueDeleteOkBody">

-          <Members>

-           <Member Name="CLASS_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>QueueDeleteOkBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>QueueDeleteOkBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CreateAMQFrame(System.UInt16,System.UInt32):Qpid.Framing.AMQFrame">

-            <Messages>

-             <Message Id="1#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>MessageCount</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>QueueDeleteOkBody.CreateAMQFrame(UInt16, UInt32):AMQFrame</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="MessageCount">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>MessageCount</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="METHOD_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>QueueDeleteOkBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>QueueDeleteOkBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="QueuePurgeBody">

-          <Members>

-           <Member Name="CLASS_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>QueuePurgeBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>QueuePurgeBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CreateAMQFrame(System.UInt16,System.UInt16,System.String,System.Boolean):Qpid.Framing.AMQFrame">

-            <Messages>

-             <Message Id="1#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Ticket</Item>

-              </Issue>

-             </Message>

-             <Message Id="2#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Queue</Item>

-              </Issue>

-             </Message>

-             <Message Id="3#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Nowait</Item>

-              </Issue>

-             </Message>

-             <Message Id="3#Nowait" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>QueuePurgeBody.CreateAMQFrame(UInt16, UInt16, String, Boolean):AMQFrame</Item>

-               <Item>Nowait</Item>

-               <Item>Nowait</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>QueuePurgeBody.CreateAMQFrame(UInt16, UInt16, String, Boolean):AMQFrame</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="METHOD_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>QueuePurgeBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>QueuePurgeBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Nowait">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Nowait</Item>

-              </Issue>

-             </Message>

-             <Message Id="Nowait" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>Nowait</Item>

-               <Item>QueuePurgeBody.Nowait</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Queue">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Queue</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Ticket">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Ticket</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="QueuePurgeOkBody">

-          <Members>

-           <Member Name="CLASS_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>QueuePurgeOkBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>QueuePurgeOkBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CreateAMQFrame(System.UInt16,System.UInt32):Qpid.Framing.AMQFrame">

-            <Messages>

-             <Message Id="1#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>MessageCount</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>QueuePurgeOkBody.CreateAMQFrame(UInt16, UInt32):AMQFrame</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="MessageCount">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>MessageCount</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="METHOD_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>QueuePurgeOkBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>QueuePurgeOkBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="StreamCancelBody">

-          <Members>

-           <Member Name="CLASS_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>StreamCancelBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>StreamCancelBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="ConsumerTag">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>ConsumerTag</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CreateAMQFrame(System.UInt16,System.String,System.Boolean):Qpid.Framing.AMQFrame">

-            <Messages>

-             <Message Id="1#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>ConsumerTag</Item>

-              </Issue>

-             </Message>

-             <Message Id="2#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Nowait</Item>

-              </Issue>

-             </Message>

-             <Message Id="2#Nowait" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>StreamCancelBody.CreateAMQFrame(UInt16, String, Boolean):AMQFrame</Item>

-               <Item>Nowait</Item>

-               <Item>Nowait</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>StreamCancelBody.CreateAMQFrame(UInt16, String, Boolean):AMQFrame</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="METHOD_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>StreamCancelBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>StreamCancelBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Nowait">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Nowait</Item>

-              </Issue>

-             </Message>

-             <Message Id="Nowait" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>Nowait</Item>

-               <Item>StreamCancelBody.Nowait</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="StreamCancelOkBody">

-          <Members>

-           <Member Name="CLASS_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>StreamCancelOkBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>StreamCancelOkBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="ConsumerTag">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>ConsumerTag</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CreateAMQFrame(System.UInt16,System.String):Qpid.Framing.AMQFrame">

-            <Messages>

-             <Message Id="1#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>ConsumerTag</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>StreamCancelOkBody.CreateAMQFrame(UInt16, String):AMQFrame</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="METHOD_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>StreamCancelOkBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>StreamCancelOkBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="StreamConsumeBody">

-          <Members>

-           <Member Name="CLASS_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>StreamConsumeBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>StreamConsumeBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="ConsumerTag">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>ConsumerTag</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CreateAMQFrame(System.UInt16,System.UInt16,System.String,System.String,System.Boolean,System.Boolean,System.Boolean):Qpid.Framing.AMQFrame">

-            <Messages>

-             <Message Id="1#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Ticket</Item>

-              </Issue>

-             </Message>

-             <Message Id="2#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Queue</Item>

-              </Issue>

-             </Message>

-             <Message Id="3#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>ConsumerTag</Item>

-              </Issue>

-             </Message>

-             <Message Id="4#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>NoLocal</Item>

-              </Issue>

-             </Message>

-             <Message Id="5#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Exclusive</Item>

-              </Issue>

-             </Message>

-             <Message Id="6#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Nowait</Item>

-              </Issue>

-             </Message>

-             <Message Id="6#Nowait" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>StreamConsumeBody.CreateAMQFrame(UInt16, UInt16, String, String, Boolean, Boolean, Boolean):AMQFrame</Item>

-               <Item>Nowait</Item>

-               <Item>Nowait</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>StreamConsumeBody.CreateAMQFrame(UInt16, UInt16, String, String, Boolean, Boolean, Boolean):AMQFrame</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Exclusive">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Exclusive</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="METHOD_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>StreamConsumeBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>StreamConsumeBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="NoLocal">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>NoLocal</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Nowait">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Nowait</Item>

-              </Issue>

-             </Message>

-             <Message Id="Nowait" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>Nowait</Item>

-               <Item>StreamConsumeBody.Nowait</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Queue">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Queue</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Ticket">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Ticket</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="StreamConsumeOkBody">

-          <Members>

-           <Member Name="CLASS_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>StreamConsumeOkBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>StreamConsumeOkBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="ConsumerTag">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>ConsumerTag</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CreateAMQFrame(System.UInt16,System.String):Qpid.Framing.AMQFrame">

-            <Messages>

-             <Message Id="1#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>ConsumerTag</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>StreamConsumeOkBody.CreateAMQFrame(UInt16, String):AMQFrame</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="METHOD_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>StreamConsumeOkBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>StreamConsumeOkBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="StreamDeliverBody">

-          <Members>

-           <Member Name="CLASS_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>StreamDeliverBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>StreamDeliverBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="ConsumerTag">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>ConsumerTag</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CreateAMQFrame(System.UInt16,System.String,System.UInt64,System.String,System.String):Qpid.Framing.AMQFrame">

-            <Messages>

-             <Message Id="1#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>ConsumerTag</Item>

-              </Issue>

-             </Message>

-             <Message Id="2#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>DeliveryTag</Item>

-              </Issue>

-             </Message>

-             <Message Id="3#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Exchange</Item>

-              </Issue>

-             </Message>

-             <Message Id="4#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Queue</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>StreamDeliverBody.CreateAMQFrame(UInt16, String, UInt64, String, String):AMQFrame</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="DeliveryTag">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>DeliveryTag</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Exchange">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Exchange</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="METHOD_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>StreamDeliverBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>StreamDeliverBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Queue">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Queue</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="StreamPublishBody">

-          <Members>

-           <Member Name="CLASS_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>StreamPublishBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>StreamPublishBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CreateAMQFrame(System.UInt16,System.UInt16,System.String,System.String,System.Boolean,System.Boolean):Qpid.Framing.AMQFrame">

-            <Messages>

-             <Message Id="1#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Ticket</Item>

-              </Issue>

-             </Message>

-             <Message Id="2#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Exchange</Item>

-              </Issue>

-             </Message>

-             <Message Id="3#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>RoutingKey</Item>

-              </Issue>

-             </Message>

-             <Message Id="4#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Mandatory</Item>

-              </Issue>

-             </Message>

-             <Message Id="5#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Immediate</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>StreamPublishBody.CreateAMQFrame(UInt16, UInt16, String, String, Boolean, Boolean):AMQFrame</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Exchange">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Exchange</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Immediate">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Immediate</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Mandatory">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Mandatory</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="METHOD_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>StreamPublishBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>StreamPublishBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="RoutingKey">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>RoutingKey</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Ticket">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Ticket</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="StreamQosBody">

-          <Messages>

-           <Message Id="Qos" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-            <Issue Name="Type">

-             <Item>Qos</Item>

-             <Item>Qpid.Framing.StreamQosBody</Item>

-            </Issue>

-           </Message>

-          </Messages>

-          <Members>

-           <Member Name="CLASS_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>StreamQosBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>StreamQosBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="ConsumeRate">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>ConsumeRate</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CreateAMQFrame(System.UInt16,System.UInt32,System.UInt16,System.UInt32,System.Boolean):Qpid.Framing.AMQFrame">

-            <Messages>

-             <Message Id="1#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>PrefetchSize</Item>

-              </Issue>

-             </Message>

-             <Message Id="2#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>PrefetchCount</Item>

-              </Issue>

-             </Message>

-             <Message Id="3#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>ConsumeRate</Item>

-              </Issue>

-             </Message>

-             <Message Id="4#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Global</Item>

-              </Issue>

-             </Message>

-             <Message Id="1#Prefetch" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>StreamQosBody.CreateAMQFrame(UInt16, UInt32, UInt16, UInt32, Boolean):AMQFrame</Item>

-               <Item>Prefetch</Item>

-               <Item>PrefetchSize</Item>

-              </Issue>

-             </Message>

-             <Message Id="2#Prefetch" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>StreamQosBody.CreateAMQFrame(UInt16, UInt32, UInt16, UInt32, Boolean):AMQFrame</Item>

-               <Item>Prefetch</Item>

-               <Item>PrefetchCount</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>StreamQosBody.CreateAMQFrame(UInt16, UInt32, UInt16, UInt32, Boolean):AMQFrame</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Global">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Global</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="METHOD_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>StreamQosBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>StreamQosBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="PrefetchCount">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>PrefetchCount</Item>

-              </Issue>

-             </Message>

-             <Message Id="Prefetch" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>Prefetch</Item>

-               <Item>StreamQosBody.PrefetchCount</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="PrefetchSize">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>PrefetchSize</Item>

-              </Issue>

-             </Message>

-             <Message Id="Prefetch" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>Prefetch</Item>

-               <Item>StreamQosBody.PrefetchSize</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="StreamQosOkBody">

-          <Messages>

-           <Message Id="Qos" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-            <Issue Name="Type">

-             <Item>Qos</Item>

-             <Item>Qpid.Framing.StreamQosOkBody</Item>

-            </Issue>

-           </Message>

-          </Messages>

-          <Members>

-           <Member Name="CLASS_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>StreamQosOkBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>StreamQosOkBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CreateAMQFrame(System.UInt16):Qpid.Framing.AMQFrame">

-            <Messages>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>StreamQosOkBody.CreateAMQFrame(UInt16):AMQFrame</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="METHOD_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>StreamQosOkBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>StreamQosOkBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="StreamReturnBody">

-          <Members>

-           <Member Name="CLASS_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>StreamReturnBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>StreamReturnBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CreateAMQFrame(System.UInt16,System.UInt16,System.String,System.String,System.String):Qpid.Framing.AMQFrame">

-            <Messages>

-             <Message Id="1#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>ReplyCode</Item>

-              </Issue>

-             </Message>

-             <Message Id="2#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>ReplyText</Item>

-              </Issue>

-             </Message>

-             <Message Id="3#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Exchange</Item>

-              </Issue>

-             </Message>

-             <Message Id="4#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>RoutingKey</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>StreamReturnBody.CreateAMQFrame(UInt16, UInt16, String, String, String):AMQFrame</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Exchange">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Exchange</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="METHOD_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>StreamReturnBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>StreamReturnBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="ReplyCode">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>ReplyCode</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="ReplyText">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>ReplyText</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="RoutingKey">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>RoutingKey</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="TestContentBody">

-          <Members>

-           <Member Name="CLASS_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>TestContentBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>TestContentBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CreateAMQFrame(System.UInt16):Qpid.Framing.AMQFrame">

-            <Messages>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>TestContentBody.CreateAMQFrame(UInt16):AMQFrame</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="METHOD_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>TestContentBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>TestContentBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="TestContentOkBody">

-          <Members>

-           <Member Name="CLASS_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>TestContentOkBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>TestContentOkBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="ContentChecksum">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>ContentChecksum</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CreateAMQFrame(System.UInt16,System.UInt32):Qpid.Framing.AMQFrame">

-            <Messages>

-             <Message Id="1#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>ContentChecksum</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>TestContentOkBody.CreateAMQFrame(UInt16, UInt32):AMQFrame</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="METHOD_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>TestContentOkBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>TestContentOkBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="TestIntegerBody">

-          <Members>

-           <Member Name="CLASS_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>TestIntegerBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>TestIntegerBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CreateAMQFrame(System.UInt16,System.Byte,System.UInt16,System.UInt32,System.UInt64,System.Byte):Qpid.Framing.AMQFrame">

-            <Messages>

-             <Message Id="1#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Integer1</Item>

-              </Issue>

-             </Message>

-             <Message Id="2#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Integer2</Item>

-              </Issue>

-             </Message>

-             <Message Id="3#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Integer3</Item>

-              </Issue>

-             </Message>

-             <Message Id="4#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Integer4</Item>

-              </Issue>

-             </Message>

-             <Message Id="5#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Operation</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>TestIntegerBody.CreateAMQFrame(UInt16, Byte, UInt16, UInt32, UInt64, Byte):AMQFrame</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Integer1">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Integer1</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Integer2">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Integer2</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Integer3">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Integer3</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Integer4">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Integer4</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="METHOD_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>TestIntegerBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>TestIntegerBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Operation">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Operation</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="TestIntegerOkBody">

-          <Members>

-           <Member Name="CLASS_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>TestIntegerOkBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>TestIntegerOkBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CreateAMQFrame(System.UInt16,System.UInt64):Qpid.Framing.AMQFrame">

-            <Messages>

-             <Message Id="1#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Result</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>TestIntegerOkBody.CreateAMQFrame(UInt16, UInt64):AMQFrame</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="METHOD_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>TestIntegerOkBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>TestIntegerOkBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Result">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Result</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="TestStringBody">

-          <Members>

-           <Member Name="CLASS_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>TestStringBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>TestStringBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CreateAMQFrame(System.UInt16,System.String,System.Byte[],System.Byte):Qpid.Framing.AMQFrame">

-            <Messages>

-             <Message Id="1#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>String1</Item>

-              </Issue>

-             </Message>

-             <Message Id="2#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>String2</Item>

-              </Issue>

-             </Message>

-             <Message Id="3#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Operation</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>TestStringBody.CreateAMQFrame(UInt16, String, Byte[], Byte):AMQFrame</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="METHOD_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>TestStringBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>TestStringBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Operation">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Operation</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="String1">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>String1</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="String2">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>String2</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="TestStringOkBody">

-          <Members>

-           <Member Name="CLASS_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>TestStringOkBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>TestStringOkBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CreateAMQFrame(System.UInt16,System.Byte[]):Qpid.Framing.AMQFrame">

-            <Messages>

-             <Message Id="1#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Result</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>TestStringOkBody.CreateAMQFrame(UInt16, Byte[]):AMQFrame</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="METHOD_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>TestStringOkBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>TestStringOkBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Result">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Result</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="TestTableBody">

-          <Members>

-           <Member Name="CLASS_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>TestTableBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>TestTableBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CreateAMQFrame(System.UInt16,Qpid.Framing.FieldTable,System.Byte,System.Byte):Qpid.Framing.AMQFrame">

-            <Messages>

-             <Message Id="2#" TypeName="AvoidLanguageSpecificTypeNamesInParameters" Category="Microsoft.Naming" CheckId="CA1718" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>IntegerOp</Item>

-              </Issue>

-             </Message>

-             <Message Id="2#" TypeName="AvoidTypeNamesInParameters" Category="Microsoft.Naming" CheckId="CA1720" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>IntegerOp</Item>

-              </Issue>

-             </Message>

-             <Message Id="1#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Table</Item>

-              </Issue>

-             </Message>

-             <Message Id="2#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>IntegerOp</Item>

-              </Issue>

-             </Message>

-             <Message Id="3#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>StringOp</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>TestTableBody.CreateAMQFrame(UInt16, FieldTable, Byte, Byte):AMQFrame</Item>

-              </Issue>

-             </Message>

-             <Message Id="2#" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Op</Item>

-               <Item>IntegerOp</Item>

-              </Issue>

-             </Message>

-             <Message Id="3#" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>Op</Item>

-               <Item>StringOp</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="IntegerOp">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>IntegerOp</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="METHOD_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>TestTableBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>TestTableBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="StringOp">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>StringOp</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Table">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Table</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="TestTableOkBody">

-          <Members>

-           <Member Name="CLASS_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>TestTableOkBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>TestTableOkBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CreateAMQFrame(System.UInt16,System.UInt64,System.Byte[]):Qpid.Framing.AMQFrame">

-            <Messages>

-             <Message Id="1#" TypeName="AvoidLanguageSpecificTypeNamesInParameters" Category="Microsoft.Naming" CheckId="CA1718" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>IntegerResult</Item>

-              </Issue>

-             </Message>

-             <Message Id="1#" TypeName="AvoidTypeNamesInParameters" Category="Microsoft.Naming" CheckId="CA1720" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>IntegerResult</Item>

-              </Issue>

-             </Message>

-             <Message Id="1#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>IntegerResult</Item>

-              </Issue>

-             </Message>

-             <Message Id="2#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>StringResult</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>TestTableOkBody.CreateAMQFrame(UInt16, UInt64, Byte[]):AMQFrame</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="IntegerResult">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>IntegerResult</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="METHOD_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>TestTableOkBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>TestTableOkBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="StringResult">

-            <Messages>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>StringResult</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="TunnelRequestBody">

-          <Members>

-           <Member Name="CLASS_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>TunnelRequestBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>TunnelRequestBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CreateAMQFrame(System.UInt16,Qpid.Framing.FieldTable):Qpid.Framing.AMQFrame">

-            <Messages>

-             <Message Id="MetaData" TypeName="CompoundWordsShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1702" Created="2006-12-04 13:11:47Z">

-              <Issue Name="ShouldBeDiscreteTerm">

-               <Item>MetaData</Item>

-               <Item>parameter</Item>

-               <Item>MetaData</Item>

-               <Item>Metadata</Item>

-              </Issue>

-             </Message>

-             <Message Id="1#" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>MetaData</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>TunnelRequestBody.CreateAMQFrame(UInt16, FieldTable):AMQFrame</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="MetaData">

-            <Messages>

-             <Message Id="MetaData" TypeName="CompoundWordsShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1702" Created="2006-12-04 13:11:47Z">

-              <Issue Name="ShouldBeDiscreteTerm">

-               <Item>MetaData</Item>

-               <Item>field</Item>

-               <Item>MetaData</Item>

-               <Item>Metadata</Item>

-              </Issue>

-             </Message>

-             <Message TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>MetaData</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="METHOD_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>TunnelRequestBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>TunnelRequestBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="TxCommitBody">

-          <Messages>

-           <Message TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-            <Issue Name="Type">

-             <Item>Tx</Item>

-             <Item>Qpid.Framing.TxCommitBody</Item>

-            </Issue>

-           </Message>

-          </Messages>

-          <Members>

-           <Member Name="CLASS_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>TxCommitBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>TxCommitBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CreateAMQFrame(System.UInt16):Qpid.Framing.AMQFrame">

-            <Messages>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>TxCommitBody.CreateAMQFrame(UInt16):AMQFrame</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="METHOD_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>TxCommitBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>TxCommitBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="TxCommitOkBody">

-          <Messages>

-           <Message TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-            <Issue Name="Type">

-             <Item>Tx</Item>

-             <Item>Qpid.Framing.TxCommitOkBody</Item>

-            </Issue>

-           </Message>

-          </Messages>

-          <Members>

-           <Member Name="CLASS_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>TxCommitOkBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>TxCommitOkBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CreateAMQFrame(System.UInt16):Qpid.Framing.AMQFrame">

-            <Messages>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>TxCommitOkBody.CreateAMQFrame(UInt16):AMQFrame</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="METHOD_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>TxCommitOkBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>TxCommitOkBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="TxRollbackBody">

-          <Messages>

-           <Message TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-            <Issue Name="Type">

-             <Item>Tx</Item>

-             <Item>Qpid.Framing.TxRollbackBody</Item>

-            </Issue>

-           </Message>

-          </Messages>

-          <Members>

-           <Member Name="CLASS_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>TxRollbackBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>TxRollbackBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CreateAMQFrame(System.UInt16):Qpid.Framing.AMQFrame">

-            <Messages>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>TxRollbackBody.CreateAMQFrame(UInt16):AMQFrame</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="METHOD_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>TxRollbackBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>TxRollbackBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="TxRollbackOkBody">

-          <Messages>

-           <Message TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-            <Issue Name="Type">

-             <Item>Tx</Item>

-             <Item>Qpid.Framing.TxRollbackOkBody</Item>

-            </Issue>

-           </Message>

-          </Messages>

-          <Members>

-           <Member Name="CLASS_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>TxRollbackOkBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>TxRollbackOkBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CreateAMQFrame(System.UInt16):Qpid.Framing.AMQFrame">

-            <Messages>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>TxRollbackOkBody.CreateAMQFrame(UInt16):AMQFrame</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="METHOD_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>TxRollbackOkBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>TxRollbackOkBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="TxSelectBody">

-          <Messages>

-           <Message TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-            <Issue Name="Type">

-             <Item>Tx</Item>

-             <Item>Qpid.Framing.TxSelectBody</Item>

-            </Issue>

-           </Message>

-          </Messages>

-          <Members>

-           <Member Name="CLASS_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>TxSelectBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>TxSelectBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CreateAMQFrame(System.UInt16):Qpid.Framing.AMQFrame">

-            <Messages>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>TxSelectBody.CreateAMQFrame(UInt16):AMQFrame</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="METHOD_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>TxSelectBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>TxSelectBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="TxSelectOkBody">

-          <Messages>

-           <Message TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-            <Issue Name="Type">

-             <Item>Tx</Item>

-             <Item>Qpid.Framing.TxSelectOkBody</Item>

-            </Issue>

-           </Message>

-          </Messages>

-          <Members>

-           <Member Name="CLASS_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>TxSelectOkBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>TxSelectOkBody.CLASS_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CreateAMQFrame(System.UInt16):Qpid.Framing.AMQFrame">

-            <Messages>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>TxSelectOkBody.CreateAMQFrame(UInt16):AMQFrame</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="METHOD_ID">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>TxSelectOkBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>TxSelectOkBody.METHOD_ID</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-        </Types>

-       </Namespace>

-      </Namespaces>

-     </Module>

-    </Modules>

-   </Target>

-   <Target Name="$(ProjectDir)/Qpid.Client.Tests/bin/Debug/Qpid.Messaging.dll">

-    <Modules>

-     <Module Name="qpid.messaging.dll">

-      <Messages>

-       <Message TypeName="AssembliesShouldDeclareMinimumSecurity" Category="Microsoft.Usage" CheckId="CA2209" Created="2006-12-04 13:11:47Z">

-        <Issue>

-         <Item>Qpid.Messaging</Item>

-        </Issue>

-       </Message>

-       <Message TypeName="AssembliesShouldHaveValidStrongNames" Category="Microsoft.Design" CheckId="CA2210" Created="2006-12-04 13:11:47Z">

-        <Issue Name="NoStrongName">

-         <Item>Qpid.Messaging</Item>

-        </Issue>

-       </Message>

-      </Messages>

-      <Namespaces>

-       <Namespace Name="Qpid.Messaging">

-        <Types>

-         <Type Name="AcknowledgeMode">

-          <Members>

-           <Member Name="DupsOkAcknowledge">

-            <Messages>

-             <Message Id="Dups" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>Dups</Item>

-               <Item>AcknowledgeMode.DupsOkAcknowledge</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="ChannelLimitReachedException">

-          <Messages>

-           <Message TypeName="ImplementStandardExceptionConstructors" Category="Microsoft.Design" CheckId="CA1032" Created="2006-12-04 13:11:47Z">

-            <Issue>

-             <Item>Qpid.Messaging.ChannelLimitReachedException</Item>

-             <Item>protected ChannelLimitReachedException(SerializationInfo, StreamingContext)</Item>

-            </Issue>

-            <Issue>

-             <Item>Qpid.Messaging.ChannelLimitReachedException</Item>

-             <Item>public ChannelLimitReachedException()</Item>

-            </Issue>

-            <Issue>

-             <Item>Qpid.Messaging.ChannelLimitReachedException</Item>

-             <Item>public ChannelLimitReachedException(String)</Item>

-            </Issue>

-            <Issue>

-             <Item>Qpid.Messaging.ChannelLimitReachedException</Item>

-             <Item>public ChannelLimitReachedException(String, Exception)</Item>

-            </Issue>

-           </Message>

-          </Messages>

-         </Type>

-         <Type Name="ExceptionListenerDelegate">

-          <Messages>

-           <Message TypeName="IdentifiersShouldNotHaveIncorrectSuffix" Category="Microsoft.Naming" CheckId="CA1711" Created="2006-12-04 13:11:47Z">

-            <Issue>

-             <Item>Qpid.Messaging.ExceptionListenerDelegate</Item>

-             <Item>Delegate</Item>

-            </Issue>

-           </Message>

-          </Messages>

-         </Type>

-         <Type Name="ExchangeClassConstants">

-          <Members>

-           <Member Name="DIRECT">

-            <Messages>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>ExchangeClassConstants.DIRECT</Item>

-              </Issue>

-             </Message>

-             <Message TypeName="UseLiteralsWhereAppropriate" Category="Microsoft.Performance" CheckId="CA1802" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>DIRECT</Item>

-               <Item>direct</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="HEADERS">

-            <Messages>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>ExchangeClassConstants.HEADERS</Item>

-              </Issue>

-             </Message>

-             <Message TypeName="UseLiteralsWhereAppropriate" Category="Microsoft.Performance" CheckId="CA1802" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>HEADERS</Item>

-               <Item>headers</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="TOPIC">

-            <Messages>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>ExchangeClassConstants.TOPIC</Item>

-              </Issue>

-             </Message>

-             <Message TypeName="UseLiteralsWhereAppropriate" Category="Microsoft.Performance" CheckId="CA1802" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>TOPIC</Item>

-               <Item>topic</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="ExchangeNameDefaults">

-          <Members>

-           <Member Name="DIRECT">

-            <Messages>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>ExchangeNameDefaults.DIRECT</Item>

-              </Issue>

-             </Message>

-             <Message TypeName="UseLiteralsWhereAppropriate" Category="Microsoft.Performance" CheckId="CA1802" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>DIRECT</Item>

-               <Item>amq.direct</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="HEADERS">

-            <Messages>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>ExchangeNameDefaults.HEADERS</Item>

-              </Issue>

-             </Message>

-             <Message TypeName="UseLiteralsWhereAppropriate" Category="Microsoft.Performance" CheckId="CA1802" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>HEADERS</Item>

-               <Item>amq.match</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="TOPIC">

-            <Messages>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>ExchangeNameDefaults.TOPIC</Item>

-              </Issue>

-             </Message>

-             <Message TypeName="UseLiteralsWhereAppropriate" Category="Microsoft.Performance" CheckId="CA1802" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>TOPIC</Item>

-               <Item>amq.topic</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="IBytesMessage">

-          <Members>

-           <Member Name="ReadUTF():System.String">

-            <Messages>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>IBytesMessage.ReadUTF():String</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="WriteUTF(System.String):System.Void">

-            <Messages>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>IBytesMessage.WriteUTF(String):Void</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="IChannel">

-          <Members>

-           <Member Name="CreateConsumer(System.String,System.Int32,System.Int32,System.Boolean,System.Boolean,System.Boolean,System.String):Qpid.Messaging.IMessageConsumer">

-            <Messages>

-             <Message Id="1#prefetch" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>IChannel.CreateConsumer(String, Int32, Int32, Boolean, Boolean, Boolean, String):IMessageConsumer</Item>

-               <Item>prefetch</Item>

-               <Item>prefetchLow</Item>

-              </Issue>

-             </Message>

-             <Message Id="2#prefetch" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>IChannel.CreateConsumer(String, Int32, Int32, Boolean, Boolean, Boolean, String):IMessageConsumer</Item>

-               <Item>prefetch</Item>

-               <Item>prefetchHigh</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="DefaultPrefetch">

-            <Messages>

-             <Message Id="Prefetch" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>Prefetch</Item>

-               <Item>IChannel.DefaultPrefetch:Int32</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="IConnection">

-          <Members>

-           <Member Name="ClientID">

-            <Messages>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>IConnection.ClientID:String</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="CreateChannel(System.Boolean,Qpid.Messaging.AcknowledgeMode,System.Int32):Qpid.Messaging.IChannel">

-            <Messages>

-             <Message Id="2#prefetch" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>IConnection.CreateChannel(Boolean, AcknowledgeMode, Int32):IChannel</Item>

-               <Item>prefetch</Item>

-               <Item>prefetch</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="IConnectionListener">

-          <Members>

-           <Member Name="PreResubscribe():System.Boolean">

-            <Messages>

-             <Message Id="Resubscribe" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>Resubscribe</Item>

-               <Item>IConnectionListener.PreResubscribe():Boolean</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="IFieldTable">

-          <Messages>

-           <Message TypeName="IdentifiersShouldHaveCorrectSuffix" Category="Microsoft.Naming" CheckId="CA1710" Created="2006-12-04 13:11:47Z">

-            <Issue>

-             <Item>Qpid.Messaging.IFieldTable</Item>

-             <Item>Collection</Item>

-            </Issue>

-           </Message>

-          </Messages>

-          <Members>

-           <Member Name="Contains(System.String):System.Boolean">

-            <Messages>

-             <Message Id="0#s" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="ParameterOneLetter">

-               <Item>IFieldTable.Contains(String):Boolean</Item>

-               <Item>s</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="IMessage">

-          <Members>

-           <Member Name="CorrelationIdAsBytes">

-            <Messages>

-             <Message TypeName="PropertiesShouldNotReturnArrays" Category="Microsoft.Performance" CheckId="CA1819" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>IMessage.CorrelationIdAsBytes:Byte[]</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="IMessagePublisher">

-          <Members>

-           <Member Name="DisableMessageID">

-            <Messages>

-             <Message Id="Member" TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706" Created="2006-12-04 13:11:47Z">

-              <Issue Name="MemberId">

-               <Item>IMessagePublisher.DisableMessageID:Boolean</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="Encoding">

-            <Messages>

-             <Message TypeName="PropertiesShouldNotBeWriteOnly" Category="Microsoft.Design" CheckId="CA1044" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>Encoding</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="MimeType">

-            <Messages>

-             <Message TypeName="PropertiesShouldNotBeWriteOnly" Category="Microsoft.Design" CheckId="CA1044" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>MimeType</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="MessageConsumerBuilder">

-          <Members>

-           <Member Name=".ctor(Qpid.Messaging.IChannel,System.String)">

-            <Messages>

-             <Message TypeName="DoNotInitializeUnnecessarily" Category="Microsoft.Performance" CheckId="CA1805" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>MessageConsumerBuilder.MessageConsumerBuilder(IChannel, String)</Item>

-               <Item>_durable</Item>

-               <Item>System.Boolean</Item>

-               <Item>false</Item>

-              </Issue>

-              <Issue>

-               <Item>MessageConsumerBuilder.MessageConsumerBuilder(IChannel, String)</Item>

-               <Item>_exclusive</Item>

-               <Item>System.Boolean</Item>

-               <Item>false</Item>

-              </Issue>

-              <Issue>

-               <Item>MessageConsumerBuilder.MessageConsumerBuilder(IChannel, String)</Item>

-               <Item>_noLocal</Item>

-               <Item>System.Boolean</Item>

-               <Item>false</Item>

-              </Issue>

-              <Issue>

-               <Item>MessageConsumerBuilder.MessageConsumerBuilder(IChannel, String)</Item>

-               <Item>_subscriptionName</Item>

-               <Item>System.String</Item>

-               <Item>null</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="DEFAULT_PREFETCH_HIGH">

-            <Messages>

-             <Message Id="Member" TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>DEFAULT_PREFETCH_HIGH</Item>

-              </Issue>

-             </Message>

-             <Message Id="Member" TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>MessageConsumerBuilder.DEFAULT_PREFETCH_HIGH</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="WithPrefetchHigh(System.Int32):Qpid.Messaging.MessageConsumerBuilder">

-            <Messages>

-             <Message Id="0#prefetch" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>MessageConsumerBuilder.WithPrefetchHigh(Int32):MessageConsumerBuilder</Item>

-               <Item>prefetch</Item>

-               <Item>prefetchHigh</Item>

-              </Issue>

-             </Message>

-             <Message Id="Prefetch" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>Prefetch</Item>

-               <Item>MessageConsumerBuilder.WithPrefetchHigh(Int32):MessageConsumerBuilder</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-           <Member Name="WithPrefetchLow(System.Int32):Qpid.Messaging.MessageConsumerBuilder">

-            <Messages>

-             <Message Id="0#prefetch" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Parameter">

-               <Item>MessageConsumerBuilder.WithPrefetchLow(Int32):MessageConsumerBuilder</Item>

-               <Item>prefetch</Item>

-               <Item>prefetchLow</Item>

-              </Issue>

-             </Message>

-             <Message Id="Prefetch" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="Member">

-               <Item>Prefetch</Item>

-               <Item>MessageConsumerBuilder.WithPrefetchLow(Int32):MessageConsumerBuilder</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="MessageNotReadableException">

-          <Messages>

-           <Message TypeName="ImplementStandardExceptionConstructors" Category="Microsoft.Design" CheckId="CA1032" Created="2006-12-04 13:11:47Z">

-            <Issue>

-             <Item>Qpid.Messaging.MessageNotReadableException</Item>

-             <Item>protected MessageNotReadableException(SerializationInfo, StreamingContext)</Item>

-            </Issue>

-            <Issue>

-             <Item>Qpid.Messaging.MessageNotReadableException</Item>

-             <Item>public MessageNotReadableException()</Item>

-            </Issue>

-            <Issue>

-             <Item>Qpid.Messaging.MessageNotReadableException</Item>

-             <Item>public MessageNotReadableException(String, Exception)</Item>

-            </Issue>

-           </Message>

-          </Messages>

-         </Type>

-         <Type Name="MessageNotWriteableException">

-          <Messages>

-           <Message TypeName="ImplementStandardExceptionConstructors" Category="Microsoft.Design" CheckId="CA1032" Created="2006-12-04 13:11:47Z">

-            <Issue>

-             <Item>Qpid.Messaging.MessageNotWriteableException</Item>

-             <Item>protected MessageNotWriteableException(SerializationInfo, StreamingContext)</Item>

-            </Issue>

-            <Issue>

-             <Item>Qpid.Messaging.MessageNotWriteableException</Item>

-             <Item>public MessageNotWriteableException()</Item>

-            </Issue>

-            <Issue>

-             <Item>Qpid.Messaging.MessageNotWriteableException</Item>

-             <Item>public MessageNotWriteableException(String, Exception)</Item>

-            </Issue>

-           </Message>

-           <Message Id="Writeable" TypeName="UsePreferredTerms" Category="Microsoft.Naming" CheckId="CA1726" Created="2006-12-04 13:11:47Z">

-            <Issue Name="Type">

-             <Item>Writeable</Item>

-             <Item>MessageNotWriteableException</Item>

-             <Item>Writable</Item>

-            </Issue>

-           </Message>

-          </Messages>

-         </Type>

-         <Type Name="MessagePublisherBuilder">

-          <Members>

-           <Member Name=".ctor(Qpid.Messaging.IChannel)">

-            <Messages>

-             <Message TypeName="DoNotInitializeUnnecessarily" Category="Microsoft.Performance" CheckId="CA1805" Created="2006-12-04 13:11:47Z">

-              <Issue>

-               <Item>MessagePublisherBuilder.MessagePublisherBuilder(IChannel)</Item>

-               <Item>_exchangeName</Item>

-               <Item>System.String</Item>

-               <Item>null</Item>

-              </Issue>

-              <Issue>

-               <Item>MessagePublisherBuilder.MessagePublisherBuilder(IChannel)</Item>

-               <Item>_immediate</Item>

-               <Item>System.Boolean</Item>

-               <Item>false</Item>

-              </Issue>

-              <Issue>

-               <Item>MessagePublisherBuilder.MessagePublisherBuilder(IChannel)</Item>

-               <Item>_priority</Item>

-               <Item>System.Int32</Item>

-               <Item>0</Item>

-              </Issue>

-              <Issue>

-               <Item>MessagePublisherBuilder.MessagePublisherBuilder(IChannel)</Item>

-               <Item>_routingKey</Item>

-               <Item>System.String</Item>

-               <Item>null</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="MessageReceivedDelegate">

-          <Messages>

-           <Message TypeName="IdentifiersShouldNotHaveIncorrectSuffix" Category="Microsoft.Naming" CheckId="CA1711" Created="2006-12-04 13:11:47Z">

-            <Issue>

-             <Item>Qpid.Messaging.MessageReceivedDelegate</Item>

-             <Item>Delegate</Item>

-            </Issue>

-           </Message>

-          </Messages>

-         </Type>

-         <Type Name="QpidException">

-          <Messages>

-           <Message Id="Qpid" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-            <Issue Name="Type">

-             <Item>Qpid</Item>

-             <Item>Qpid.Messaging.QpidException</Item>

-            </Issue>

-           </Message>

-           <Message TypeName="ImplementStandardExceptionConstructors" Category="Microsoft.Design" CheckId="CA1032" Created="2006-12-04 13:11:47Z">

-            <Issue>

-             <Item>Qpid.Messaging.QpidException</Item>

-             <Item>protected QpidException(SerializationInfo, StreamingContext)</Item>

-            </Issue>

-            <Issue>

-             <Item>Qpid.Messaging.QpidException</Item>

-             <Item>public QpidException()</Item>

-            </Issue>

-           </Message>

-           <Message TypeName="MarkISerializableTypesWithSerializable" Category="Microsoft.Usage" CheckId="CA2237" Created="2006-12-04 13:11:47Z">

-            <Issue Level="Error">

-             <Item>QpidException</Item>

-            </Issue>

-           </Message>

-          </Messages>

-          <Members>

-           <Member Name=".ctor(System.String,System.Exception)">

-            <Messages>

-             <Message Id="1#e" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2006-12-04 13:11:47Z">

-              <Issue Name="ParameterOneLetter">

-               <Item>QpidException.QpidException(String, Exception)</Item>

-               <Item>e</Item>

-              </Issue>

-             </Message>

-            </Messages>

-           </Member>

-          </Members>

-         </Type>

-         <Type Name="ResourceAllocationException">

-          <Messages>

-           <Message TypeName="ImplementStandardExceptionConstructors" Category="Microsoft.Design" CheckId="CA1032" Created="2006-12-04 13:11:47Z">

-            <Issue>

-             <Item>Qpid.Messaging.ResourceAllocationException</Item>

-             <Item>protected ResourceAllocationException(SerializationInfo, StreamingContext)</Item>

-            </Issue>

-            <Issue>

-             <Item>Qpid.Messaging.ResourceAllocationException</Item>

-             <Item>public ResourceAllocationException()</Item>

-            </Issue>

-            <Issue>

-             <Item>Qpid.Messaging.ResourceAllocationException</Item>

-             <Item>public ResourceAllocationException(String, Exception)</Item>

-            </Issue>

-           </Message>

-          </Messages>

-         </Type>

-        </Types>

-       </Namespace>

-      </Namespaces>

-     </Module>

-    </Modules>

-   </Target>

-  </Targets>

-  <Rules>

-   <Rule TypeName="AbstractTypesShouldNotHaveConstructors" Category="Microsoft.Design" CheckId="CA1012">

-    <Resolution Name="Default">Change the accessibility of all public constructors in '{0}' to protected.</Resolution>

-   </Rule>

-   <Rule TypeName="AssembliesShouldDeclareMinimumSecurity" Category="Microsoft.Usage" CheckId="CA2209">

-    <Resolution Name="Default">No valid permission requests were found for assembly '{0}'. You should always specify the minimum security permissions using SecurityAction.RequestMinimum.</Resolution>

-   </Rule>

-   <Rule TypeName="AssembliesShouldHaveValidStrongNames" Category="Microsoft.Design" CheckId="CA2210">

-    <Resolution Name="NoStrongName">Sign '{0}' with a strong name key.</Resolution>

-   </Rule>

-   <Rule TypeName="AvoidEmptyInterfaces" Category="Microsoft.Design" CheckId="CA1040">

-    <Resolution Name="Default">Define a custom attribute to replace '{0}'.</Resolution>

-   </Rule>

-   <Rule TypeName="AvoidLanguageSpecificTypeNamesInParameters" Category="Microsoft.Naming" CheckId="CA1718">

-    <Resolution Name="Default">Use a generic name for parameter '{0}'. If this is not possible, replace the type identifier with a universal type name.</Resolution>

-   </Rule>

-   <Rule TypeName="AvoidNamespacesWithFewTypes" Category="Microsoft.Design" CheckId="CA1020">

-    <Resolution Name="Default">Consider merging the types defined in '{0}' with another namespace.</Resolution>

-   </Rule>

-   <Rule TypeName="AvoidTypeNamesInParameters" Category="Microsoft.Naming" CheckId="CA1720">

-    <Resolution Name="Default">Remove the type identifier from parameter name '{0}'.</Resolution>

-   </Rule>

-   <Rule TypeName="AvoidUncalledPrivateCode" Category="Microsoft.Performance" CheckId="CA1811">

-    <Resolution Name="Default">'{0}' appears to have no upstream public or protected callers.</Resolution>

-   </Rule>

-   <Rule TypeName="AvoidUninstantiatedInternalClasses" Category="Microsoft.Performance" CheckId="CA1812">

-    <Resolution Name="Default">'{0}' is an internal class that is apparently never instantiated. If so, remove the code from the assembly. If this class is intended to contain only static methods, consider adding a private constructor to prevent the compiler from generating a default constructor.</Resolution>

-   </Rule>

-   <Rule TypeName="AvoidUnnecessaryStringCreation" Category="Microsoft.Performance" CheckId="CA1807">

-    <Resolution Name="UseStringCompareLocal">{0} calls {1} after converting '{2}', a local, to upper or lowercase. If possible, eliminate the string creation and call the overload of String.Compare that performs a case-insensitive comparison.</Resolution>

-    <Resolution Name="UseStringCompareParameter">{0} calls {1} after converting '{2}', a parameter, to upper or lowercase. If possible, eliminate the string creation and call the overload of String.Compare that performs a case-insensitive comparison.</Resolution>

-   </Rule>

-   <Rule TypeName="AvoidUnusedPrivateFields" Category="Microsoft.Performance" CheckId="CA1823">

-    <Resolution Name="Default">It appears that field '{0}' is never used or is only ever assigned to. Use this field or remove it.</Resolution>

-   </Rule>

-   <Rule TypeName="CollectionsShouldImplementGenericInterface" Category="Microsoft.Design" CheckId="CA1010">

-    <Resolution Name="Default">'{0}' appears to be a non-generic, strongly typed collection. Add an implementation to the instance of {1}&lt;T&gt; where T is {0}'s underlying element type.</Resolution>

-   </Rule>

-   <Rule TypeName="CompoundWordsShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1702">

-    <Resolution Name="ShouldBeCompoundWord">The discrete term '{0}' in {1} '{2}' should be expressed as a compound term, '{3}'.</Resolution>

-    <Resolution Name="ShouldBeDiscreteTerm">The compound word '{0}' in {1} '{2}' exists as a discrete term. If your usage is intended to be single word, case it as '{3}'.</Resolution>

-   </Rule>

-   <Rule TypeName="ConsiderPassingBaseTypesAsParameters" Category="Microsoft.Design" CheckId="CA1011">

-    <Resolution Name="Default">Consider changing the type of parameter '{0}' in {1} from {2} to its base type {3}. This method appears to only require base class members in its implementation. Suppress this violation if there is a compelling reason to require the more derived type in the method signature.</Resolution>

-   </Rule>

-   <Rule TypeName="DoNotCastUnnecessarily" Category="Microsoft.Performance" CheckId="CA1800">

-    <Resolution Name="Local">'{0}', a local, is cast to type '{1}' multiple times in method {2}. Cache the result of the 'as' operator or direct cast in order to eliminate the redundant {3} instruction.</Resolution>

-    <Resolution Name="Parameter">'{0}', a parameter, is cast to type '{1}' multiple times in method {2}. Cache the result of the 'as' operator or direct cast in order to eliminate the redundant {3} instruction.</Resolution>

-   </Rule>

-   <Rule TypeName="DoNotCatchGeneralExceptionTypes" Category="Microsoft.Design" CheckId="CA1031">

-    <Resolution Name="Default">Modify '{0}' to catch a more specific exception than '{1}' or rethrow the exception.</Resolution>

-   </Rule>

-   <Rule TypeName="DoNotConcatenateStringsInsideLoops" Category="Microsoft.Performance" CheckId="CA1818">

-    <Resolution Name="Default">Change {0} to use StringBuilder instead of String.Concat or +=</Resolution>

-   </Rule>

-   <Rule TypeName="DoNotDeclareReadOnlyMutableReferenceTypes" Category="Microsoft.Security" CheckId="CA2104">

-    <Resolution Name="Default">Remove the readonly declaration from '{0}' or change the field to one that is an immutable reference type. If the reference type '{1}' is, in fact, immutable, exclude this message.</Resolution>

-   </Rule>

-   <Rule TypeName="DoNotDeclareVisibleInstanceFields" Category="Microsoft.Design" CheckId="CA1051">

-    <Resolution Name="Default">Make '{0}' private or internal (Friend in VB, public private in C++) and provide a public or protected property to access it.</Resolution>

-   </Rule>

-   <Rule TypeName="DoNotIgnoreMethodResults" Category="Microsoft.Usage" CheckId="CA1806">

-    <Resolution Name="ObjectCreation">{0} creates an instance of {1} which is either not assigned to a variable or is never used. Remove the object creation if it is unnecessary or use it within the method.</Resolution>

-   </Rule>

-   <Rule TypeName="DoNotInitializeUnnecessarily" Category="Microsoft.Performance" CheckId="CA1805">

-    <Resolution Name="Default">{0} initializes field {1} of type {2} to {3}. Remove this initialization as it will be done automatically by the runtime.</Resolution>

-   </Rule>

-   <Rule TypeName="DoNotPassLiteralsAsLocalizedParameters" Category="Microsoft.Globalization" CheckId="CA1303">

-    <Resolution Name="Default">{0} passes a literal as parameter {1} of a call to {2}. Retrieve the following string argument from a resource table instead: '{3}'</Resolution>

-   </Rule>

-   <Rule TypeName="DoNotRaiseReservedExceptionTypes" Category="Microsoft.Usage" CheckId="CA2201">

-    <Resolution Name="TooGeneric">{0} creates an exception of type '{1}', an exception type that is not sufficiently specific and should never be raised by user code. If this exception instance might be thrown, use a different exception type.</Resolution>

-   </Rule>

-   <Rule TypeName="ExceptionsShouldBePublic" Category="Microsoft.Design" CheckId="CA1064">

-    <Resolution Name="Default">Make exception class {0} public.</Resolution>

-   </Rule>

-   <Rule TypeName="ICollectionImplementationsHaveStronglyTypedMembers" Category="Microsoft.Design" CheckId="CA1035">

-    <Resolution Name="Default">'{0}' should provide a strongly typed implementation of ICollection.CopyTo.</Resolution>

-   </Rule>

-   <Rule TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709">

-    <Resolution Name="Member">Correct the casing of member name '{0}'.</Resolution>

-    <Resolution Name="Namespace">Correct the casing of namespace name '{0}'.</Resolution>

-    <Resolution Name="Parameter">Correct the casing of parameter name '{0}'.</Resolution>

-   </Rule>

-   <Rule TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704">

-    <Resolution Name="Member">Correct the spelling of the unrecognized token '{0}' in member name '{1}'.</Resolution>

-    <Resolution Name="Namespace">Correct the spelling of the unrecognized token '{0}' in namespace '{1}'.</Resolution>

-    <Resolution Name="Parameter">In method {0}, correct the spelling of the unrecognized token '{1}' in parameter name '{2}' or strip it entirely if it represents any sort of hungarian notation.</Resolution>

-    <Resolution Name="ParameterOneLetter">In method {0}, consider providing a more meaningful name than the one-letter parameter name '{1}'.</Resolution>

-    <Resolution Name="Type">Correct the spelling of the unrecognized token '{0}' in type name '{1}'.</Resolution>

-   </Rule>

-   <Rule TypeName="IdentifiersShouldDifferByMoreThanCase" Category="Microsoft.Naming" CheckId="CA1708">

-    <Resolution Name="Member">Change member names {0} and '{1}' so that they differ by more than case.</Resolution>

-   </Rule>

-   <Rule TypeName="IdentifiersShouldHaveCorrectPrefix" Category="Microsoft.Naming" CheckId="CA1715">

-    <Resolution Name="Default">Prefix interface name '{0}' with 'I'.</Resolution>

-   </Rule>

-   <Rule TypeName="IdentifiersShouldHaveCorrectSuffix" Category="Microsoft.Naming" CheckId="CA1710">

-    <Resolution Name="Default">Rename '{0}' to end in '{1}'.</Resolution>

-   </Rule>

-   <Rule TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707">

-    <Resolution Name="Member">Remove all underscores from member '{0}'.</Resolution>

-   </Rule>

-   <Rule TypeName="IdentifiersShouldNotHaveIncorrectSuffix" Category="Microsoft.Naming" CheckId="CA1711">

-    <Resolution Name="Default">Rename '{0}' so that it does not end in '{1}'.</Resolution>

-   </Rule>

-   <Rule TypeName="ImplementIDisposableCorrectly" Category="Microsoft.Design" CheckId="CA1063">

-    <Resolution Name="DisposeImplementation">Modify {0} so that it calls Dispose(true), then calls GC.SuppressFinalize on the current object instance ('this' or 'Me' in VB), and then returns.</Resolution>

-    <Resolution Name="ProvideDisposeBool">Provide an overridable implementation of Dispose(bool) on {0} or mark the type as sealed. A call to Dispose(false) should only clean up native resources. A call to Dispose(true) should clean up both managed and native resources.</Resolution>

-   </Rule>

-   <Rule TypeName="ImplementStandardExceptionConstructors" Category="Microsoft.Design" CheckId="CA1032">

-    <Resolution Name="Default">Add the following constructor to {0}: {1}.</Resolution>

-   </Rule>

-   <Rule TypeName="InitializeReferenceTypeStaticFieldsInline" Category="Microsoft.Performance" CheckId="CA1810">

-    <Resolution Name="Default">Initialize all static fields in {0} when those fields are declared and remove the explicit static constructor.</Resolution>

-   </Rule>

-   <Rule TypeName="InstantiateArgumentExceptionsCorrectly" Category="Microsoft.Usage" CheckId="CA2208">

-    <Resolution Name="OneArgumentShouldBeParameterName">Calls to {0}'s constructor '{1}' should contain one of the method's parameter names instead of '{2}'. Note that the provided parameter name should have the exact casing as declared on the method.</Resolution>

-   </Rule>

-   <Rule TypeName="LiteralsShouldBeSpelledCorrectly" Category="Microsoft.Usage" CheckId="CA2204">

-    <Resolution Name="Default">Correct the spelling of the unrecognized token '{0}' in the literal '{1}'.</Resolution>

-   </Rule>

-   <Rule TypeName="LongAcronymsShouldBePascalCased" Category="Microsoft.Naming" CheckId="CA1705">

-    <Resolution Name="Member">Correct the capitalization of member name '{0}'.</Resolution>

-    <Resolution Name="Parameter">Correct the capitalization of parameter name '{0}'.</Resolution>

-    <Resolution Name="Type">Correct the capitalization of type name '{0}'.</Resolution>

-   </Rule>

-   <Rule TypeName="MarkAssembliesWithClsCompliant" Category="Microsoft.Design" CheckId="CA1014">

-    <Resolution Name="NoAttr">'{0}' should be marked with CLSCompliantAttribute and its value should be true.</Resolution>

-   </Rule>

-   <Rule TypeName="MarkISerializableTypesWithSerializable" Category="Microsoft.Usage" CheckId="CA2237">

-    <Resolution Name="Default">Add [Serializable] to '{0}' as this type implements ISerializable.</Resolution>

-   </Rule>

-   <Rule TypeName="MarkMembersAsStatic" Category="Microsoft.Performance" CheckId="CA1822">

-    <Resolution Name="Default">The 'this' parameter (or 'Me' in VB) of {0} is never used. Mark the member as static (or Shared in VB) or use 'this'/'Me' in the method body or at least one property accessor, if appropriate.</Resolution>

-   </Rule>

-   <Rule TypeName="NestedTypesShouldNotBeVisible" Category="Microsoft.Design" CheckId="CA1034">

-    <Resolution Name="Default">Do not nest type '{0}'. Alternatively, change its accessibility so that it is not externally visible.</Resolution>

-   </Rule>

-   <Rule TypeName="NonConstantFieldsShouldNotBeVisible" Category="Microsoft.Usage" CheckId="CA2211">

-    <Resolution Name="Default">Consider making '{0}' non-public or a constant.</Resolution>

-   </Rule>

-   <Rule TypeName="OperationsShouldNotOverflow" Category="Microsoft.Usage" CheckId="CA2233">

-    <Resolution Name="Default">Correct the potential overflow in the operation '{0}' in '{1}'.</Resolution>

-   </Rule>

-   <Rule TypeName="ParameterNamesShouldMatchBaseDeclaration" Category="Microsoft.Naming" CheckId="CA1725">

-    <Resolution Name="Default">Change parameter name '{0}' of method {1} to '{2}' in order to match the identifier as it has been declared in {3}.</Resolution>

-   </Rule>

-   <Rule TypeName="PropertiesShouldNotBeWriteOnly" Category="Microsoft.Design" CheckId="CA1044">

-    <Resolution Name="Default">Add a property getter to '{0}'.</Resolution>

-   </Rule>

-   <Rule TypeName="PropertiesShouldNotReturnArrays" Category="Microsoft.Performance" CheckId="CA1819">

-    <Resolution Name="Default">Change {0} to return a collection or make it a method.</Resolution>

-   </Rule>

-   <Rule TypeName="ProvideCorrectArgumentsToFormattingMethods" Category="Microsoft.Usage" CheckId="CA2241">

-    <Resolution Name="MissingSpecifier">A call to {0} in {1} does not appear to provide a format specifier for argument {2}. The complete format string provided is '{3}'.</Resolution>

-   </Rule>

-   <Rule TypeName="RemoveUnusedLocals" Category="Microsoft.Performance" CheckId="CA1804">

-    <Resolution Name="Default">{0} declares a local, '{1}', of type {2}, which is never used or is only assigned to. Use this local or remove it.</Resolution>

-   </Rule>

-   <Rule TypeName="RethrowToPreserveStackDetails" Category="Microsoft.Usage" CheckId="CA2200">

-    <Resolution Name="Default">{0} rethrows a caught exception and specifies it explicitly as an argument. Use 'throw' without an argument instead, in order to preserve the stack location where the exception was initially raised.</Resolution>

-   </Rule>

-   <Rule TypeName="ReviewUnusedParameters" Category="Microsoft.Usage" CheckId="CA1801">

-    <Resolution Name="Default">Parameter '{0}' of {1} is never used. Remove the parameter or use it in the method body.</Resolution>

-   </Rule>

-   <Rule TypeName="ShortAcronymsShouldBeUppercase" Category="Microsoft.Naming" CheckId="CA1706">

-    <Resolution Name="MemberId">'Id' is an abbreviation and therefore is not subject to acronym casing guidelines. Correct the capitalization of 'ID' in member name '{0}' by changing it to 'Id'.</Resolution>

-    <Resolution Name="MemberOk">To insure consistency with legacy api, 'OK' is not subject to acronym casing guidelines. Correct the capitalization of 'OK' in member name '{0}' by changing it to 'Ok'.</Resolution>

-    <Resolution Name="Parameter">Correct the capitalization of '{0}' in parameter name '{1}'.</Resolution>

-    <Resolution Name="Type">Correct the capitalization of '{0}' in type name '{1}'.</Resolution>

-   </Rule>

-   <Rule TypeName="SpecifyCultureInfo" Category="Microsoft.Globalization" CheckId="CA1304">

-    <Resolution Name="Default">{0} makes a call to {1} that does not explicitly provide a CultureInfo. This should be replaced with a call to {2}.</Resolution>

-   </Rule>

-   <Rule TypeName="SpecifyIFormatProvider" Category="Microsoft.Globalization" CheckId="CA1305">

-    <Resolution Name="Default">{0} makes a call to {1} that does not explicitly provide an IFormatProvider. This should be replaced with a call to {2}.</Resolution>

-   </Rule>

-   <Rule TypeName="StaticHolderTypesShouldNotHaveConstructors" Category="Microsoft.Design" CheckId="CA1053">

-    <Resolution Name="Default">Remove the public constructors from '{0}'.</Resolution>

-   </Rule>

-   <Rule TypeName="TestForEmptyStringsUsingStringLength" Category="Microsoft.Performance" CheckId="CA1820">

-    <Resolution Name="IsNullOrEmpty">Replace the call to String.{0}({1}) in '{2}' with a call to String.IsNullOrEmpty.</Resolution>

-   </Rule>

-   <Rule TypeName="TypesThatOwnDisposableFieldsShouldBeDisposable" Category="Microsoft.Design" CheckId="CA1001">

-    <Resolution Name="Default">Implement IDisposable on '{0}' as it instantiates members of the following IDisposable types: {1}</Resolution>

-   </Rule>

-   <Rule TypeName="UriParametersShouldNotBeStrings" Category="Microsoft.Design" CheckId="CA1054">

-    <Resolution Name="Default">Change the type of parameter '{0}' of method {1} from string to System.Uri, or provide an overload of {1}, that allows '{0}' to be passed as a System.Uri object.</Resolution>

-   </Rule>

-   <Rule TypeName="UriReturnValuesShouldNotBeStrings" Category="Microsoft.Design" CheckId="CA1055">

-    <Resolution Name="Default">Change the return type of {0} from string to System.Uri.</Resolution>

-   </Rule>

-   <Rule TypeName="UseEventsWhereAppropriate" Category="Microsoft.Design" CheckId="CA1030">

-    <Resolution Name="Default">Consider making '{0}' an event.</Resolution>

-   </Rule>

-   <Rule TypeName="UseLiteralsWhereAppropriate" Category="Microsoft.Performance" CheckId="CA1802">

-    <Resolution Name="Default">Field '{0}' is declared as 'static readonly' but is initialized with a constant value '{1}'. Mark this field as 'const' instead.</Resolution>

-   </Rule>

-   <Rule TypeName="UsePreferredTerms" Category="Microsoft.Naming" CheckId="CA1726">

-    <Resolution Name="Type">Replace the term '{0}' in type name '{1}' with the preferred alternate '{2}'.</Resolution>

-   </Rule>

-   <Rule TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024">

-    <Resolution Name="Default">Change '{0}' to a property if appropriate.</Resolution>

-   </Rule>

-   <Rule TypeName="ValidateArgumentsOfPublicMethods" Category="Microsoft.Design" CheckId="CA1062">

-    <Resolution Name="Default">Validate parameter {0} passed to externally visible method {1}.</Resolution>

-   </Rule>

-  </Rules>

- </FxCopReport>

-</FxCopProject>

diff --git a/qpid/dotnet/Qpid.NET.sln b/qpid/dotnet/Qpid.NET.sln
deleted file mode 100644
index 70ae637b23..0000000000
--- a/qpid/dotnet/Qpid.NET.sln
+++ /dev/null
@@ -1,85 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 9.00

-# Visual Studio 2005

-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Qpid.Messaging", "Qpid.Messaging\Qpid.Messaging.csproj", "{6688F826-C58E-4C1B-AA1F-22AFAB4B7D07}"

-EndProject

-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Qpid.Common.Tests", "Qpid.Common.Tests\Qpid.Common.Tests.csproj", "{F83624B0-762B-4D82-900D-FF4C1B36E36E}"

-EndProject

-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Qpid.Buffer", "Qpid.Buffer\Qpid.Buffer.csproj", "{44384DF2-B0A4-4580-BDBC-EE4BAA87D995}"

-EndProject

-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Qpid.Codec", "Qpid.Codec\Qpid.Codec.csproj", "{22D0D0C2-77AF-4DE3-B456-7FF3893F9F88}"

-EndProject

-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Qpid.Client", "Qpid.Client\Qpid.Client.csproj", "{68987C05-3768-452C-A6FC-6BA1D372852F}"

-EndProject

-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Qpid.Common", "Qpid.Common\Qpid.Common.csproj", "{77064C42-24D2-4CEB-9EA2-0EF481A43205}"

-EndProject

-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Qpid.Client.Tests", "Qpid.Client.Tests\Qpid.Client.Tests.csproj", "{BA1B0032-4CE6-40DD-A2DC-119F0FFA0A1D}"

-EndProject

-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Qpid.Sasl", "Qpid.Sasl\Qpid.Sasl.csproj", "{1465B0EE-6452-42A6-AB73-B2F9EABEEE75}"

-EndProject

-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Qpid.Sasl.Tests", "Qpid.Sasl.Tests\Qpid.Sasl.Tests.csproj", "{587B3520-EBB9-41ED-B019-E96116B651CE}"

-EndProject

-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Qpid.Buffer.Tests", "Qpid.Buffer.Tests\Qpid.Buffer.Tests.csproj", "{74640962-99D0-4D06-B57A-9CD66517CF52}"

-EndProject

-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TopicPublisher", "TopicPublisher\TopicPublisher.csproj", "{A06C9FFD-22FF-4654-856D-897C230978AF}"

-EndProject

-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TopicListener", "TopicListener\TopicListener.csproj", "{9A112DF2-146F-4CF4-919B-9D3BE7D088E9}"

-EndProject

-Global

-	GlobalSection(SolutionConfigurationPlatforms) = preSolution

-		Debug|Any CPU = Debug|Any CPU

-		Release|Any CPU = Release|Any CPU

-	EndGlobalSection

-	GlobalSection(ProjectConfigurationPlatforms) = postSolution

-		{6688F826-C58E-4C1B-AA1F-22AFAB4B7D07}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

-		{6688F826-C58E-4C1B-AA1F-22AFAB4B7D07}.Debug|Any CPU.Build.0 = Debug|Any CPU

-		{6688F826-C58E-4C1B-AA1F-22AFAB4B7D07}.Release|Any CPU.ActiveCfg = Release|Any CPU

-		{6688F826-C58E-4C1B-AA1F-22AFAB4B7D07}.Release|Any CPU.Build.0 = Release|Any CPU

-		{F83624B0-762B-4D82-900D-FF4C1B36E36E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

-		{F83624B0-762B-4D82-900D-FF4C1B36E36E}.Debug|Any CPU.Build.0 = Debug|Any CPU

-		{F83624B0-762B-4D82-900D-FF4C1B36E36E}.Release|Any CPU.ActiveCfg = Release|Any CPU

-		{F83624B0-762B-4D82-900D-FF4C1B36E36E}.Release|Any CPU.Build.0 = Release|Any CPU

-		{44384DF2-B0A4-4580-BDBC-EE4BAA87D995}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

-		{44384DF2-B0A4-4580-BDBC-EE4BAA87D995}.Debug|Any CPU.Build.0 = Debug|Any CPU

-		{44384DF2-B0A4-4580-BDBC-EE4BAA87D995}.Release|Any CPU.ActiveCfg = Release|Any CPU

-		{44384DF2-B0A4-4580-BDBC-EE4BAA87D995}.Release|Any CPU.Build.0 = Release|Any CPU

-		{22D0D0C2-77AF-4DE3-B456-7FF3893F9F88}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

-		{22D0D0C2-77AF-4DE3-B456-7FF3893F9F88}.Debug|Any CPU.Build.0 = Debug|Any CPU

-		{22D0D0C2-77AF-4DE3-B456-7FF3893F9F88}.Release|Any CPU.ActiveCfg = Release|Any CPU

-		{22D0D0C2-77AF-4DE3-B456-7FF3893F9F88}.Release|Any CPU.Build.0 = Release|Any CPU

-		{68987C05-3768-452C-A6FC-6BA1D372852F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

-		{68987C05-3768-452C-A6FC-6BA1D372852F}.Debug|Any CPU.Build.0 = Debug|Any CPU

-		{68987C05-3768-452C-A6FC-6BA1D372852F}.Release|Any CPU.ActiveCfg = Release|Any CPU

-		{68987C05-3768-452C-A6FC-6BA1D372852F}.Release|Any CPU.Build.0 = Release|Any CPU

-		{77064C42-24D2-4CEB-9EA2-0EF481A43205}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

-		{77064C42-24D2-4CEB-9EA2-0EF481A43205}.Debug|Any CPU.Build.0 = Debug|Any CPU

-		{77064C42-24D2-4CEB-9EA2-0EF481A43205}.Release|Any CPU.ActiveCfg = Release|Any CPU

-		{77064C42-24D2-4CEB-9EA2-0EF481A43205}.Release|Any CPU.Build.0 = Release|Any CPU

-		{BA1B0032-4CE6-40DD-A2DC-119F0FFA0A1D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

-		{BA1B0032-4CE6-40DD-A2DC-119F0FFA0A1D}.Debug|Any CPU.Build.0 = Debug|Any CPU

-		{BA1B0032-4CE6-40DD-A2DC-119F0FFA0A1D}.Release|Any CPU.ActiveCfg = Release|Any CPU

-		{BA1B0032-4CE6-40DD-A2DC-119F0FFA0A1D}.Release|Any CPU.Build.0 = Release|Any CPU

-		{1465B0EE-6452-42A6-AB73-B2F9EABEEE75}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

-		{1465B0EE-6452-42A6-AB73-B2F9EABEEE75}.Debug|Any CPU.Build.0 = Debug|Any CPU

-		{1465B0EE-6452-42A6-AB73-B2F9EABEEE75}.Release|Any CPU.ActiveCfg = Release|Any CPU

-		{1465B0EE-6452-42A6-AB73-B2F9EABEEE75}.Release|Any CPU.Build.0 = Release|Any CPU

-		{587B3520-EBB9-41ED-B019-E96116B651CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

-		{587B3520-EBB9-41ED-B019-E96116B651CE}.Debug|Any CPU.Build.0 = Debug|Any CPU

-		{587B3520-EBB9-41ED-B019-E96116B651CE}.Release|Any CPU.ActiveCfg = Release|Any CPU

-		{587B3520-EBB9-41ED-B019-E96116B651CE}.Release|Any CPU.Build.0 = Release|Any CPU

-		{74640962-99D0-4D06-B57A-9CD66517CF52}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

-		{74640962-99D0-4D06-B57A-9CD66517CF52}.Debug|Any CPU.Build.0 = Debug|Any CPU

-		{74640962-99D0-4D06-B57A-9CD66517CF52}.Release|Any CPU.ActiveCfg = Release|Any CPU

-		{74640962-99D0-4D06-B57A-9CD66517CF52}.Release|Any CPU.Build.0 = Release|Any CPU

-		{A06C9FFD-22FF-4654-856D-897C230978AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

-		{A06C9FFD-22FF-4654-856D-897C230978AF}.Debug|Any CPU.Build.0 = Debug|Any CPU

-		{A06C9FFD-22FF-4654-856D-897C230978AF}.Release|Any CPU.ActiveCfg = Release|Any CPU

-		{A06C9FFD-22FF-4654-856D-897C230978AF}.Release|Any CPU.Build.0 = Release|Any CPU

-		{9A112DF2-146F-4CF4-919B-9D3BE7D088E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

-		{9A112DF2-146F-4CF4-919B-9D3BE7D088E9}.Debug|Any CPU.Build.0 = Debug|Any CPU

-		{9A112DF2-146F-4CF4-919B-9D3BE7D088E9}.Release|Any CPU.ActiveCfg = Release|Any CPU

-		{9A112DF2-146F-4CF4-919B-9D3BE7D088E9}.Release|Any CPU.Build.0 = Release|Any CPU

-	EndGlobalSection

-	GlobalSection(SolutionProperties) = preSolution

-		HideSolutionNode = FALSE

-	EndGlobalSection

-EndGlobal

diff --git a/qpid/dotnet/Qpid.Sasl.Tests/App.config b/qpid/dotnet/Qpid.Sasl.Tests/App.config
deleted file mode 100644
index 539f341e7c..0000000000
--- a/qpid/dotnet/Qpid.Sasl.Tests/App.config
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>

-<configuration>

-   <configSections>

-      <section name="qpid.sasl" type="Apache.Qpid.Sasl.Configuration.SaslConfigurationSectionHandler, Apache.Qpid.Sasl"/>

-   </configSections>

-

-   <qpid.sasl>

-      <clientFactories>

-         <add type="Apache.Qpid.Sasl.Tests.TestClientFactory, Apache.Qpid.Sasl.Tests"/>

-      </clientFactories>

-   </qpid.sasl>

-</configuration>

diff --git a/qpid/dotnet/Qpid.Sasl.Tests/Mechanisms/AnonymousSaslClientTests.cs b/qpid/dotnet/Qpid.Sasl.Tests/Mechanisms/AnonymousSaslClientTests.cs
deleted file mode 100644
index 09260736f0..0000000000
--- a/qpid/dotnet/Qpid.Sasl.Tests/Mechanisms/AnonymousSaslClientTests.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-/*

- *

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- *

- */

-

-using System;

-using System.Collections;

-using System.Text;

-

-using NUnit.Framework;

-using Apache.Qpid.Sasl;

-using Apache.Qpid.Sasl.Mechanisms;

-

-namespace Apache.Qpid.Sasl.Tests.Mechanisms

-{

-   [TestFixture]

-   public class AnonymousSaslClientTests : ISaslCallbackHandler

-   {

-      private const string AUTHID = "nobody@nowhere.com";

-      

-      [Test]

-      public void ReturnsRightMechanismName()

-      {

-         ISaslClient client = new AnonymousSaslClient(AUTHID, new Hashtable(), this);

-

-         Assert.AreEqual("ANONYMOUS", client.MechanismName);

-      }

-

-      [Test]

-      public void HasInitialResponseReturnsTrue()

-      {

-         ISaslClient client = new AnonymousSaslClient(AUTHID, new Hashtable(), this);

-

-         Assert.IsTrue(client.HasInitialResponse);

-      }

-

-      [Test]

-      public void CanEvaluateChallenge()

-      {

-         Hashtable props = new Hashtable();

-         ISaslClient client = new AnonymousSaslClient(AUTHID, props, this);

-

-         Assert.IsFalse(client.IsComplete);

-         byte[] response = client.EvaluateChallenge(new byte[0]);

-         Assert.AreEqual(AUTHID, Encoding.UTF8.GetString(response));

-         

-         Assert.IsTrue(client.IsComplete);

-      }

-

-      void ISaslCallbackHandler.Handle(ISaslCallback[] callbacks)

-      {

-      }

-

-   } // class AnonymousSaslClientTests

-

-} // namespace Apache.Qpid.Sasl.Tests.Mechanisms

diff --git a/qpid/dotnet/Qpid.Sasl.Tests/Mechanisms/CramMD5SaslClientTests.cs b/qpid/dotnet/Qpid.Sasl.Tests/Mechanisms/CramMD5SaslClientTests.cs
deleted file mode 100644
index e8b0ae5468..0000000000
--- a/qpid/dotnet/Qpid.Sasl.Tests/Mechanisms/CramMD5SaslClientTests.cs
+++ /dev/null
@@ -1,90 +0,0 @@
-/*

- *

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- *

- */

-

-using System;

-using System.Collections;

-using System.Text;

-

-using NUnit.Framework;

-using Apache.Qpid.Sasl;

-using Apache.Qpid.Sasl.Mechanisms;

-

-namespace Apache.Qpid.Sasl.Tests.Mechanisms

-{

-   [TestFixture]

-   public class CramMD5SaslClientTests : ISaslCallbackHandler

-   {

-      private const string USERNAME = "testuser";

-      private const string PASSWORD = "tanstaaftanstaaf";

-      private const string AUTHID = "test";

-      

-      [Test]

-      public void ReturnsRightMechanismName()

-      {

-         ISaslClient client = new CramMD5SaslClient(AUTHID, new Hashtable(), this);

-

-         Assert.AreEqual("CRAM-MD5", client.MechanismName);

-      }

-

-      [Test]

-      public void HasInitialResponseReturnsFalse()

-      {

-         ISaslClient client = new CramMD5SaslClient(AUTHID, new Hashtable(), this);

-

-         Assert.IsFalse(client.HasInitialResponse);

-      }

-

-      [Test]

-      public void CanEvaluateChallenge()

-      {

-         Hashtable props = new Hashtable();

-

-         ISaslClient client = new CramMD5SaslClient(AUTHID, props, this);

-

-         Assert.IsFalse(client.IsComplete);

-

-         byte[] challenge = 

-            Encoding.UTF8.GetBytes("<1896.697170952@postoffice.reston.mci.net>");

-         byte[] response = client.EvaluateChallenge(challenge);

-         string[] parts = Encoding.UTF8.GetString(response).Split(' ');

-         

-         Assert.AreEqual(2, parts.Length);

-         Assert.AreEqual(USERNAME, parts[0]);

-         Assert.AreEqual("b913a602c7eda7a495b4e6e7334d3890", parts[1]);

-         Assert.IsTrue(client.IsComplete);

-      }

-

-      void ISaslCallbackHandler.Handle(ISaslCallback[] callbacks)

-      {

-         foreach ( ISaslCallback cb in callbacks )

-         {

-            if ( cb is NameCallback )

-            {

-               ((NameCallback)cb).Text = USERNAME;

-            } else if ( cb is PasswordCallback )

-            {

-               ((PasswordCallback)cb).Text = PASSWORD;

-            }

-         }

-      }

-   } // class CramMD5SaslClientTests

-

-} // namespace Apache.Qpid.Sasl.Tests.Mechanisms

diff --git a/qpid/dotnet/Qpid.Sasl.Tests/Mechanisms/DigestSaslClientTests.cs b/qpid/dotnet/Qpid.Sasl.Tests/Mechanisms/DigestSaslClientTests.cs
deleted file mode 100644
index eb7e7ebbd5..0000000000
--- a/qpid/dotnet/Qpid.Sasl.Tests/Mechanisms/DigestSaslClientTests.cs
+++ /dev/null
@@ -1,249 +0,0 @@
-/*

- *

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- *

- */

-

-using System;

-using System.Collections;

-using System.Collections.Specialized;

-using System.Text;

-

-using NUnit.Framework;

-using Apache.Qpid.Sasl;

-using Apache.Qpid.Sasl.Mechanisms;

-

-namespace Apache.Qpid.Sasl.Tests.Mechanisms

-{

-   [TestFixture]

-   public class DigestSaslClientTests : ISaslCallbackHandler

-   {

-      private const string USERNAME = "chris";

-      private const string PASSWORD = "secret";

-      private const string AUTHID = null;

-      private const string PROTOCOL = "IMAP";

-      private const string SERVERNAME = "elwood.innosoft.com";

-

-      #region Digest Challenge Parsing Tests

-      //

-      // Digest Challenge Parsing Tests

-      //

-

-      [Test]

-      public void CanParseSimpleString()

-      {

-         string challenge = "realm=\"elwood.innosoft.com\", algorithm=md5-sess";

-         StringDictionary values = DigestChallenge.ParseParameters(challenge);

-         Assert.AreEqual(2, values.Count);

-         Assert.AreEqual("elwood.innosoft.com", values["realm"]);

-         Assert.AreEqual("md5-sess", values["algorithm"]);

-      }

-

-      [Test]

-      public void CanParseEscapedQuotes()

-      {

-         string challenge = "realm=\"elwood\\\".innosoft.com\", algorithm=md5-sess";

-         StringDictionary values = DigestChallenge.ParseParameters(challenge);

-         Assert.AreEqual(2, values.Count);

-         Assert.AreEqual("elwood\\\".innosoft.com", values["realm"]);

-         Assert.AreEqual("md5-sess", values["algorithm"]);

-      }

-

-      [Test]

-      public void CanParseEmbeddedDelimiter()

-      {

-         string challenge = "realm=\"elwood,innosoft.com\", algorithm=md5-sess";

-         StringDictionary values = DigestChallenge.ParseParameters(challenge);

-         Assert.AreEqual(2, values.Count);

-         Assert.AreEqual("elwood,innosoft.com", values["realm"]);

-         Assert.AreEqual("md5-sess", values["algorithm"]);

-      }

-

-      [Test]

-      public void CanParse1()

-      {

-         string challenge = "realm=\"elwood.innosoft.com\",nonce=\"OA6MG9tEQGm2hh\",qop=\"auth\",algorithm=md5-sess,charset=utf-8";

-         DigestChallenge parsed = DigestChallenge.Parse(challenge);

-

-         Assert.AreEqual("elwood.innosoft.com", parsed.Realm);

-         Assert.AreEqual("OA6MG9tEQGm2hh", parsed.Nonce);

-         Assert.Contains("auth", parsed.QopOptions);

-         Assert.AreEqual("md5-sess", parsed.Algorithm);

-         Assert.AreEqual("utf-8", parsed.Charset);

-      }

-

-      #endregion // Digest Challenge Parsing Tests

-

-

-      #region Digest Response Tests

-      //

-      // Digest Response Tests

-      //

-

-      [Test]

-      public void CanWriteResponse()

-      {

-         DigestResponse resp = new DigestResponse();

-         resp.Username = "user";

-         resp.Realm = "nowhere.com";

-         resp.Nonce = "OA9BSXrbuRhWay";

-         resp.Cnonce = "OA9BSuZWMSpW8m";

-         resp.NonceCount = 16;

-         resp.DigestUri = "acap/elwood.innosoft.com";

-         resp.Response = "6084c6db3fede7352c551284490fd0fc";

-         resp.Qop = "auth";

-         resp.MaxBuffer = 65536;

-         resp.Cipher = "3des";

-         resp.Authzid = "user2";

-         resp.AuthParam = "ap";

-         resp.Charset = "utf-8";

-

-         string expected = "username=\"user\",realm=\"nowhere.com\",nonce=\"OA9BSXrbuRhWay\",cnonce=\"OA9BSuZWMSpW8m\",nc=00000010,qop=auth,digest-uri=\"acap/elwood.innosoft.com\",response=\"6084c6db3fede7352c551284490fd0fc\",maxbuf=65536,charset=utf-8,cipher=3des,authzid=\"user2\",auth-param=\"ap\"";

-         Assert.AreEqual(expected, resp.ToString());

-      }

-

-      [Test]

-      public void CanWriteEscapedSecuence()

-      {

-         DigestResponse resp = new DigestResponse();

-         resp.Username = "us\"er";

-

-         string expected = "username=\"us\\\"er\",nc=00000000,maxbuf=0";

-         Assert.AreEqual(expected, resp.ToString());

-      }

-

-      #endregion // Digest Response Tests

-

-

-      #region Authentication Tests

-      //

-      // Authentication Tests

-      //

-

-      [Test]

-      public void ReturnsRightMechanismName()

-      {

-         ISaslClient client = CreateClient();

-

-         Assert.AreEqual("DIGEST-MD5", client.MechanismName);

-      }

-

-      [Test]

-      public void HasInitialResponseReturnsFalse()

-      {

-         ISaslClient client = CreateClient();

-

-         Assert.IsFalse(client.HasInitialResponse);

-      }

-

-      [Test]

-      public void CanAuthenticate()

-      {

-         string challenge = "realm=\"elwood.innosoft.com\",nonce=\"OA6MG9tEQGm2hh\",qop=\"auth\",algorithm=md5-sess,charset=utf-8";

-         DigestSaslClient client = CreateClient();

-         client.Cnonce = "OA6MHXh6VqTrRk";

-

-         byte[] bresp = client.EvaluateChallenge(Encoding.UTF8.GetBytes(challenge));

-         string response = Encoding.UTF8.GetString(bresp);

-         string expectedResp = "username=\"chris\",realm=\"elwood.innosoft.com\",nonce=\"OA6MG9tEQGm2hh\",cnonce=\"" +

-            client.Cnonce + "\",nc=00000001,qop=auth,digest-uri=\"imap/elwood.innosoft.com\",response=\"d388dad90d4bbd760a152321f2143af7\",maxbuf=65536,charset=utf-8";

-

-         Assert.AreEqual(expectedResp, response);

-         Assert.IsFalse(client.IsComplete);

-

-         string challenge2 = "rspauth=ea40f60335c427b5527b84dbabcdfffd";

-         bresp = client.EvaluateChallenge(Encoding.UTF8.GetBytes(challenge2));

-         // client responds with zero-length array

-         Assert.AreEqual(0, bresp.Length);

-         Assert.IsTrue(client.IsComplete);

-      }

-

-      [Test]

-      [ExpectedException(typeof(ArgumentNullException))]

-      public void ThrowsExceptionWhenChallengeIsMissing()

-      {

-         DigestSaslClient client = CreateClient();

-         client.EvaluateChallenge(null);

-      }

-

-

-      [Test]

-      [ExpectedException(typeof(SaslException))]

-      public void ThrowsExceptionWhenNonceMissing()

-      {

-         string challenge = "realm=\"elwood.innosoft.com\"";

-         DigestSaslClient client = CreateClient();

-

-         client.EvaluateChallenge(Encoding.UTF8.GetBytes(challenge));

-      }

-

-      [Test]

-      [ExpectedException(typeof(SaslException))]

-      public void ThrowsExceptionWhenAlgorithmMissing()

-      {

-         string challenge = "realm=\"elwood.innosoft.com\",nonce=\"asdasadsad\"";

-         DigestSaslClient client = CreateClient();

-

-         client.EvaluateChallenge(Encoding.UTF8.GetBytes(challenge));

-      }

-

-      [Test]

-      [ExpectedException(typeof(SaslException))]

-      public void ThrowsExceptionWhenSecondChallengeInvalid()

-      {

-         string challenge = "realm=\"elwood.innosoft.com\",nonce=\"OA6MG9tEQGm2hh\",qop=\"auth\",algorithm=md5-sess,charset=utf-8";

-         DigestSaslClient client = CreateClient();

-

-         byte[] bresp = client.EvaluateChallenge(Encoding.UTF8.GetBytes(challenge));

-         Encoding.UTF8.GetString(bresp);

-

-         // repeat challenge 1, which is incorrect

-         client.EvaluateChallenge(Encoding.UTF8.GetBytes(challenge));

-      }

-

-      private DigestSaslClient CreateClient()

-      {

-         return new DigestSaslClient(

-            AUTHID, SERVERNAME, PROTOCOL, 

-            new Hashtable(), this

-            );

-      }

-

-      void ISaslCallbackHandler.Handle(ISaslCallback[] callbacks)

-      {

-         foreach ( ISaslCallback cb in callbacks )

-         {

-            if ( cb is NameCallback )

-            {

-               ((NameCallback)cb).Text = USERNAME;

-            } else if ( cb is PasswordCallback )

-            {

-               ((PasswordCallback)cb).Text = PASSWORD;

-            } else if ( cb is RealmCallback )

-            {

-               ((RealmCallback)cb).Text = SERVERNAME;

-            }

-         }

-      }

-

-      #endregion // Authentication Tests

-

-

-   } // class DigestSaslClientTests

-

-} // namespace Apache.Qpid.Sasl.Tests.Mechanisms

diff --git a/qpid/dotnet/Qpid.Sasl.Tests/Mechanisms/ExternalSaslClientTests.cs b/qpid/dotnet/Qpid.Sasl.Tests/Mechanisms/ExternalSaslClientTests.cs
deleted file mode 100644
index 1864a6c957..0000000000
--- a/qpid/dotnet/Qpid.Sasl.Tests/Mechanisms/ExternalSaslClientTests.cs
+++ /dev/null
@@ -1,71 +0,0 @@
-/*

- *

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- *

- */

-

-using System;

-using System.Collections;

-using System.Text;

-

-using NUnit.Framework;

-using Apache.Qpid.Sasl;

-using Apache.Qpid.Sasl.Mechanisms;

-

-namespace Apache.Qpid.Sasl.Tests.Mechanisms

-{

-   [TestFixture]

-   public class ExternalSaslClientTests : ISaslCallbackHandler

-   {

-      private const string AUTHID = "nobody@nowhere.com";

-      

-      [Test]

-      public void ReturnsRightMechanismName()

-      {

-         ISaslClient client = new ExternalSaslClient(AUTHID, new Hashtable(), this);

-

-         Assert.AreEqual("EXTERNAL", client.MechanismName);

-      }

-

-      [Test]

-      public void HasInitialResponseReturnsTrue()

-      {

-         ISaslClient client = new ExternalSaslClient(AUTHID, new Hashtable(), this);

-

-         Assert.IsTrue(client.HasInitialResponse);

-      }

-

-      [Test]

-      public void CanEvaluateChallenge()

-      {

-         ISaslClient client = new ExternalSaslClient(AUTHID, new Hashtable(), this);

-

-         Assert.IsFalse(client.IsComplete);

-         byte[] response = client.EvaluateChallenge(new byte[0]);

-         Assert.AreEqual(AUTHID, Encoding.UTF8.GetString(response));

-         

-         Assert.IsTrue(client.IsComplete);

-      }

-

-      void ISaslCallbackHandler.Handle(ISaslCallback[] callbacks)

-      {

-      }

-

-   } // class AnonymousSaslClientTests

-

-} // namespace Apache.Qpid.Sasl.Tests.Mechanisms

diff --git a/qpid/dotnet/Qpid.Sasl.Tests/Mechanisms/PlainSaslClientTests.cs b/qpid/dotnet/Qpid.Sasl.Tests/Mechanisms/PlainSaslClientTests.cs
deleted file mode 100644
index 4c82f7b126..0000000000
--- a/qpid/dotnet/Qpid.Sasl.Tests/Mechanisms/PlainSaslClientTests.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-/*

- *

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- *

- */

-

-using System;

-using System.Collections;

-using System.Text;

-

-using NUnit.Framework;

-using Apache.Qpid.Sasl;

-using Apache.Qpid.Sasl.Mechanisms;

-

-namespace Apache.Qpid.Sasl.Tests.Mechanisms

-{

-   [TestFixture]

-   public class PlainSaslClientTests : ISaslCallbackHandler

-   {

-      private const string USERNAME = "testuser";

-      private const string PASSWORD = "thepasswd";

-      private const string AUTHID = "theauth";

-      

-      [Test]

-      public void ReturnsRightMechanismName()

-      {

-         ISaslClient client = new PlainSaslClient(AUTHID, new Hashtable(), this);

-

-         Assert.AreEqual("PLAIN", client.MechanismName);

-      }

-

-      [Test]

-      public void HasInitialResponseReturnsTrue()

-      {

-         ISaslClient client = new PlainSaslClient(AUTHID, new Hashtable(), this);

-

-         Assert.IsTrue(client.HasInitialResponse);

-      }

-

-      [Test]

-      public void CanEvaluateChallenge()

-      {

-         Hashtable props = new Hashtable();

-         ISaslClient client = new PlainSaslClient(AUTHID, props, this);

-

-         Assert.IsFalse(client.IsComplete);

-         byte[] response = client.EvaluateChallenge(new byte[0]);

-         string[] parts = Encoding.UTF8.GetString(response).Split('\0');

-         

-         Assert.AreEqual(3, parts.Length);

-         Assert.AreEqual(AUTHID, parts[0]);

-         Assert.AreEqual(USERNAME, parts[1]);

-         Assert.AreEqual(PASSWORD, parts[2]);

-         Assert.IsTrue(client.IsComplete);

-      }

-

-      void ISaslCallbackHandler.Handle(ISaslCallback[] callbacks)

-      {

-         foreach ( ISaslCallback cb in callbacks )

-         {

-            if ( cb is NameCallback )

-            {

-               ((NameCallback)cb).Text = USERNAME;

-            } else if ( cb is PasswordCallback )

-            {

-               ((PasswordCallback)cb).Text = PASSWORD;

-            }

-         }

-      }

-

-   } // class PlainSaslClientTests

-

-} // namespace Apache.Qpid.Sasl.Tests.Mechanisms

diff --git a/qpid/dotnet/Qpid.Sasl.Tests/Properties/AssemblyInfo.cs b/qpid/dotnet/Qpid.Sasl.Tests/Properties/AssemblyInfo.cs
deleted file mode 100644
index 657b15e3ea..0000000000
--- a/qpid/dotnet/Qpid.Sasl.Tests/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System.Reflection;

-using System.Runtime.CompilerServices;

-using System.Runtime.InteropServices;

-

-// General Information about an assembly is controlled through the following 

-// set of attributes. Change these attribute values to modify the information

-// associated with an assembly.

-[assembly: AssemblyTitle("Apache.Qpid.Sasl.Tests")]

-[assembly: AssemblyDescription("")]

-[assembly: AssemblyConfiguration("")]

-[assembly: AssemblyCompany("")]

-[assembly: AssemblyProduct("Apache.Qpid.Sasl.Tests")]

-[assembly: AssemblyCopyright("Copyright ©  2007")]

-[assembly: AssemblyTrademark("")]

-[assembly: AssemblyCulture("")]

-

-// Setting ComVisible to false makes the types in this assembly not visible 

-// to COM components.  If you need to access a type in this assembly from 

-// COM, set the ComVisible attribute to true on that type.

-[assembly: ComVisible(false)]

-

-// The following GUID is for the ID of the typelib if this project is exposed to COM

-[assembly: Guid("84cc3267-8019-4fad-a426-0a40155b3352")]

-

-// Version information for an assembly consists of the following four values:

-//

-//      Major Version

-//      Minor Version 

-//      Build Number

-//      Revision

-//

-// You can specify all the values or you can default the Revision and Build Numbers 

-// by using the '*' as shown below:

-[assembly: AssemblyVersion("1.0.0.0")]

-[assembly: AssemblyFileVersion("1.0.0.0")]

diff --git a/qpid/dotnet/Qpid.Sasl.Tests/Qpid.Sasl.Tests.csproj b/qpid/dotnet/Qpid.Sasl.Tests/Qpid.Sasl.Tests.csproj
deleted file mode 100644
index 8c807e2385..0000000000
--- a/qpid/dotnet/Qpid.Sasl.Tests/Qpid.Sasl.Tests.csproj
+++ /dev/null
@@ -1,67 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <PropertyGroup>

-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ProductVersion>8.0.50727</ProductVersion>

-    <SchemaVersion>2.0</SchemaVersion>

-    <ProjectGuid>{587B3520-EBB9-41ED-B019-E96116B651CE}</ProjectGuid>

-    <OutputType>Library</OutputType>

-    <AppDesignerFolder>Properties</AppDesignerFolder>

-    <RootNamespace>Apache.Qpid.Sasl.Tests</RootNamespace>

-    <AssemblyName>Apache.Qpid.Sasl.Tests</AssemblyName>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

-    <DebugSymbols>true</DebugSymbols>

-    <DebugType>full</DebugType>

-    <Optimize>false</Optimize>

-    <OutputPath>..\bin\net-2.0\debug\</OutputPath>

-    <DefineConstants>DEBUG;TRACE</DefineConstants>

-    <ErrorReport>prompt</ErrorReport>

-    <WarningLevel>4</WarningLevel>

-    <UseVSHostingProcess>true</UseVSHostingProcess>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

-    <DebugType>pdbonly</DebugType>

-    <Optimize>true</Optimize>

-    <OutputPath>..\bin\net-2.0\release\</OutputPath>

-    <DefineConstants>TRACE</DefineConstants>

-    <ErrorReport>prompt</ErrorReport>

-    <WarningLevel>4</WarningLevel>

-  </PropertyGroup>

-  <ItemGroup>

-    <Reference Include="nunit.framework, Version=2.2.8.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77">

-      <SpecificVersion>False</SpecificVersion>

-      <HintPath>..\Qpid.Client.Tests\lib\nunit\nunit.framework.dll</HintPath>

-    </Reference>

-    <Reference Include="System" />

-    <Reference Include="System.Data" />

-    <Reference Include="System.Xml" />

-  </ItemGroup>

-  <ItemGroup>

-    <Compile Include="Mechanisms\ExternalSaslClientTests.cs" />

-    <Compile Include="TestClientFactory.cs" />

-    <Compile Include="Mechanisms\AnonymousSaslClientTests.cs" />

-    <Compile Include="Mechanisms\DigestSaslClientTests.cs" />

-    <Compile Include="Mechanisms\CramMD5SaslClientTests.cs" />

-    <Compile Include="Mechanisms\PlainSaslClientTests.cs" />

-    <Compile Include="SaslTests.cs" />

-    <Compile Include="Properties\AssemblyInfo.cs" />

-  </ItemGroup>

-  <ItemGroup>

-    <ProjectReference Include="..\Qpid.Sasl\Qpid.Sasl.csproj">

-      <Project>{1465B0EE-6452-42A6-AB73-B2F9EABEEE75}</Project>

-      <Name>Qpid.Sasl</Name>

-    </ProjectReference>

-  </ItemGroup>

-  <ItemGroup>

-    <None Include="App.config" />

-  </ItemGroup>

-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

-       Other similar extension points exist, see Microsoft.Common.targets.

-  <Target Name="BeforeBuild">

-  </Target>

-  <Target Name="AfterBuild">

-  </Target>

-  -->

-</Project>

diff --git a/qpid/dotnet/Qpid.Sasl.Tests/SaslTests.cs b/qpid/dotnet/Qpid.Sasl.Tests/SaslTests.cs
deleted file mode 100644
index 5b27949b98..0000000000
--- a/qpid/dotnet/Qpid.Sasl.Tests/SaslTests.cs
+++ /dev/null
@@ -1,133 +0,0 @@
-/*

- *

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- *

- */

-

-using System;

-using System.Collections;

-using System.Text;

-

-using NUnit.Framework;

-using Apache.Qpid.Sasl;

-using Apache.Qpid.Sasl.Mechanisms;

-

-namespace Apache.Qpid.Sasl.Tests

-{

-   [TestFixture]

-   public class SaslTests : ISaslCallbackHandler

-   {

-

-      [Test]

-      public void CanCreatePlain()

-      {

-         Hashtable props = new Hashtable();

-         string[] mechanisms = new string[] { "PLAIN", "OTHER" };

-         ISaslClient client = Sasl.CreateClient(mechanisms, "", "", "", props, this);

-         

-         Assert.IsNotNull(client);

-         Assert.IsInstanceOfType(typeof(PlainSaslClient), client);

-      }

-

-      [Test]

-      public void CanCreateCramMD5()

-      {

-         Hashtable props = new Hashtable();

-         string[] mechanisms = new string[] { "CRAM-MD5", "OTHER" };

-         ISaslClient client = Sasl.CreateClient(mechanisms, "", "", "", props, this);

-

-         Assert.IsNotNull(client);

-         Assert.IsInstanceOfType(typeof(CramMD5SaslClient), client);

-      }

-

-      [Test]

-      public void CanCreateAnonymous()

-      {

-         Hashtable props = new Hashtable();

-         string[] mechanisms = new string[] { "ANONYMOUS", "OTHER" };

-         ISaslClient client = Sasl.CreateClient(mechanisms, "", "", "", props, this);

-

-         Assert.IsNotNull(client);

-         Assert.IsInstanceOfType(typeof(AnonymousSaslClient), client);

-      }

-

-      [Test]

-      public void CanCreateDigest()

-      {

-         Hashtable props = new Hashtable();

-         string[] mechanisms = new string[] { "DIGEST-MD5", "OTHER" };

-         ISaslClient client = Sasl.CreateClient(mechanisms, "", "", "", props, this);

-

-         Assert.IsNotNull(client);

-         Assert.IsInstanceOfType(typeof(DigestSaslClient), client);

-      }

-

-      [Test]

-      public void CanCreateExternal()

-      {

-         Hashtable props = new Hashtable();

-         string[] mechanisms = new string[] { "EXTERNAL", "OTHER" };

-         ISaslClient client = Sasl.CreateClient(mechanisms, "", "", "", props, this);

-

-         Assert.IsNotNull(client);

-         Assert.IsInstanceOfType(typeof(ExternalSaslClient), client);

-      }

-

-      [Test]

-      public void ReturnsNullIfNoFactoryFound()

-      {

-         Hashtable props = new Hashtable();

-         props.Add(SaslProperties.PolicyNoPlainText, true);

-         string[] mechanisms = new string[] { "PLAIN", "OTHER" };

-         ISaslClient client = Sasl.CreateClient(mechanisms, "", "", "", props, this);

-

-         Assert.IsNull(client);

-      }

-

-      [Test]

-      public void ParsesConfigurationSection()

-      {

-         // if the TEST mechanism is available, then we know

-         // the configuration section worked!

-         Hashtable props = new Hashtable();

-         string[] mechanisms = new string[] { "TEST" };

-         ISaslClient client = Sasl.CreateClient(mechanisms, "", "", "", props, this);

-

-         Assert.IsNotNull(client);

-         Assert.IsInstanceOfType(typeof(TestSaslClient), client);

-      }

-

-      [Test]

-      public void ChoosesStrongerMechanism()

-      {

-         Hashtable props = new Hashtable();

-         string[] mechanisms = new string[] { "PLAIN", "OTHER", "CRAM-MD5" };

-         ISaslClient client = Sasl.CreateClient(mechanisms, "", "", "", props, this);

-

-         Assert.IsNotNull(client);

-         Assert.IsInstanceOfType(typeof(CramMD5SaslClient), client);

-      }

-

-

-      void ISaslCallbackHandler.Handle(ISaslCallback[] callbacks)

-      {

-      }

-

-   } // class SaslTests

-

-} // namespace Apache.Qpid.Sasl.Tests

diff --git a/qpid/dotnet/Qpid.Sasl.Tests/TestClientFactory.cs b/qpid/dotnet/Qpid.Sasl.Tests/TestClientFactory.cs
deleted file mode 100644
index 73c68ea2b3..0000000000
--- a/qpid/dotnet/Qpid.Sasl.Tests/TestClientFactory.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-/*

- *

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- *

- */

-

-using System;

-using System.Collections;

-using System.Text;

-

-using NUnit.Framework;

-using Apache.Qpid.Sasl;

-using Apache.Qpid.Sasl.Mechanisms;

-

-namespace Apache.Qpid.Sasl.Tests

-{

-   public class TestClientFactory : ISaslClientFactory

-   {

-      public string[] GetSupportedMechanisms(IDictionary props)

-      {

-         return new string[] { TestSaslClient.Mechanism };

-      }

-

-      public ISaslClient CreateClient(string[] mechanisms, string authorizationId, string protocol, string serverName, IDictionary props, ISaslCallbackHandler handler)

-      {

-         foreach ( string mech in mechanisms )

-         {

-            if ( mech == TestSaslClient.Mechanism )

-               return new TestSaslClient(props, handler);

-         }

-         return null;

-      }

-

-   } // class TestClientFactory

-

-   internal class TestSaslClient : SaslClient

-   {

-      public const string Mechanism = "TEST";

-

-      public override string MechanismName

-      {

-         get { return Mechanism; }

-      }

-      public override bool HasInitialResponse

-      {

-         get { return false; }

-      }

-

-      public TestSaslClient(IDictionary props, ISaslCallbackHandler handler)

-         : base("", "", "", props, handler)

-      {

-      }

-

-      public override byte[] EvaluateChallenge(byte[] challenge)

-      {

-         throw new NotImplementedException();

-      }

-   } // class TestSaslClient

-

-} // namespace Apache.Qpid.Sasl.Tests

diff --git a/qpid/dotnet/Qpid.Sasl.Tests/default.build b/qpid/dotnet/Qpid.Sasl.Tests/default.build
deleted file mode 100644
index eb0514d417..0000000000
--- a/qpid/dotnet/Qpid.Sasl.Tests/default.build
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0"?>

-<project name="Apache.Qpid.Sasl" default="test">

-

-   <target name="build">

-        <csc target="library" 

-			define="${build.defines}" 

-			warnaserror="true" debug="${build.debug}" 

-         output="${build.dir}/${project::get-name()}.Tests.dll">

-			

-            <sources>

-                <include name="**/*.cs" />

-            </sources>

-            <references>

-               <include name="${build.dir}/nunit.framework.dll" />

-               <include name="${build.dir}/${project::get-name()}.dll" />

-            </references>

-            

-         </csc>

-         <copy 

-            tofile="${build.dir}/${project::get-name()}.Tests.dll.config" 

-            file="App.config"

-         />

-    </target>

-    <target name="test" depends="build">

-         <nunit2>

-            <formatter type="${nant.formatter}" usefile="false" />

-            <test assemblyname="${build.dir}/${project::get-name()}.Tests.dll" />

-         </nunit2>

-    </target>

-</project>

-

diff --git a/qpid/dotnet/Qpid.Sasl/Callbacks.cs b/qpid/dotnet/Qpid.Sasl/Callbacks.cs
deleted file mode 100644
index 90e36beeb8..0000000000
--- a/qpid/dotnet/Qpid.Sasl/Callbacks.cs
+++ /dev/null
@@ -1,106 +0,0 @@
-/*

- *

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- *

- */

-

-using System;

-using System.Text;

-

-namespace Apache.Qpid.Sasl

-{

-   /// <summary>

-   /// Marker interface for Sasl Callbacks

-   /// </summary>

-   public interface ISaslCallback

-   {

-   } // interface ISaslCallback

-

-   public abstract class TextSaslCallback : ISaslCallback

-   {

-      private string _prompt;

-      private string _text;

-      private string _defaultText;

-

-      public string Prompt

-      {

-         get { return _prompt; }

-         set { _prompt = value; }

-      }

-

-      public string Text

-      {

-         get {

-            if ( _text == null || _text.Length == 0 )

-               return DefaultText;

-            else

-               return _text;

-         }

-         set { _text = value; }

-      }

-

-      public string DefaultText

-      {

-         get { return _defaultText; }

-         set { _defaultText = value; }

-      }

-

-      protected TextSaslCallback(string prompt, string text, string defaultText)

-      {

-         _prompt = prompt;

-         _text = text;

-         _defaultText = defaultText;

-      }

-

-   } // class TextSaslCallback

-

-   public class NameCallback : TextSaslCallback

-   {

-      public NameCallback()

-         : this(Environment.UserName)

-      {

-      }

-      public NameCallback(string defaultText)

-         : base("username:", "", defaultText)

-      {

-      }

-   } // class NameCallback

-

-   public class PasswordCallback : TextSaslCallback

-   {

-      public PasswordCallback()

-         : base("password:", "", "")

-      {

-      }

-   } // class PasswordCallback

-

-   public class RealmCallback : TextSaslCallback

-   {

-      public RealmCallback()

-         : this("localhost")

-      {

-      }

-      public RealmCallback(string defaultText)

-         : base("realm:", "", defaultText)

-      {

-      }

-   } // class RealmCallback

-

-} // namespace Apache.Qpid.Sasl

-

-

diff --git a/qpid/dotnet/Qpid.Sasl/Configuration/SaslConfiguration.cs b/qpid/dotnet/Qpid.Sasl/Configuration/SaslConfiguration.cs
deleted file mode 100644
index 3446261724..0000000000
--- a/qpid/dotnet/Qpid.Sasl/Configuration/SaslConfiguration.cs
+++ /dev/null
@@ -1,90 +0,0 @@
-/*

- *

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- *

- */

-

-using System;

-using System.Collections;

-using System.Configuration;

-using System.Text;

-using System.Xml;

-

-namespace Apache.Qpid.Sasl.Configuration

-{

-   /// <summary>

-   /// Represents an Sasl configuration section

-   /// in the config file

-   /// </summary>

-   internal class SaslConfiguration

-   {

-      private IList _clientFactories;

-

-      /// <summary>

-      /// Set of configured client factores

-      /// </summary>

-      public IList ClientFactories

-      {

-         get { return _clientFactories; }

-      }

-

-      internal SaslConfiguration(IList clientFactoryTypes)

-      {

-         _clientFactories = new ArrayList();

-         foreach ( Type type in clientFactoryTypes )

-         {

-            _clientFactories.Add(Activator.CreateInstance(type));

-         }

-      }

-

-      /// <summary>

-      /// Get the configuration for the library

-      /// </summary>

-      /// <returns>The configuration from app.config or a default configuration</returns>

-      internal static SaslConfiguration GetConfiguration()

-      {

-         // 'obsolete' warning, but needed for .NET 1.1 compatibility

-         SaslConfiguration config = (SaslConfiguration)

-            ConfigurationSettings.GetConfig("qpid.sasl");

-         if ( config == null )

-         {

-            // create default configuration

-            IList clientFactories = GetDefaultClientFactories();

-            config = new SaslConfiguration(clientFactories);

-         }

-         return config;

-      }

-

-      /// <summary>

-      /// Create a list filled with the default client

-      /// factories supported by the library

-      /// </summary>

-      /// <returns>The list of client factory types</returns>

-      internal static IList GetDefaultClientFactories()

-      {

-         IList clientFactories = new ArrayList();

-         clientFactories.Add(typeof(DefaultClientFactory));

-         return clientFactories;

-      }

-

-

-   } // class SaslConfiguration

-

-} // namespace Apache.Qpid.Sasl.Configuration

-

-

diff --git a/qpid/dotnet/Qpid.Sasl/Configuration/SaslConfigurationSectionHandler.cs b/qpid/dotnet/Qpid.Sasl/Configuration/SaslConfigurationSectionHandler.cs
deleted file mode 100644
index 21f6b92414..0000000000
--- a/qpid/dotnet/Qpid.Sasl/Configuration/SaslConfigurationSectionHandler.cs
+++ /dev/null
@@ -1,84 +0,0 @@
-/*

- *

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- *

- */

-

-using System;

-using System.Collections;

-using System.Configuration;

-using System.Text;

-using System.Xml;

-

-namespace Apache.Qpid.Sasl.Configuration

-{

-   /// <summary>

-   /// Defines the configuration section to configure extra 

-   /// Sasl client factories

-   /// </summary>

-   public class SaslConfigurationSectionHandler 

-      : IConfigurationSectionHandler

-   {

-      public object Create(object parent, object configContext, XmlNode section)

-      {

-         IList clientFactories = SaslConfiguration.GetDefaultClientFactories();

-

-         foreach ( XmlNode node in section.ChildNodes )

-         {

-            if ( node.LocalName == "clientFactories" )

-            {

-               ProcessFactories(node, clientFactories);

-            }

-         }

-

-         SaslConfiguration config = new SaslConfiguration(clientFactories);

-         return config;

-      }

-

-      

-      private void ProcessFactories(XmlNode node, IList factories)

-      {

-         foreach ( XmlNode child in node.ChildNodes )

-         {

-            Type type;

-            switch ( child.LocalName )

-            {

-            case "add":

-               type = Type.GetType(child.Attributes["type"].Value);

-               if ( !factories.Contains(type) )

-                  factories.Add(type);

-               break;

-            case "remove":

-               type = Type.GetType(child.Attributes["type"].Value);

-               if ( factories.Contains(type) )

-                  factories.Remove(type);

-               break;

-            case "clear":

-               factories.Clear();

-               break;

-            default:

-               // gives obsolete warning but needed for .NET 1.1 support

-               throw new ConfigurationException(string.Format("Unknown element '{0}' in section '{0}'", child.LocalName, node.LocalName));

-            }

-         }

-      }

-   } // class SaslConfigurationSectionHandler

-

-} // namespace Apache.Qpid.Sasl.Configuration

-

-

diff --git a/qpid/dotnet/Qpid.Sasl/DefaultClientFactory.cs b/qpid/dotnet/Qpid.Sasl/DefaultClientFactory.cs
deleted file mode 100644
index d552aa80c0..0000000000
--- a/qpid/dotnet/Qpid.Sasl/DefaultClientFactory.cs
+++ /dev/null
@@ -1,95 +0,0 @@
-/*

- *

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- *

- */

-

-using System;

-using System.Collections;

-

-using Apache.Qpid.Sasl.Mechanisms;

-

-namespace Apache.Qpid.Sasl

-{

-   public class DefaultClientFactory : ISaslClientFactory

-   {

-      private static readonly string[] SUPPORTED = new string[] {

-               DigestSaslClient.Mechanism,

-               CramMD5SaslClient.Mechanism,

-               PlainSaslClient.Mechanism, 

-               AnonymousSaslClient.Mechanism,

-               ExternalSaslClient.Mechanism,

-            };

-

-      public string[] GetSupportedMechanisms(IDictionary props)

-      {

-         if ( props == null )

-            throw new ArgumentNullException("props");

-

-         ArrayList vetoed = new ArrayList();

-

-         if ( props.Contains(SaslProperties.PolicyNoPlainText) ||

-             props.Contains(SaslProperties.PolicyNoDictionary) ||

-             props.Contains(SaslProperties.PolicyNoActive) ||

-             props.Contains(SaslProperties.PolicyForwardSecrecy) ||

-             props.Contains(SaslProperties.PolicyPassCredentials) )

-         {

-            vetoed.Add(CramMD5SaslClient.Mechanism);

-            vetoed.Add(PlainSaslClient.Mechanism);

-            vetoed.Add(AnonymousSaslClient.Mechanism);

-            vetoed.Add(ExternalSaslClient.Mechanism);

-         } 

-         if ( props.Contains(SaslProperties.PolicyNoAnonymous) )

-         {

-            vetoed.Add(AnonymousSaslClient.Mechanism);

-         }

-

-         ArrayList available = new ArrayList();

-         foreach ( string mech in SUPPORTED )

-         {

-            if ( !vetoed.Contains(mech) )

-               available.Add(mech);

-         }

-         return (string[])available.ToArray(typeof(string));

-      }

-

-      public ISaslClient CreateClient(

-         string[] mechanisms, string authorizationId,

-         string protocol, string serverName, 

-         IDictionary props, ISaslCallbackHandler handler

-         )

-      {

-         IList mechs = mechanisms;

-         if ( mechs.Contains(ExternalSaslClient.Mechanism) )

-            return new ExternalSaslClient(authorizationId, props, handler);

-         if ( mechs.Contains(DigestSaslClient.Mechanism) )

-            return new DigestSaslClient(authorizationId, serverName, protocol, props, handler);

-         if ( mechs.Contains(CramMD5SaslClient.Mechanism) )

-            return new CramMD5SaslClient(authorizationId, props, handler);

-         if ( mechs.Contains(PlainSaslClient.Mechanism) )

-            return new PlainSaslClient(authorizationId, props, handler);

-         if ( mechs.Contains(AnonymousSaslClient.Mechanism) )

-            return new AnonymousSaslClient(authorizationId, props, handler);

-         // unknown mechanism

-         return null;

-      }

-   } // class DefaultClientFactory

-

-} // namespace Apache.Qpid.Sasl

-

-

diff --git a/qpid/dotnet/Qpid.Sasl/ISaslCallbackHandler.cs b/qpid/dotnet/Qpid.Sasl/ISaslCallbackHandler.cs
deleted file mode 100644
index 0dfc482333..0000000000
--- a/qpid/dotnet/Qpid.Sasl/ISaslCallbackHandler.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-/*

- *

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- *

- */

-

-using System;

-using System.Text;

-

-namespace Apache.Qpid.Sasl

-{

-   public interface ISaslCallbackHandler

-   {

-      void Handle(ISaslCallback[] callbacks);

-

-   } // interface ISaslCallbackHandler

-

-} // namespace Apache.Qpid.Sasl

-

-

diff --git a/qpid/dotnet/Qpid.Sasl/ISaslClient.cs b/qpid/dotnet/Qpid.Sasl/ISaslClient.cs
deleted file mode 100644
index 526cc1f43a..0000000000
--- a/qpid/dotnet/Qpid.Sasl/ISaslClient.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-/*

- *

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- *

- */

-

-using System;

-using System.Text;

-

-namespace Apache.Qpid.Sasl

-{

-   public interface ISaslClient

-   {

-      string MechanismName { get; }

-      bool HasInitialResponse { get; }

-      bool IsComplete { get; }

-

-      byte[] EvaluateChallenge(byte[] challenge);

-      object GetNegotiatedProperty(string propName);

-      byte[] Unwrap(byte[] buffer, int offset, int length);

-      byte[] Wrap(byte[] buffer, int offset, int lenght);

-

-   } // interface ISaslClient

-

-} // namespace Apache.Qpid.Sasl

-

-

diff --git a/qpid/dotnet/Qpid.Sasl/ISaslClientFactory.cs b/qpid/dotnet/Qpid.Sasl/ISaslClientFactory.cs
deleted file mode 100644
index fc81057ec4..0000000000
--- a/qpid/dotnet/Qpid.Sasl/ISaslClientFactory.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-/*

- *

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- *

- */

-

-using System;

-using System.Collections;

-using System.Text;

-

-namespace Apache.Qpid.Sasl

-{

-   public interface ISaslClientFactory

-   {

-      string[] GetSupportedMechanisms(IDictionary props);

-      ISaslClient CreateClient(

-         string[] mechanisms, string authorizationId, 

-         string protocol, string serverName, 

-         IDictionary props, ISaslCallbackHandler handler

-         );

-   } // interface ISaslClientFactory

-

-} // namespace Apache.Qpid.Sasl

-

-

diff --git a/qpid/dotnet/Qpid.Sasl/MD5HMAC.cs b/qpid/dotnet/Qpid.Sasl/MD5HMAC.cs
deleted file mode 100644
index 134332284a..0000000000
--- a/qpid/dotnet/Qpid.Sasl/MD5HMAC.cs
+++ /dev/null
@@ -1,115 +0,0 @@
-/*

- *

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- *

- */

-

-using System;

-using System.Security.Cryptography;

-

-namespace Apache.Qpid.Sasl

-{

-   /// <summary>

-   /// Rough HMAC MD5 implementation as presented in

-   /// RFC 2104. Used because the HMACMD5 class in the 

-   /// .NET framework is not available in v1.1.

-   /// </summary>

-   public sealed class MD5HMAC : IDisposable

-   {

-      private const int BLOCK_LEN = 64;

-      private MD5 _hash;

-      private byte[] _key;

-      private byte[] _ipad;

-      private byte[] _opad;

-

-      public MD5HMAC(byte[] key)

-      {

-         if ( key == null || key.Length == 0 )

-            throw new ArgumentNullException("key");

-

-         _hash = new MD5CryptoServiceProvider();

-

-         byte[] theKey = key;

-         if ( theKey.Length > BLOCK_LEN )

-         {

-            theKey = _hash.ComputeHash(theKey);

-         }

-         // pad key with 0's up to BLOCK_LEN

-         _key = new byte[BLOCK_LEN];

-         Array.Copy(theKey, _key, theKey.Length);

-

-         CreatePads();

-      }

-

-      public byte[] ComputeHash(byte[] input)

-      {

-         // H(K XOR opad, H(K XOR ipad, text))

-         return H(_opad, H(_ipad, input));

-      }

-

-      public void Dispose()

-      {

-         if ( _hash != null )

-         {

-            ((IDisposable)_hash).Dispose();

-            _hash = null;

-         }

-      }

-

-      #region Private Methods

-      //

-      // Private Methods

-      //

-

-      private void CreatePads()

-      {

-         _ipad = new byte[BLOCK_LEN];

-         _opad = new byte[BLOCK_LEN];

-         for ( int i = 0; i < BLOCK_LEN; i++ )

-         {

-            _ipad[i] = 0x36;

-            _opad[i] = 0x5c;

-         }

-

-         XOR(_ipad, _key);

-         XOR(_opad, _key);

-      }

-

-      private static void XOR(byte[] dest, byte[] other)

-      {

-         // assume both are same size

-         for ( int i = 0; i < dest.Length; i++ )

-         {

-            dest[i] ^= other[i];

-         }

-      }

-

-      private byte[] H(byte[] v1, byte[] v2)

-      {

-         byte[] total = new byte[v1.Length + v2.Length];

-         Array.Copy(v1, total, v1.Length);

-         Array.Copy(v2, 0, total, v1.Length, v2.Length);

-

-         return _hash.ComputeHash(total);

-      }

-

-      #endregion // Private Methods

-

-   } // class MD5HMAC

-

-} // namespace Apache.Qpid.Sasl

diff --git a/qpid/dotnet/Qpid.Sasl/Mechanisms/AnonymousSaslClient.cs b/qpid/dotnet/Qpid.Sasl/Mechanisms/AnonymousSaslClient.cs
deleted file mode 100644
index 5e8c56ff51..0000000000
--- a/qpid/dotnet/Qpid.Sasl/Mechanisms/AnonymousSaslClient.cs
+++ /dev/null
@@ -1,69 +0,0 @@
-/*

- *

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- *

- */

-

-using System;

-using System.Collections;

-using System.Text;

-

-namespace Apache.Qpid.Sasl.Mechanisms

-{

-   /// <summary>

-   /// Implements the ANONYMOUS authentication mechanism

-   /// as outlined in RFC 2245

-   /// </summary>

-   public class AnonymousSaslClient : SaslClient

-   {

-      public const string Mechanism = "ANONYMOUS";

-

-      public AnonymousSaslClient(

-         string authid, IDictionary properties, 

-         ISaslCallbackHandler handler)

-         : base(authid, null, null, properties, handler)

-      {

-      }

-

-      #region ISaslClient Implementation

-      //

-      // ISaslClient Implementation

-      //

-

-      public override string MechanismName

-      {

-         get { return Mechanism; }

-      }

-

-      public override bool HasInitialResponse

-      {

-         get { return true; }

-      }

-

-      public override byte[] EvaluateChallenge(byte[] challenge)

-      {

-         // ignore challenge

-         SetComplete();

-         return Encoding.UTF8.GetBytes(AuthorizationId);

-      }

-

-      #endregion // ISaslClient Implementation

-

-   } // class AnonymousSaslClient

-

-} // namespace Apache.Qpid.Sasl.Mechanisms

diff --git a/qpid/dotnet/Qpid.Sasl/Mechanisms/CramMD5SaslClient.cs b/qpid/dotnet/Qpid.Sasl/Mechanisms/CramMD5SaslClient.cs
deleted file mode 100644
index 672cc64c6a..0000000000
--- a/qpid/dotnet/Qpid.Sasl/Mechanisms/CramMD5SaslClient.cs
+++ /dev/null
@@ -1,91 +0,0 @@
-/*

- *

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- *

- */

-

-using System;

-using System.Collections;

-using System.Security.Cryptography;

-using System.Text;

-

-namespace Apache.Qpid.Sasl.Mechanisms

-{

-   /// <summary>

-   /// Implements the CRAM-MD5 authentication mechanism as outlined

-   /// in RFC 2195

-   /// </summary>

-   public class CramMD5SaslClient : SaslClient

-   {

-      public const string Mechanism = "CRAM-MD5";

-      private const int MinPwdLen = 16;

-

-      public CramMD5SaslClient(

-         string authorizationId, 

-         IDictionary properties, 

-         ISaslCallbackHandler handler)

-         : base(authorizationId, null, null, properties, handler)

-      {

-      }

-

-      #region ISaslClient Implementation

-      //

-      // ISaslClient Implementation

-      //

-

-      public override string MechanismName

-      {

-         get { return Mechanism; }

-      }

-

-      public override bool HasInitialResponse

-      {

-         get { return false; }

-      }

-

-      public override byte[] EvaluateChallenge(byte[] challenge)

-      {

-         if ( challenge == null || challenge.Length == 0 )

-            throw new ArgumentNullException("challenge");

-

-         NameCallback nameCB = new NameCallback(AuthorizationId);

-         PasswordCallback pwdCB = new PasswordCallback();

-         ISaslCallback[] callbacks = { nameCB, pwdCB };

-         Handler.Handle(callbacks);

-

-         string username = nameCB.Text;

-         string passwd = pwdCB.Text.PadRight(MinPwdLen, '\0');

-

-         byte[] secret = Encoding.UTF8.GetBytes(passwd);

-

-         //using ( HMAC hmac = new HMACMD5(secret) )

-         using ( MD5HMAC hmac = new MD5HMAC(secret) )

-         {

-            byte[] value = hmac.ComputeHash(challenge);

-            string encoded = ToHex(value);

-            SetComplete();

-            return Encoding.UTF8.GetBytes(username + " " + encoded);

-         }

-

-      }

-

-      #endregion // ISaslClient Implementation

-

-   } // class CramMD5SaslClient

-

-} // namespace Apache.Qpid.Sasl.Mechanisms

diff --git a/qpid/dotnet/Qpid.Sasl/Mechanisms/DigestSaslClient.cs b/qpid/dotnet/Qpid.Sasl/Mechanisms/DigestSaslClient.cs
deleted file mode 100644
index 59d3a88991..0000000000
--- a/qpid/dotnet/Qpid.Sasl/Mechanisms/DigestSaslClient.cs
+++ /dev/null
@@ -1,576 +0,0 @@
-/*

- *

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- *

- */

-

-using System;

-using System.Collections;

-using System.Collections.Specialized;

-using System.Globalization;

-using System.Security.Cryptography;

-using System.Text;

-

-namespace Apache.Qpid.Sasl.Mechanisms

-{

-

-   /// <summary>

-   /// Implements the DIGEST MD5 authentication mechanism

-   /// as outlined in RFC 2831

-   /// </summary>

-   public class DigestSaslClient : SaslClient

-   {

-      public const string Mechanism = "DIGEST-MD5";

-      private static readonly MD5 _md5 = new MD5CryptoServiceProvider();

-      private int _state;

-      private string _cnonce;

-      private Encoding _encoding = Encoding.UTF8;

-

-      public string Cnonce

-      {

-         get { return _cnonce; }

-         set { _cnonce = value; }

-      }

-

-      public DigestSaslClient(

-         string authid, string serverName, string protocol, 

-         IDictionary properties, ISaslCallbackHandler handler)

-         : base(authid, serverName, protocol, properties, handler)

-      {

-         _cnonce = Guid.NewGuid().ToString("N");

-      }

-

-      #region ISaslClient Implementation

-      //

-      // ISaslClient Implementation

-      //

-

-      public override string MechanismName

-      {

-         get { return Mechanism; }

-      }

-

-      public override bool HasInitialResponse

-      {

-         get { return false; }

-      }

-

-      public override byte[] EvaluateChallenge(byte[] challenge)

-      {

-         if ( challenge == null || challenge.Length <= 0 )

-            throw new ArgumentNullException("challenge");

-

-         switch ( _state++ )

-         {

-         case 0: return OnInitialChallenge(challenge);

-         case 1: return OnFinalResponse(challenge);

-         }

-         throw new SaslException("Invalid State for authentication");

-      }

-

-      #endregion // ISaslClient Implementation

-

-      

-      #region Private Methods

-      //

-      // Private Methods

-      //

-

-      /// <summary>

-      /// Process the first challenge from the server

-      /// and calculate a response

-      /// </summary>

-      /// <param name="challenge">The server issued challenge</param>

-      /// <returns>Client response</returns>

-      private byte[] OnInitialChallenge(byte[] challenge)

-      {

-         DigestChallenge dch = 

-            DigestChallenge.Parse(_encoding.GetString(challenge));

-         // validate input challenge

-         if ( dch.Nonce == null || dch.Nonce.Length == 0 )

-            throw new SaslException("Nonce value missing in server challenge");

-         if ( dch.Algorithm != "md5-sess" )

-            throw new SaslException("Invalid or missing algorithm value in server challenge");

-

-

-         NameCallback nameCB = new NameCallback(AuthorizationId);

-         PasswordCallback pwdCB = new PasswordCallback();

-         RealmCallback realmCB = new RealmCallback(dch.Realm);

-         ISaslCallback[] callbacks = { nameCB, pwdCB, realmCB };

-         Handler.Handle(callbacks);

-

-         DigestResponse response = new DigestResponse();

-         response.Username = nameCB.Text;

-         response.Realm = realmCB.Text;

-         response.Nonce = dch.Nonce;

-         response.Cnonce = Cnonce;

-         response.NonceCount = 1;

-         response.Qop = DigestQop.Auth; // only auth supported for now

-         response.DigestUri = Protocol.ToLower() + "/" + ServerName;

-         response.MaxBuffer = dch.MaxBuffer;

-         response.Charset = dch.Charset;

-         response.Cipher = null; // not supported for now

-         response.Authzid = AuthorizationId;

-         response.AuthParam = dch.AuthParam;

-

-         response.Response = CalculateResponse(

-            nameCB.Text, realmCB.Text, pwdCB.Text, 

-            dch.Nonce, response.NonceCount, response.Qop, response.DigestUri

-            );

-

-         return _encoding.GetBytes(response.ToString());

-      }

-

-      /// <summary>

-      /// Process the second server challenge

-      /// </summary>

-      /// <param name="challenge">Server issued challenge</param>

-      /// <returns>The client response</returns>

-      private byte[] OnFinalResponse(byte[] challenge)

-      {

-         DigestChallenge dch = 

-            DigestChallenge.Parse(_encoding.GetString(challenge));

-

-         if ( dch.Rspauth == null || dch.Rspauth.Length == 0 )

-            throw new SaslException("Expected 'rspauth' in server challenge not found");

-

-         SetComplete();

-         return new byte[0];

-      }

-

-      

-      

-      /// <summary>

-      /// Calculate the response field of the client response

-      /// </summary>

-      /// <param name="username">The user name</param>

-      /// <param name="realm">The realm</param>

-      /// <param name="passwd">The user's password</param>

-      /// <param name="nonce">Server nonce value</param>

-      /// <param name="nc">Client nonce count (always 1)</param>

-      /// <param name="qop">Quality of Protection</param>

-      /// <param name="digestUri">Digest-URI</param>

-      /// <returns>The value for the response field</returns>

-      private string CalculateResponse(

-         string username, string realm, string passwd, 

-         string nonce, int nc, string qop, string digestUri

-         )

-      {

-         string a1 = CalcHexA1(username, realm, passwd, nonce);

-         string a2 = CalcHexA2(digestUri, qop);

-

-         string ncs = nc.ToString("x8", CultureInfo.InvariantCulture);

-         StringBuilder prekd = new StringBuilder();

-         prekd.Append(a1).Append(':').Append(nonce).Append(':')

-            .Append(ncs).Append(':').Append(Cnonce)

-            .Append(':').Append(qop).Append(':').Append(a2);

-

-         return ToHex(CalcH(_encoding.GetBytes(prekd.ToString())));

-      }

-

-      private string CalcHexA1(

-         string username, string realm, 

-         string passwd, string nonce

-         )

-      {

-         bool hasAuthId = AuthorizationId != null && AuthorizationId.Length > 0;

-

-         string premd = username + ":" + realm + ":" + passwd;

-         byte[] temp1 = CalcH(_encoding.GetBytes(premd));

-         

-

-         int a1len = 16 + 1 + nonce.Length + 1 + Cnonce.Length;

-         if ( hasAuthId )

-            a1len += 1 + AuthorizationId.Length;

-

-         byte[] buffer = new byte[a1len];

-         Array.Copy(temp1, buffer, temp1.Length);

-

-         string p2 = ":" + nonce + ":" + Cnonce;

-         if ( hasAuthId )

-            p2 += ":" + AuthorizationId;

-

-         byte[] temp2 = _encoding.GetBytes(p2);

-         Array.Copy(temp2, 0, buffer, 16, temp2.Length);

-

-         return ToHex(CalcH(buffer));

-      }

-

-      private string CalcHexA2(string digestUri, string qop)

-      {

-         string a2 = "AUTHENTICATE:" + digestUri;

-         if ( qop != DigestQop.Auth )

-            a2 += ":00000000000000000000000000000000";

-         return ToHex(CalcH(_encoding.GetBytes(a2)));

-      }

-

-      private static byte[] CalcH(byte[] value)

-      {

-         return _md5.ComputeHash(value);

-      }

-

-      #endregion // Private Methods

-

-

-   } // class DigestSaslClient

-

-

-   /// <summary>

-   /// Available QOP options in the DIGEST scheme

-   /// </summary>

-   public sealed class DigestQop

-   {

-      public const string Auth = "auth";

-      public const string AuthInt = "auth-int";

-      public const string AuthConf = "auth-conf";

-   } // class DigestQop

-

-

-   /// <summary>

-   /// Represents and parses a digest server challenge

-   /// </summary>

-   public class DigestChallenge

-   {

-      private string _realm = "localhost";

-      private string _nonce;

-      private string[] _qopOptions = { DigestQop.Auth };

-      private bool _stale;

-      private int _maxBuffer = 65536;

-      private string _charset = "ISO 8859-1";

-      private string _algorithm;

-      private string[] _cipherOptions;

-      private string _authParam;

-      private string _rspauth;

-

-      #region Properties

-      //

-      // Properties

-      //

-

-      public string Realm

-      {

-         get { return _realm; }

-      }

-

-      public string Nonce

-      {

-         get { return _nonce; }

-      }

-

-      public string[] QopOptions

-      {

-         get { return _qopOptions; }

-      }

-

-      public bool Stale

-      {

-         get { return _stale; }

-      }

-

-      public int MaxBuffer

-      {

-         get { return _maxBuffer; }

-         set { _maxBuffer = value; }

-      }

-

-      public string Charset

-      {

-         get { return _charset; }

-      }

-

-      public string Algorithm

-      {

-         get { return _algorithm; }

-      }

-

-      public string[] CipherOptions

-      {

-         get { return _cipherOptions; }

-      }

-

-      public string AuthParam

-      {

-         get { return _authParam; }

-      }

-

-      public string Rspauth

-      {

-         get { return _rspauth; }

-      }

-

-      #endregion // Properties

-

-      public static DigestChallenge Parse(string challenge)

-      {

-         DigestChallenge parsed = new DigestChallenge();

-         StringDictionary parts = ParseParameters(challenge);

-         foreach ( string optname in parts.Keys )

-         {

-            switch ( optname )

-            {

-            case "realm":

-               parsed._realm = parts[optname];

-               break;

-            case "nonce":

-               parsed._nonce = parts[optname];

-               break;

-            case "qop-options":

-               parsed._qopOptions = GetOptions(parts[optname]);

-               break;

-            case "cipher-opts":

-               parsed._cipherOptions = GetOptions(parts[optname]);

-               break;

-            case "stale":

-               parsed._stale = Convert.ToBoolean(parts[optname], CultureInfo.InvariantCulture);

-               break;

-            case "maxbuf":

-               parsed._maxBuffer = Convert.ToInt32(parts[optname], CultureInfo.InvariantCulture);

-               break;

-            case "charset":

-               parsed._charset = parts[optname];

-               break;

-            case "algorithm":

-               parsed._algorithm = parts[optname];

-               break;

-            case "auth-param":

-               parsed._authParam = parts[optname];

-               break;

-            case "rspauth":

-               parsed._rspauth = parts[optname];

-               break;

-            }

-         }

-

-         return parsed;

-      }

-

-

-      public static StringDictionary ParseParameters(string source)

-      {

-         if ( source == null )

-            throw new ArgumentNullException("source");

-

-         StringDictionary ret = new StringDictionary();

-

-         string remaining = source.Trim();

-         while ( remaining.Length > 0 )

-         {

-            int equals = remaining.IndexOf('=');

-            if ( equals < 0 )

-               break;

-

-            string optname = remaining.Substring(0, equals).Trim();

-            remaining = remaining.Substring(equals + 1);

-

-            string value = ParseQuoted(ref remaining);

-            ret[optname] = value.Trim();

-         }

-         return ret;

-      }

-

-      private static string ParseQuoted(ref string str)

-      {

-         string ns = str.TrimStart();

-

-         int start = 0;

-         bool quoted = ns[0] == '\"';

-         if ( quoted ) start++;

-         bool inquotes = quoted;

-         bool escaped = false;

-

-         int pos = start;

-         for ( ; pos < ns.Length; pos++ )

-         {

-            if ( !inquotes && ns[pos] == ',' )

-               break;

-

-            // at end of quotes?

-            if ( quoted && !escaped && ns[pos] == '\"' ) 

-               inquotes = false;

-            // is this char an escape for the next one?

-            escaped = inquotes && ns[pos] == '\\';

-         }

-         // pos has end of string

-         string value = ns.Substring(start, pos-start).Trim();

-         if ( quoted )

-         {

-            // remove trailing quote

-            value = value.Substring(0, value.Length - 1);

-         }

-         str = ns.Substring(pos < ns.Length-1 ? pos+1 : pos);

-         return value;

-      }

-

-      private static string[] GetOptions(string value)

-      {

-         return value.Split(' ');

-      }

-

-   } // class DigestChallenge

-

-

-   /// <summary>

-   /// Represents and knows how to write a 

-   /// digest client response

-   /// </summary>

-   public class DigestResponse

-   {

-      private string _username;

-      private string _realm;

-      private string _nonce;

-      private string _cnonce;

-      private int _nonceCount;

-      private string _qop;

-      private string _digestUri;

-      private string _response;

-      private int _maxBuffer;

-      private string _charset;

-      private string _cipher;

-      private string _authzid;

-      private string _authParam;

-

-      #region Properties

-      //

-      // Properties

-      //

-

-      public string Username

-      {

-         get { return _username; }

-         set { _username = value; }

-      }

-

-      public string Realm

-      {

-         get { return _realm; }

-         set { _realm = value; }

-      }

-

-      public string Nonce

-      {

-         get { return _nonce; }

-         set { _nonce = value; }

-      }

-

-      public string Cnonce

-      {

-         get { return _cnonce; }

-         set { _cnonce = value; }

-      }

-

-      public int NonceCount

-      {

-         get { return _nonceCount; }

-         set { _nonceCount = value; }

-      }

-

-      public string Qop

-      {

-         get { return _qop; }

-         set { _qop = value; }

-      }

-

-      public string DigestUri

-      {

-         get { return _digestUri; }

-         set { _digestUri = value; }

-      }

-

-      public string Response

-      {

-         get { return _response; }

-         set { _response = value; }

-      }

-

-      public int MaxBuffer

-      {

-         get { return _maxBuffer; }

-         set { _maxBuffer = value; }

-      }

-

-      public string Charset

-      {

-         get { return _charset; }

-         set { _charset = value; }

-      }

-

-      public string Cipher

-      {

-         get { return _cipher; }

-         set { _cipher = value; }

-      }

-

-      public string Authzid

-      {

-         get { return _authzid; }

-         set { _authzid = value; }

-      }

-

-      public string AuthParam

-      {

-         get { return _authParam; }

-         set { _authParam = value; }

-      }

-

-      #endregion // Properties

-

-

-      public override string ToString()

-      {

-         StringBuilder buffer = new StringBuilder();

-         Pair(buffer, "username", Username, true);

-         Pair(buffer, "realm", Realm, true);

-         Pair(buffer, "nonce", Nonce, true);

-         Pair(buffer, "cnonce", Cnonce, true);

-         string nc = NonceCount.ToString("x8", CultureInfo.InvariantCulture);

-         Pair(buffer, "nc", nc, false);

-         Pair(buffer, "qop", Qop, false);

-         Pair(buffer, "digest-uri", DigestUri, true);

-         Pair(buffer, "response", Response, true);

-         string maxBuffer = MaxBuffer.ToString(CultureInfo.InvariantCulture);

-         Pair(buffer, "maxbuf", maxBuffer, false);

-         Pair(buffer, "charset", Charset, false);

-         Pair(buffer, "cipher", Cipher, false);

-         Pair(buffer, "authzid", Authzid, true);

-         Pair(buffer, "auth-param", AuthParam, true);

-

-         return buffer.ToString().TrimEnd(',');

-      }

-

-      private static void Pair(StringBuilder buffer, string name, string value, bool quoted)

-      {

-         if ( value != null && value.Length > 0 )

-         {

-            buffer.Append(name);

-            buffer.Append('=');

-            if ( quoted )

-            {

-               buffer.Append('\"');

-               buffer.Append(value.Replace("\"", "\\\""));

-               buffer.Append('\"');

-            } else

-            {

-               buffer.Append(value);

-            }

-            buffer.Append(',');

-         }

-      }

-

-   } // class DigestResponse

-

-} // namespace Apache.Qpid.Sasl.Mechanisms

diff --git a/qpid/dotnet/Qpid.Sasl/Mechanisms/ExternalSaslClient.cs b/qpid/dotnet/Qpid.Sasl/Mechanisms/ExternalSaslClient.cs
deleted file mode 100644
index 5b513bda87..0000000000
--- a/qpid/dotnet/Qpid.Sasl/Mechanisms/ExternalSaslClient.cs
+++ /dev/null
@@ -1,69 +0,0 @@
-/*

- *

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- *

- */

-

-using System;

-using System.Collections;

-using System.Text;

-

-namespace Apache.Qpid.Sasl.Mechanisms

-{

-   /// <summary>

-   /// Implements the EXTERNAL authentication mechanism

-   /// as outlined in RFC 2222

-   /// </summary>

-   public class ExternalSaslClient : SaslClient

-   {

-      public const string Mechanism = "EXTERNAL";

-

-      public ExternalSaslClient(

-         string authid, IDictionary properties, 

-         ISaslCallbackHandler handler)

-         : base(authid, null, null, properties, handler)

-      {

-      }

-

-      #region ISaslClient Implementation

-      //

-      // ISaslClient Implementation

-      //

-

-      public override string MechanismName

-      {

-         get { return Mechanism; }

-      }

-

-      public override bool HasInitialResponse

-      {

-         get { return true; }

-      }

-

-      public override byte[] EvaluateChallenge(byte[] challenge)

-      {

-         // ignore challenge

-         SetComplete();

-         return Encoding.UTF8.GetBytes(AuthorizationId);

-      }

-

-      #endregion // ISaslClient Implementation

-

-   } // class ExternalSaslClient

-

-} // namespace Apache.Qpid.Sasl.Mechanisms

diff --git a/qpid/dotnet/Qpid.Sasl/Mechanisms/PlainSaslClient.cs b/qpid/dotnet/Qpid.Sasl/Mechanisms/PlainSaslClient.cs
deleted file mode 100644
index 3addeb2e83..0000000000
--- a/qpid/dotnet/Qpid.Sasl/Mechanisms/PlainSaslClient.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-/*

- *

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- *

- */

-

-using System;

-using System.Collections;

-using System.Text;

-

-namespace Apache.Qpid.Sasl.Mechanisms

-{

-

-   /// <summary>

-   /// Implements the PLAIN authentication mechanism

-   /// as outlined in RFC 4616

-   /// </summary>

-   public class PlainSaslClient : SaslClient

-   {

-      public const string Mechanism = "PLAIN";

-

-      public PlainSaslClient(

-         string authid, IDictionary properties, 

-         ISaslCallbackHandler handler)

-         : base(authid, null, null, properties, handler)

-      {

-      }

-

-      #region ISaslClient Implementation

-      //

-      // ISaslClient Implementation

-      //

-

-      public override string MechanismName

-      {

-         get { return Mechanism; }

-      }

-

-      public override bool HasInitialResponse

-      {

-         get { return true; }

-      }

-

-      public override byte[] EvaluateChallenge(byte[] challenge)

-      {

-         // ignore challenge

-

-         NameCallback nameCB = new NameCallback();

-         PasswordCallback pwdCB = new PasswordCallback();

-         ISaslCallback[] callbacks = { nameCB, pwdCB };

-         Handler.Handle(callbacks);

-

-         string username = nameCB.Text;

-         string authid = AuthorizationId;

-         string passwd = pwdCB.Text;

-

-         string response = 

-            string.Format("{0}\0{1}\0{2}", authid, username, passwd);

-         SetComplete();

-         return Encoding.UTF8.GetBytes(response);

-      }

-

-      #endregion // ISaslClient Implementation

-

-   } // class PlainSaslClient

-} // namespace Apache.Qpid.Sasl.Mechanisms

diff --git a/qpid/dotnet/Qpid.Sasl/Properties/AssemblyInfo.cs b/qpid/dotnet/Qpid.Sasl/Properties/AssemblyInfo.cs
deleted file mode 100644
index f38725e53f..0000000000
--- a/qpid/dotnet/Qpid.Sasl/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using System;

-using System.Reflection;

-using System.Runtime.CompilerServices;

-using System.Runtime.InteropServices;

-

-// General Information about an assembly is controlled through the following 

-// set of attributes. Change these attribute values to modify the information

-// associated with an assembly.

-[assembly: AssemblyTitle("Apache.Qpid.Sasl")]

-[assembly: AssemblyDescription("")]

-[assembly: AssemblyConfiguration("")]

-[assembly: AssemblyCompany("Apache Qpid")]

-[assembly: AssemblyProduct("Apache.Qpid.Sasl")]

-[assembly: AssemblyCopyright("Copyright © 2007 The Apache Software Foundation")]

-[assembly: AssemblyTrademark("")]

-[assembly: AssemblyCulture("")]

-

-// Setting ComVisible to false makes the types in this assembly not visible 

-// to COM components.  If you need to access a type in this assembly from 

-// COM, set the ComVisible attribute to true on that type.

-[assembly: ComVisible(false)]

-

-// The following GUID is for the ID of the typelib if this project is exposed to COM

-[assembly: Guid("27ea23e4-6f84-4a54-8f1f-5725e6d767cc")]

-

-// Version information for an assembly consists of the following four values:

-//

-//      Major Version

-//      Minor Version 

-//      Build Number

-//      Revision

-//

-// You can specify all the values or you can default the Revision and Build Numbers 

-// by using the '*' as shown below:

-[assembly: AssemblyVersion("1.0.0.0")]

-[assembly: AssemblyFileVersion("1.0.0.0")]

-[assembly: CLSCompliant(true)]

diff --git a/qpid/dotnet/Qpid.Sasl/Qpid.Sasl.csproj b/qpid/dotnet/Qpid.Sasl/Qpid.Sasl.csproj
deleted file mode 100644
index 891d710379..0000000000
--- a/qpid/dotnet/Qpid.Sasl/Qpid.Sasl.csproj
+++ /dev/null
@@ -1,64 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <PropertyGroup>

-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ProductVersion>8.0.50727</ProductVersion>

-    <SchemaVersion>2.0</SchemaVersion>

-    <ProjectGuid>{1465B0EE-6452-42A6-AB73-B2F9EABEEE75}</ProjectGuid>

-    <OutputType>Library</OutputType>

-    <AppDesignerFolder>Properties</AppDesignerFolder>

-    <RootNamespace>Apache.Qpid.Sasl</RootNamespace>

-    <AssemblyName>Apache.Qpid.Sasl</AssemblyName>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

-    <DebugSymbols>true</DebugSymbols>

-    <DebugType>full</DebugType>

-    <Optimize>false</Optimize>

-    <OutputPath>..\bin\net-2.0\debug\</OutputPath>

-    <DefineConstants>DEBUG;TRACE</DefineConstants>

-    <ErrorReport>prompt</ErrorReport>

-    <WarningLevel>4</WarningLevel>

-    <UseVSHostingProcess>true</UseVSHostingProcess>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

-    <DebugType>pdbonly</DebugType>

-    <Optimize>true</Optimize>

-    <OutputPath>bin\Release\</OutputPath>

-    <DefineConstants>TRACE</DefineConstants>

-    <ErrorReport>prompt</ErrorReport>

-    <WarningLevel>4</WarningLevel>

-  </PropertyGroup>

-  <ItemGroup>

-    <Reference Include="System" />

-    <Reference Include="System.Data" />

-    <Reference Include="System.Xml" />

-  </ItemGroup>

-  <ItemGroup>

-    <Compile Include="Callbacks.cs" />

-    <Compile Include="Configuration\SaslConfiguration.cs" />

-    <Compile Include="Configuration\SaslConfigurationSectionHandler.cs" />

-    <Compile Include="MD5HMAC.cs" />

-    <Compile Include="Mechanisms\ExternalSaslClient.cs" />

-    <Compile Include="SaslException.cs" />

-    <Compile Include="Mechanisms\AnonymousSaslClient.cs" />

-    <Compile Include="Mechanisms\DigestSaslClient.cs" />

-    <Compile Include="Sasl.cs" />

-    <Compile Include="DefaultClientFactory.cs" />

-    <Compile Include="ISaslCallbackHandler.cs" />

-    <Compile Include="ISaslClientFactory.cs" />

-    <Compile Include="Mechanisms\CramMD5SaslClient.cs" />

-    <Compile Include="SaslProperties.cs" />

-    <Compile Include="ISaslClient.cs" />

-    <Compile Include="Mechanisms\PlainSaslClient.cs" />

-    <Compile Include="SaslClient.cs" />

-    <Compile Include="Properties\AssemblyInfo.cs" />

-  </ItemGroup>

-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

-       Other similar extension points exist, see Microsoft.Common.targets.

-  <Target Name="BeforeBuild">

-  </Target>

-  <Target Name="AfterBuild">

-  </Target>

-  -->

-</Project>

diff --git a/qpid/dotnet/Qpid.Sasl/Sasl.cs b/qpid/dotnet/Qpid.Sasl/Sasl.cs
deleted file mode 100644
index 5a744a30d9..0000000000
--- a/qpid/dotnet/Qpid.Sasl/Sasl.cs
+++ /dev/null
@@ -1,115 +0,0 @@
-/*

- *

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- *

- */

-

-using System;

-using System.Collections;

-using System.Configuration;

-using System.Text;

-

-using Apache.Qpid.Sasl.Configuration;

-

-namespace Apache.Qpid.Sasl

-{

-   /// <summary>

-   /// Static class used to access the SASL functionality. 

-   /// The core SASL mechanism is described in RFC 2222.

-   /// </summary>

-   /// <remarks>

-   /// Only client side mechanisms are implemented.

-   /// <para>

-   /// New client side factories can be added programatically using the 

-   /// RegisterClientFactory method, or through the application 

-   /// configuration file, like this:

-   /// </para>

-   /// <example><![CDATA[

-   /// <configuration>

-   ///   <configSections>

-   ///      <section name="qpid.sasl" type="Apache.Qpid.Sasl.Configuration.SaslConfigurationSectionHandler, Apache.Qpid.Sasl"/>

-   ///   </configSections>

-   ///

-   ///   <qpid.sasl>

-   ///      <clientFactories>

-   ///         <add type="Apache.Qpid.Sasl.Tests.TestClientFactory, Apache.Qpid.Sasl.Tests"/>

-   ///      </clientFactories>

-   ///   </qpid.sasl>

-   /// </configuration>

-   /// ]]></example>

-   /// </remarks>

-   public sealed class Sasl

-   {

-      private static IList _clientFactories;

-      

-

-      static Sasl()

-      {

-         SaslConfiguration config = SaslConfiguration.GetConfiguration();

-         _clientFactories = config.ClientFactories;

-      }

-      private Sasl()

-      {

-      }

-

-      public static ISaslClient CreateClient(

-         string[] mechanisms, string authorizationId,

-         string protocol, string serverName,

-         IDictionary props, ISaslCallbackHandler handler

-         )

-      {

-         ISaslClientFactory factory = FindFactory(mechanisms, props);

-         if ( factory == null )

-            return null;

-

-         return factory.CreateClient (

-            mechanisms, authorizationId, 

-            protocol, serverName, props, handler

-            );

-      }

-

-      public static void RegisterClientFactory(ISaslClientFactory factory)

-      {

-         lock ( _clientFactories )

-         {

-            _clientFactories.Add(factory);

-         }

-      }

-

-      private static ISaslClientFactory FindFactory(string[] mechanisms, IDictionary props)

-      {

-         lock ( _clientFactories )

-         {

-            foreach ( ISaslClientFactory factory in _clientFactories )

-            {

-               string[] mechs = factory.GetSupportedMechanisms(props);

-               foreach ( string m1 in mechs )

-               {

-                  foreach (string m2 in mechanisms )

-                  {

-                     if ( m1 == m2 )

-                        return factory;

-                  }

-               }

-            }

-            return null;

-         }

-      }

-   } // class Sasl

-

-} // namespace Apache.Qpid.Sasl.Mechanisms

diff --git a/qpid/dotnet/Qpid.Sasl/SaslClient.cs b/qpid/dotnet/Qpid.Sasl/SaslClient.cs
deleted file mode 100644
index 1390b1b352..0000000000
--- a/qpid/dotnet/Qpid.Sasl/SaslClient.cs
+++ /dev/null
@@ -1,145 +0,0 @@
-/*

- *

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- *

- */

-

-using System;

-using System.Collections;

-using System.Globalization;

-using System.Text;

-

-namespace Apache.Qpid.Sasl

-{

-   public abstract class SaslClient : ISaslClient

-   {

-      private bool _isComplete;

-      private IDictionary _properties;

-      private string _authorizationId;

-      private string _serverName;

-      private string _protocol;

-      private ISaslCallbackHandler _handler;

-

-      protected string AuthorizationId

-      {

-         get { return _authorizationId; }

-      }

-      protected string ServerName

-      {

-         get { return _serverName; }

-      }

-

-      protected string Protocol

-      {

-         get { return _protocol; }

-      }

-

-      protected ISaslCallbackHandler Handler

-      {

-         get { return _handler; }

-      }

-

-      protected IDictionary Properties

-      {

-         get { return _properties; }

-      }

-

-      protected SaslClient(

-         string authid, string serverName, 

-         string protocol, IDictionary properties, 

-         ISaslCallbackHandler handler)

-      {

-         if ( properties == null )

-            throw new ArgumentNullException("properties");

-         if ( handler == null )

-            throw new ArgumentNullException("handler");

-

-         _authorizationId = authid==null ? "" : authid;

-         _serverName = serverName;

-         _protocol = protocol;

-         _properties = properties;

-         _handler = handler;

-

-         if ( _serverName == null || _serverName.Length == 0 )

-         {

-            _serverName = System.Net.Dns.GetHostName();

-         }

-      }

-

-

-

-

-      #region ISaslClient Implementation

-      //

-      // ISaslClient Implementation

-      //

-

-      public abstract string MechanismName { get; }

-

-      public abstract bool HasInitialResponse { get; }

-

-      public bool IsComplete

-      {

-         get { return _isComplete; }

-      }

-

-      public abstract byte[] EvaluateChallenge(byte[] challenge);

-

-      public virtual object GetNegotiatedProperty(string propName)

-      {

-         return null;

-      }

-

-      public virtual byte[] Unwrap(byte[] buffer, int offset, int length)

-      {

-         throw new NotImplementedException();

-      }

-

-      public virtual byte[] Wrap(byte[] buffer, int offset, int lenght)

-      {

-         throw new NotImplementedException();

-      }

-

-      #endregion // ISaslClient Implementation

-

-

-      #region Helper Methods

-      //

-      // Helper Methods

-      //

-

-      protected void SetComplete()

-      {

-         _isComplete = true;

-      }

-

-      protected static string ToHex(byte[] buffer)

-      {

-         StringBuilder builder = new StringBuilder();

-         foreach ( byte b in buffer )

-         {

-            builder.Append(b.ToString("x2", CultureInfo.InvariantCulture));

-         }

-         return builder.ToString();

-      }

-

-      #endregion // Helper Methods

-

-   } // class SaslClient

-

-} // namespace Apache.Qpid.Sasl.Mechanisms

diff --git a/qpid/dotnet/Qpid.Sasl/SaslException.cs b/qpid/dotnet/Qpid.Sasl/SaslException.cs
deleted file mode 100644
index 8f6e00a7ba..0000000000
--- a/qpid/dotnet/Qpid.Sasl/SaslException.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-/*

- *

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- *

- */

-

-using System;

-using System.Collections;

-using System.Runtime.Serialization;

-using System.Text;

-

-namespace Apache.Qpid.Sasl

-{

-   /// <summary>

-   /// Reports an exception during the processing of an SASL

-   /// Operation. Only used for authentication-relared errors

-   /// </summary>

-   [Serializable]

-   public class SaslException : Exception

-   {

-      public SaslException()

-      {

-      }

-

-      public SaslException(string message)

-         : base(message)

-      {

-      }

-      public SaslException(string message, Exception innerException)

-         : base(message, innerException)

-      {

-      }

-

-      protected SaslException(SerializationInfo info, StreamingContext ctxt)

-         : base(info, ctxt)

-      {

-      }

-

-   } // class SaslException

-

-} // namespace Apache.Qpid.Sasl.Mechanisms

diff --git a/qpid/dotnet/Qpid.Sasl/SaslProperties.cs b/qpid/dotnet/Qpid.Sasl/SaslProperties.cs
deleted file mode 100644
index 0658acda21..0000000000
--- a/qpid/dotnet/Qpid.Sasl/SaslProperties.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-/*

- *

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- *

- */

-

-using System;

-using System.Collections;

-using System.Text;

-

-namespace Apache.Qpid.Sasl

-{

-   public sealed class SaslProperties

-   {

-      public const string PolicyNoPlainText = "NOPLAINTEXT";

-      public const string PolicyNoActive = "NOACTIVE";

-      public const string PolicyNoDictionary = "NODICTIONARY";

-      public const string PolicyNoAnonymous = "NOANONYMOUS";

-      public const string PolicyForwardSecrecy = "FORWARD_SECRECY";

-      public const string PolicyPassCredentials = "PASS_CREDENTIALS";

-

-      public const string Qop = "QOP";

-      public const string Strength = "STRENGTH";

- 

-   } // class SaslProperties

-

-} // namespace Apache.Qpid.Sasl.Mechanisms

diff --git a/qpid/dotnet/Qpid.Sasl/default.build b/qpid/dotnet/Qpid.Sasl/default.build
deleted file mode 100644
index 5b44d6b9c4..0000000000
--- a/qpid/dotnet/Qpid.Sasl/default.build
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>

-<project name="Apache.Qpid.Sasl" default="build">

-    <!--

-		Properties that come from master build file

-		- build.dir: root directory for build

-		- build.debug: true if building debug release

-		- build.defines: variables to define during build

-    -->

-

-    <target name="build">

-        <csc target="library" 

-				define="${build.defines}" 

-				debug="${build.debug}" 

-				output="${build.dir}/${project::get-name()}.dll">

-			

-			<sources>

-			   <include name="**/*.cs" />

-         </sources>

-         <references>

-         </references>

-        </csc>

-    </target>

-</project>

-

diff --git a/qpid/dotnet/README.txt b/qpid/dotnet/README.txt
deleted file mode 100644
index 1c0be05c11..0000000000
--- a/qpid/dotnet/README.txt
+++ /dev/null
@@ -1,71 +0,0 @@
-Info
-====
-
-AMQP version currently 0.8 (see /Qpid.Common/amqp.xml)
-
-
-Setup
-=====
-
-Install:
-  Microsoft Visual Studio 2005 (VS2005)
-  NAnt 0.85 - only required for builds outside VS2005 (.net 1.1, .net 2.0, mono 2.0)
-  Ant 1.6.5
-  Cygwin (or alternatively build via cmd but alter instructions below accordingly)
-
-Set up PATH to include Nant.exe:
-
-  $ PATH=/cygdrive/c/WINDOWS/Microsoft.NET/Framework/v2.0.50727:$PATH
-
-Set up PATH to include ant:
-
-  $ PATH=$ANT_HOME/bin:$PATH
-
-
-Building
-========
-
-Generate framing from /Qpid.Common/amqp.xml specificiation file:
-
-  $ build-framing
-
-Alternatively, just switch to /Qpid.Common and run "ant" there.
-
-You can build from Visual Studio 2005 normally. Alternatively, you
-can build debug releases for any supported framework from the 
-command line using Nant:
-
-To build .NET 2.0 executables (to bin/net-2.0):
-
-  $ build-dotnet20
-
-To build .NET 1.1 executables (to bin/net-1.1):
-
-  $ build-dotnet11
-
-To build for Mono on Linux (to bin/mono-2.0):
-
-  $ build-mono
-
-
-Releasing
-=========
-
-For .NET 1.1
-
-  $ release net-1.1
-
-Generates ./bin/net-1.1/release/Qpid.NET-net-1.1-yyyyMMdd.zip
-
-For .NET 2.0
-
-  $ release net-2.0
-
-Generates ./bin/net-2.0/release/Qpid.NET-net-2.0-yyyyMMdd.zip
-
-For Mono
-
-  $ release mono-2.0
-
-Generates ./bin/mono-2.0/release/Qpid.NET-mono-2.0-yyyyMMdd.zip
-
diff --git a/qpid/dotnet/TODO.txt b/qpid/dotnet/TODO.txt
deleted file mode 100644
index d79fb8f5f7..0000000000
--- a/qpid/dotnet/TODO.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-
-* Implement durable subscriptions.
-* Implement prefetching
-* support multiple versions of AMQP from the same client.
-* Add new unit and integration tests
-* Implement Transactions
diff --git a/qpid/dotnet/TestClient/Program.cs b/qpid/dotnet/TestClient/Program.cs
deleted file mode 100644
index 4c39638eb3..0000000000
--- a/qpid/dotnet/TestClient/Program.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace TopicListener

-{

-    class Program

-    {

-        static void Main(string[] args)

-        {

-            Apache.Qpid.Client.Tests.interop.TestClient.Main(args);

-        }

-    }

-}

diff --git a/qpid/dotnet/TestClient/Properties/AssemblyInfo.cs b/qpid/dotnet/TestClient/Properties/AssemblyInfo.cs
deleted file mode 100644
index becfda4a69..0000000000
--- a/qpid/dotnet/TestClient/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;

-using System.Runtime.CompilerServices;

-using System.Runtime.InteropServices;

-

-// General Information about an assembly is controlled through the following 

-// set of attributes. Change these attribute values to modify the information

-// associated with an assembly.

-[assembly: AssemblyTitle("TestClient")]

-[assembly: AssemblyDescription("")]

-[assembly: AssemblyConfiguration("")]

-[assembly: AssemblyCompany("J.P. Morgan Chase & Co.")]

-[assembly: AssemblyProduct("TestClient")]

-[assembly: AssemblyCopyright("Copyright © J.P. Morgan Chase & Co. 2007")]

-[assembly: AssemblyTrademark("")]

-[assembly: AssemblyCulture("")]

-

-// Setting ComVisible to false makes the types in this assembly not visible 

-// to COM components.  If you need to access a type in this assembly from 

-// COM, set the ComVisible attribute to true on that type.

-[assembly: ComVisible(false)]

-

-// The following GUID is for the ID of the typelib if this project is exposed to COM

-[assembly: Guid("1c2db1cd-239f-495a-b6b4-c815ea534489")]

-

-// Version information for an assembly consists of the following four values:

-//

-//      Major Version

-//      Minor Version 

-//      Build Number

-//      Revision

-//

-[assembly: AssemblyVersion("1.0.0.0")]

-[assembly: AssemblyFileVersion("1.0.0.0")]

diff --git a/qpid/dotnet/TestClient/TestClient.csproj b/qpid/dotnet/TestClient/TestClient.csproj
deleted file mode 100644
index b00994b265..0000000000
--- a/qpid/dotnet/TestClient/TestClient.csproj
+++ /dev/null
@@ -1,89 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <PropertyGroup>

-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ProductVersion>8.0.50727</ProductVersion>

-    <SchemaVersion>2.0</SchemaVersion>

-    <ProjectGuid>{9A112DF2-146F-4CF4-919B-9D3BE7D088E9}</ProjectGuid>

-    <OutputType>Exe</OutputType>

-    <AppDesignerFolder>Properties</AppDesignerFolder>

-    <RootNamespace>TestClient</RootNamespace>

-    <AssemblyName>TestClient</AssemblyName>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

-    <DebugSymbols>true</DebugSymbols>

-    <DebugType>full</DebugType>

-    <Optimize>false</Optimize>

-    <OutputPath>..\bin\net-2.0\debug\</OutputPath>

-    <DefineConstants>DEBUG;TRACE</DefineConstants>

-    <ErrorReport>prompt</ErrorReport>

-    <WarningLevel>4</WarningLevel>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

-    <DebugType>pdbonly</DebugType>

-    <Optimize>true</Optimize>

-    <OutputPath>..\bin\net-2.0\release\</OutputPath>

-    <DefineConstants>TRACE</DefineConstants>

-    <ErrorReport>prompt</ErrorReport>

-    <WarningLevel>4</WarningLevel>

-  </PropertyGroup>

-  <ItemGroup>

-    <Reference Include="System" />

-    <Reference Include="System.Data" />

-    <Reference Include="System.Xml" />

-  </ItemGroup>

-  <ItemGroup>

-    <Compile Include="Program.cs" />

-    <Compile Include="Properties\AssemblyInfo.cs" />

-  </ItemGroup>

-  <ItemGroup>

-    <ProjectReference Include="..\Qpid.Buffer.Tests\Qpid.Buffer.Tests.csproj">

-      <Project>{74640962-99D0-4D06-B57A-9CD66517CF52}</Project>

-      <Name>Qpid.Buffer.Tests</Name>

-    </ProjectReference>

-    <ProjectReference Include="..\Qpid.Buffer\Qpid.Buffer.csproj">

-      <Project>{44384DF2-B0A4-4580-BDBC-EE4BAA87D995}</Project>

-      <Name>Qpid.Buffer</Name>

-    </ProjectReference>

-    <ProjectReference Include="..\Qpid.Client.Tests\Qpid.Client.Tests.csproj">

-      <Project>{BA1B0032-4CE6-40DD-A2DC-119F0FFA0A1D}</Project>

-      <Name>Qpid.Client.Tests</Name>

-    </ProjectReference>

-    <ProjectReference Include="..\Qpid.Client\Qpid.Client.csproj">

-      <Project>{68987C05-3768-452C-A6FC-6BA1D372852F}</Project>

-      <Name>Qpid.Client</Name>

-    </ProjectReference>

-    <ProjectReference Include="..\Qpid.Codec\Qpid.Codec.csproj">

-      <Project>{22D0D0C2-77AF-4DE3-B456-7FF3893F9F88}</Project>

-      <Name>Qpid.Codec</Name>

-    </ProjectReference>

-    <ProjectReference Include="..\Qpid.Common.Tests\Qpid.Common.Tests.csproj">

-      <Project>{F83624B0-762B-4D82-900D-FF4C1B36E36E}</Project>

-      <Name>Qpid.Common.Tests</Name>

-    </ProjectReference>

-    <ProjectReference Include="..\Qpid.Common\Qpid.Common.csproj">

-      <Project>{77064C42-24D2-4CEB-9EA2-0EF481A43205}</Project>

-      <Name>Qpid.Common</Name>

-    </ProjectReference>

-    <ProjectReference Include="..\Qpid.Messaging\Qpid.Messaging.csproj">

-      <Project>{6688F826-C58E-4C1B-AA1F-22AFAB4B7D07}</Project>

-      <Name>Qpid.Messaging</Name>

-    </ProjectReference>

-    <ProjectReference Include="..\Qpid.Sasl.Tests\Qpid.Sasl.Tests.csproj">

-      <Project>{587B3520-EBB9-41ED-B019-E96116B651CE}</Project>

-      <Name>Qpid.Sasl.Tests</Name>

-    </ProjectReference>

-    <ProjectReference Include="..\Qpid.Sasl\Qpid.Sasl.csproj">

-      <Project>{1465B0EE-6452-42A6-AB73-B2F9EABEEE75}</Project>

-      <Name>Qpid.Sasl</Name>

-    </ProjectReference>

-  </ItemGroup>

-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

-       Other similar extension points exist, see Microsoft.Common.targets.

-  <Target Name="BeforeBuild">

-  </Target>

-  <Target Name="AfterBuild">

-  </Target>

-  -->

-</Project>
\ No newline at end of file
diff --git a/qpid/dotnet/TestClient/default.build b/qpid/dotnet/TestClient/default.build
deleted file mode 100644
index dee644c71e..0000000000
--- a/qpid/dotnet/TestClient/default.build
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0"?>

-<project name="TestClient" default="build">

-    <!--

-		Properties that come from master build file

-		- build.dir: root directory for build

-		- build.debug: true if building debug release

-		- build.defines: variables to define during build

-    -->

-

-    <target name="build">

-        <csc target="exe" 

-				define="${build.defines}" 

-            debug="${build.debug}"

-            unsafe="true"

-				output="${build.dir}/${project::get-name()}.exe">

-			

-			<sources>

-			   <include name="**/*.cs" />

-         </sources>

-         <references>

-            <include name="${build.dir}\Apache.Qpid.Client.Tests.dll"/>

-         </references>

-        </csc>

-    </target>

-</project>

-

diff --git a/qpid/dotnet/TopicListener/Program.cs b/qpid/dotnet/TopicListener/Program.cs
deleted file mode 100644
index 0134dca1ba..0000000000
--- a/qpid/dotnet/TopicListener/Program.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace TopicListener

-{

-    class Program

-    {

-        static void Main(string[] args)

-        {

-            Apache.Qpid.Client.Tests.interop.TopicListener.Main(args);

-        }

-    }

-}

diff --git a/qpid/dotnet/TopicListener/Properties/AssemblyInfo.cs b/qpid/dotnet/TopicListener/Properties/AssemblyInfo.cs
deleted file mode 100644
index 8672df7059..0000000000
--- a/qpid/dotnet/TopicListener/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;

-using System.Runtime.CompilerServices;

-using System.Runtime.InteropServices;

-

-// General Information about an assembly is controlled through the following 

-// set of attributes. Change these attribute values to modify the information

-// associated with an assembly.

-[assembly: AssemblyTitle("TopicListener")]

-[assembly: AssemblyDescription("")]

-[assembly: AssemblyConfiguration("")]

-[assembly: AssemblyCompany("J.P. Morgan Chase & Co.")]

-[assembly: AssemblyProduct("TopicListener")]

-[assembly: AssemblyCopyright("Copyright © J.P. Morgan Chase & Co. 2007")]

-[assembly: AssemblyTrademark("")]

-[assembly: AssemblyCulture("")]

-

-// Setting ComVisible to false makes the types in this assembly not visible 

-// to COM components.  If you need to access a type in this assembly from 

-// COM, set the ComVisible attribute to true on that type.

-[assembly: ComVisible(false)]

-

-// The following GUID is for the ID of the typelib if this project is exposed to COM

-[assembly: Guid("1c2db1cd-239f-495a-b6b4-c815ea534489")]

-

-// Version information for an assembly consists of the following four values:

-//

-//      Major Version

-//      Minor Version 

-//      Build Number

-//      Revision

-//

-[assembly: AssemblyVersion("1.0.0.0")]

-[assembly: AssemblyFileVersion("1.0.0.0")]

diff --git a/qpid/dotnet/TopicListener/TopicListener.csproj b/qpid/dotnet/TopicListener/TopicListener.csproj
deleted file mode 100644
index 5522ada191..0000000000
--- a/qpid/dotnet/TopicListener/TopicListener.csproj
+++ /dev/null
@@ -1,89 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <PropertyGroup>

-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ProductVersion>8.0.50727</ProductVersion>

-    <SchemaVersion>2.0</SchemaVersion>

-    <ProjectGuid>{9A112DF2-146F-4CF4-919B-9D3BE7D088E9}</ProjectGuid>

-    <OutputType>Exe</OutputType>

-    <AppDesignerFolder>Properties</AppDesignerFolder>

-    <RootNamespace>TopicListener</RootNamespace>

-    <AssemblyName>TopicListener</AssemblyName>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

-    <DebugSymbols>true</DebugSymbols>

-    <DebugType>full</DebugType>

-    <Optimize>false</Optimize>

-    <OutputPath>..\bin\net-2.0\debug\</OutputPath>

-    <DefineConstants>DEBUG;TRACE</DefineConstants>

-    <ErrorReport>prompt</ErrorReport>

-    <WarningLevel>4</WarningLevel>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

-    <DebugType>pdbonly</DebugType>

-    <Optimize>true</Optimize>

-    <OutputPath>..\bin\net-2.0\release\</OutputPath>

-    <DefineConstants>TRACE</DefineConstants>

-    <ErrorReport>prompt</ErrorReport>

-    <WarningLevel>4</WarningLevel>

-  </PropertyGroup>

-  <ItemGroup>

-    <Reference Include="System" />

-    <Reference Include="System.Data" />

-    <Reference Include="System.Xml" />

-  </ItemGroup>

-  <ItemGroup>

-    <Compile Include="Program.cs" />

-    <Compile Include="Properties\AssemblyInfo.cs" />

-  </ItemGroup>

-  <ItemGroup>

-    <ProjectReference Include="..\Qpid.Buffer.Tests\Qpid.Buffer.Tests.csproj">

-      <Project>{74640962-99D0-4D06-B57A-9CD66517CF52}</Project>

-      <Name>Qpid.Buffer.Tests</Name>

-    </ProjectReference>

-    <ProjectReference Include="..\Qpid.Buffer\Qpid.Buffer.csproj">

-      <Project>{44384DF2-B0A4-4580-BDBC-EE4BAA87D995}</Project>

-      <Name>Qpid.Buffer</Name>

-    </ProjectReference>

-    <ProjectReference Include="..\Qpid.Client.Tests\Qpid.Client.Tests.csproj">

-      <Project>{BA1B0032-4CE6-40DD-A2DC-119F0FFA0A1D}</Project>

-      <Name>Qpid.Client.Tests</Name>

-    </ProjectReference>

-    <ProjectReference Include="..\Qpid.Client\Qpid.Client.csproj">

-      <Project>{68987C05-3768-452C-A6FC-6BA1D372852F}</Project>

-      <Name>Qpid.Client</Name>

-    </ProjectReference>

-    <ProjectReference Include="..\Qpid.Codec\Qpid.Codec.csproj">

-      <Project>{22D0D0C2-77AF-4DE3-B456-7FF3893F9F88}</Project>

-      <Name>Qpid.Codec</Name>

-    </ProjectReference>

-    <ProjectReference Include="..\Qpid.Common.Tests\Qpid.Common.Tests.csproj">

-      <Project>{F83624B0-762B-4D82-900D-FF4C1B36E36E}</Project>

-      <Name>Qpid.Common.Tests</Name>

-    </ProjectReference>

-    <ProjectReference Include="..\Qpid.Common\Qpid.Common.csproj">

-      <Project>{77064C42-24D2-4CEB-9EA2-0EF481A43205}</Project>

-      <Name>Qpid.Common</Name>

-    </ProjectReference>

-    <ProjectReference Include="..\Qpid.Messaging\Qpid.Messaging.csproj">

-      <Project>{6688F826-C58E-4C1B-AA1F-22AFAB4B7D07}</Project>

-      <Name>Qpid.Messaging</Name>

-    </ProjectReference>

-    <ProjectReference Include="..\Qpid.Sasl.Tests\Qpid.Sasl.Tests.csproj">

-      <Project>{587B3520-EBB9-41ED-B019-E96116B651CE}</Project>

-      <Name>Qpid.Sasl.Tests</Name>

-    </ProjectReference>

-    <ProjectReference Include="..\Qpid.Sasl\Qpid.Sasl.csproj">

-      <Project>{1465B0EE-6452-42A6-AB73-B2F9EABEEE75}</Project>

-      <Name>Qpid.Sasl</Name>

-    </ProjectReference>

-  </ItemGroup>

-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

-       Other similar extension points exist, see Microsoft.Common.targets.

-  <Target Name="BeforeBuild">

-  </Target>

-  <Target Name="AfterBuild">

-  </Target>

-  -->

-</Project>
\ No newline at end of file
diff --git a/qpid/dotnet/TopicListener/default.build b/qpid/dotnet/TopicListener/default.build
deleted file mode 100644
index afde4d6937..0000000000
--- a/qpid/dotnet/TopicListener/default.build
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0"?>

-<project name="TopicListener" default="build">

-    <!--

-		Properties that come from master build file

-		- build.dir: root directory for build

-		- build.debug: true if building debug release

-		- build.defines: variables to define during build

-    -->

-

-    <target name="build">

-        <csc target="exe" 

-				define="${build.defines}" 

-            debug="${build.debug}"

-            unsafe="true"

-				output="${build.dir}/${project::get-name()}.exe">

-			

-			<sources>

-			   <include name="**/*.cs" />

-         </sources>

-         <references>

-            <include name="${build.dir}\Apache.Qpid.Client.Tests.dll"/>

-         </references>

-        </csc>

-    </target>

-</project>

-

diff --git a/qpid/dotnet/TopicPublisher/Program.cs b/qpid/dotnet/TopicPublisher/Program.cs
deleted file mode 100644
index a68df14bb3..0000000000
--- a/qpid/dotnet/TopicPublisher/Program.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace TopicPublisher

-{

-    class Program

-    {

-        static void Main(string[] args)

-        {

-            Apache.Qpid.Client.Tests.interop.TopicPublisher.Main(args);

-        }

-    }

-}

diff --git a/qpid/dotnet/TopicPublisher/Properties/AssemblyInfo.cs b/qpid/dotnet/TopicPublisher/Properties/AssemblyInfo.cs
deleted file mode 100644
index 85442960ed..0000000000
--- a/qpid/dotnet/TopicPublisher/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;

-using System.Runtime.CompilerServices;

-using System.Runtime.InteropServices;

-

-// General Information about an assembly is controlled through the following 

-// set of attributes. Change these attribute values to modify the information

-// associated with an assembly.

-[assembly: AssemblyTitle("TopicPublisher")]

-[assembly: AssemblyDescription("")]

-[assembly: AssemblyConfiguration("")]

-[assembly: AssemblyCompany("J.P. Morgan Chase & Co.")]

-[assembly: AssemblyProduct("TopicPublisher")]

-[assembly: AssemblyCopyright("Copyright © J.P. Morgan Chase & Co. 2007")]

-[assembly: AssemblyTrademark("")]

-[assembly: AssemblyCulture("")]

-

-// Setting ComVisible to false makes the types in this assembly not visible 

-// to COM components.  If you need to access a type in this assembly from 

-// COM, set the ComVisible attribute to true on that type.

-[assembly: ComVisible(false)]

-

-// The following GUID is for the ID of the typelib if this project is exposed to COM

-[assembly: Guid("93fa1c32-c0f8-47e5-b167-dc581e33eb9b")]

-

-// Version information for an assembly consists of the following four values:

-//

-//      Major Version

-//      Minor Version 

-//      Build Number

-//      Revision

-//

-[assembly: AssemblyVersion("1.0.0.0")]

-[assembly: AssemblyFileVersion("1.0.0.0")]

diff --git a/qpid/dotnet/TopicPublisher/TopicPublisher.csproj b/qpid/dotnet/TopicPublisher/TopicPublisher.csproj
deleted file mode 100644
index 2e03ce858e..0000000000
--- a/qpid/dotnet/TopicPublisher/TopicPublisher.csproj
+++ /dev/null
@@ -1,85 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <PropertyGroup>

-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ProductVersion>8.0.50727</ProductVersion>

-    <SchemaVersion>2.0</SchemaVersion>

-    <ProjectGuid>{A06C9FFD-22FF-4654-856D-897C230978AF}</ProjectGuid>

-    <OutputType>Exe</OutputType>

-    <AppDesignerFolder>Properties</AppDesignerFolder>

-    <RootNamespace>TopicPublisher</RootNamespace>

-    <AssemblyName>TopicPublisher</AssemblyName>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

-    <DebugSymbols>true</DebugSymbols>

-    <DebugType>full</DebugType>

-    <Optimize>false</Optimize>

-    <OutputPath>..\bin\net-2.0\debug\</OutputPath>

-    <DefineConstants>DEBUG;TRACE</DefineConstants>

-    <ErrorReport>prompt</ErrorReport>

-    <WarningLevel>4</WarningLevel>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

-    <DebugType>pdbonly</DebugType>

-    <Optimize>true</Optimize>

-    <OutputPath>..\bin\net-2.0\release\</OutputPath>

-    <DefineConstants>TRACE</DefineConstants>

-    <ErrorReport>prompt</ErrorReport>

-    <WarningLevel>4</WarningLevel>

-  </PropertyGroup>

-  <ItemGroup>

-    <Reference Include="System" />

-    <Reference Include="System.Data" />

-    <Reference Include="System.Xml" />

-  </ItemGroup>

-  <ItemGroup>

-    <Compile Include="Program.cs" />

-    <Compile Include="Properties\AssemblyInfo.cs" />

-  </ItemGroup>

-  <ItemGroup>

-    <ProjectReference Include="..\Qpid.Buffer\Qpid.Buffer.csproj">

-      <Project>{44384DF2-B0A4-4580-BDBC-EE4BAA87D995}</Project>

-      <Name>Qpid.Buffer</Name>

-    </ProjectReference>

-    <ProjectReference Include="..\Qpid.Client.Tests\Qpid.Client.Tests.csproj">

-      <Project>{BA1B0032-4CE6-40DD-A2DC-119F0FFA0A1D}</Project>

-      <Name>Qpid.Client.Tests</Name>

-    </ProjectReference>

-    <ProjectReference Include="..\Qpid.Client\Qpid.Client.csproj">

-      <Project>{68987C05-3768-452C-A6FC-6BA1D372852F}</Project>

-      <Name>Qpid.Client</Name>

-    </ProjectReference>

-    <ProjectReference Include="..\Qpid.Codec\Qpid.Codec.csproj">

-      <Project>{22D0D0C2-77AF-4DE3-B456-7FF3893F9F88}</Project>

-      <Name>Qpid.Codec</Name>

-    </ProjectReference>

-    <ProjectReference Include="..\Qpid.Common.Tests\Qpid.Common.Tests.csproj">

-      <Project>{F83624B0-762B-4D82-900D-FF4C1B36E36E}</Project>

-      <Name>Qpid.Common.Tests</Name>

-    </ProjectReference>

-    <ProjectReference Include="..\Qpid.Common\Qpid.Common.csproj">

-      <Project>{77064C42-24D2-4CEB-9EA2-0EF481A43205}</Project>

-      <Name>Qpid.Common</Name>

-    </ProjectReference>

-    <ProjectReference Include="..\Qpid.Messaging\Qpid.Messaging.csproj">

-      <Project>{6688F826-C58E-4C1B-AA1F-22AFAB4B7D07}</Project>

-      <Name>Qpid.Messaging</Name>

-    </ProjectReference>

-    <ProjectReference Include="..\Qpid.Sasl.Tests\Qpid.Sasl.Tests.csproj">

-      <Project>{587B3520-EBB9-41ED-B019-E96116B651CE}</Project>

-      <Name>Qpid.Sasl.Tests</Name>

-    </ProjectReference>

-    <ProjectReference Include="..\Qpid.Sasl\Qpid.Sasl.csproj">

-      <Project>{1465B0EE-6452-42A6-AB73-B2F9EABEEE75}</Project>

-      <Name>Qpid.Sasl</Name>

-    </ProjectReference>

-  </ItemGroup>

-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

-       Other similar extension points exist, see Microsoft.Common.targets.

-  <Target Name="BeforeBuild">

-  </Target>

-  <Target Name="AfterBuild">

-  </Target>

-  -->

-</Project>
\ No newline at end of file
diff --git a/qpid/dotnet/TopicPublisher/default.build b/qpid/dotnet/TopicPublisher/default.build
deleted file mode 100644
index 8991aae751..0000000000
--- a/qpid/dotnet/TopicPublisher/default.build
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0"?>

-<project name="TopicPublisher" default="build">

-    <!--

-		Properties that come from master build file

-		- build.dir: root directory for build

-		- build.debug: true if building debug release

-		- build.defines: variables to define during build

-    -->

-

-    <target name="build">

-        <csc target="exe" 

-				define="${build.defines}" 

-            debug="${build.debug}"

-            unsafe="true"

-				output="${build.dir}/${project::get-name()}.exe">

-			

-			<sources>

-			   <include name="**/*.cs" />

-         </sources>

-         <references>

-            <include name="${build.dir}\Apache.Qpid.Client.Tests.dll"/>

-         </references>

-        </csc>

-    </target>

-</project>

-

diff --git a/qpid/dotnet/build-dotnet11 b/qpid/dotnet/build-dotnet11
deleted file mode 100644
index 918010bf1f..0000000000
--- a/qpid/dotnet/build-dotnet11
+++ /dev/null
@@ -1 +0,0 @@
-nant -t:net-1.1
diff --git a/qpid/dotnet/build-dotnet11.bat b/qpid/dotnet/build-dotnet11.bat
deleted file mode 100644
index 4b58f13b2a..0000000000
--- a/qpid/dotnet/build-dotnet11.bat
+++ /dev/null
@@ -1 +0,0 @@
-nant -t:net-1.1

diff --git a/qpid/dotnet/build-dotnet20 b/qpid/dotnet/build-dotnet20
deleted file mode 100644
index 713a7aa55a..0000000000
--- a/qpid/dotnet/build-dotnet20
+++ /dev/null
@@ -1,3 +0,0 @@
-MSBuild.exe Qpid.NET.sln \
-  /p:Configuration=Release \
-  /t:rebuild
diff --git a/qpid/dotnet/build-framing b/qpid/dotnet/build-framing
deleted file mode 100644
index 315a1a1cb2..0000000000
--- a/qpid/dotnet/build-framing
+++ /dev/null
@@ -1,2 +0,0 @@
-cd Qpid.Common
-ant
diff --git a/qpid/dotnet/build-framing.bat b/qpid/dotnet/build-framing.bat
deleted file mode 100644
index bc5aa23ab7..0000000000
--- a/qpid/dotnet/build-framing.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-cd Qpid.Common

-ant

diff --git a/qpid/dotnet/build-mono b/qpid/dotnet/build-mono
deleted file mode 100755
index 6f5cad5744..0000000000
--- a/qpid/dotnet/build-mono
+++ /dev/null
@@ -1 +0,0 @@
-nant -t:mono-2.0
diff --git a/qpid/dotnet/default.build b/qpid/dotnet/default.build
deleted file mode 100644
index e042f38c61..0000000000
--- a/qpid/dotnet/default.build
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0"?>

-<project name="Qpid.NET" default="build">

-   <property name="nant.formatter" value="Plain" />

-   <!-- 

-      Build debug or release build?

-   -->

-   <property name="build.config" value="debug" />

-

-   <!--

-      Fileset with build files for each core assembly

-   -->

-   <fileset id="src.builds">

-      <include name="Qpid.Buffer/default.build" />

-      <include name="Qpid.Sasl/default.build" />

-      <include name="Qpid.Messaging/default.build" />

-      <include name="Qpid.Codec/default.build" />

-      <include name="Qpid.Common/default.build" />        

-      <include name="Qpid.Client/default.build" />	

-   </fileset>

-    

-   <!--

-      Fileset with build files for test assemblies

-   -->

-   <fileset id="tests.builds">

-      <include name="Qpid.Buffer.Tests/default.build" />

-      <include name="Qpid.Sasl.Tests/default.build" />

-      <include name="Qpid.Common.Tests/default.build" />        

-      <include name="Qpid.Client.Tests/default.build" />	

-   </fileset>

-

-   <!--

-      Other test or utility assemblies

-   -->

-   <fileset id='other.builds'>

-      <include name="TopicListener/default.build" />	

-      <include name="TopicPublisher/default.build" />	

-   </fileset>

-   <!--

-      Prepare environment for a debug build

-   -->

-   <target name="debug">

-      <property name="build.debug" value="true" />

-      <property name="build.defines" value="DEBUG;TRACE"/>

-   </target>

-   <!--

-      Prepare environment for a release build

-   -->

-   <target name="release">

-      <property name="build.debug" value="false" />

-      <property name="build.defines" value=""/>

-   </target>

-    

-   <!--

-      prepare environment for build

-   -->

-   <target name="init">

-      <property name="base.dir" value="${project::get-base-directory()}" />

-      <property name="build.dir" value="${base.dir}/bin/${framework::get-target-framework()}/${build.config}" />

-      <call target="${build.config}" />	

-   </target>

-	

-	<target name="clean" depends="init">

-      <delete dir="${build.dir}" failonerror="false" />

-	</target>

-	

-   <!--

-      Do the build

-	-->

-	<target name="build" depends="init">

-      <!-- make sure output folder exists -->

-      <mkdir dir="${build.dir}" />

-      <!-- copy reference assemblies over to the output dir -->

-      <copy todir="${build.dir}" file="Qpid.Common/lib/seclib-1.0.0/Org.Mentalis.Security.dll"/>

-      <copy todir="${build.dir}" file="Qpid.Common/lib/log4net/log4net.dll"/>

-      <copy todir="${build.dir}" file="Qpid.Client.Tests/lib/nunit/nunit.framework.dll"/>

-		<!-- 

-			Compile assemblies

-		-->

-		<nant target="build">

-			<buildfiles refid="src.builds" />

-		</nant>

-		<!-- 

-         Compile test assemblies

-      -->

-		<nant target="build">

-			<buildfiles refid="tests.builds" />

-		</nant>

-		<!-- 

-         Compile test assemblies

-      -->

-		<nant target="build">

-			<buildfiles refid="other.builds" />

-		</nant>

-	</target>

-	

-	<!--

-		Execute unit tests

-	-->

-	<target name="test" depends="build">

-      <echo message="Running unit tests for the project." />

-      <nant target="test">

-         <buildfiles refid="tests.builds" />

-      </nant>

-   </target>

-

-   <!-- 

-      Make a release package

-   -->

-   <target name="release-pkg">

-      <echo message="building and packing a release"/>

-      <call target="clean"/>

-      <call target="build"/>

-      <property name="build.date" value="${datetime::now()}"/>

-

-      <zip zipfile="${build.dir}/Qpid.NET-${framework::get-target-framework()}-${datetime::get-year(build.date)}${datetime::get-month(build.date)}${datetime::get-day(build.date)}.zip">

-         <fileset basedir="${build.dir}">

-            <include name="**/*.*"/>

-            <exclude name="**/*.Tests.*"/>

-            <exclude name="**/nunit.framework.dll"/>

-            <exclude name="**/*.exe"/>

-         </fileset>

-      </zip>

-   </target>

-	

-</project>

-

-

diff --git a/qpid/dotnet/release b/qpid/dotnet/release
deleted file mode 100755
index 11291e87d6..0000000000
--- a/qpid/dotnet/release
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-Usage() 
-{
-  echo "usage: $0 net-1.1|net-2.0|mono-2.0"
-  exit 2
-}
-
-if [[ $# -ne 1 ]]; then
-  Usage
-fi
-
-nant -t:$1 release-pkg -D:build.config=release
diff --git a/qpid/java/broker/bin/msTool.sh b/qpid/java/broker/bin/msTool.sh
deleted file mode 100755
index b291ed9fe3..0000000000
--- a/qpid/java/broker/bin/msTool.sh
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/bash
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-die() {
-  if [[ $1 = -usage ]]; then
-    shift
-    usage=true
-  else
-    usage=false
-  fi
-  echo "$@"
-  $usage && echo
-  $usage && usage
-  exit 1
-}
-
-cygwin=false
-if [[ "$(uname -a | fgrep Cygwin)" != "" ]]; then
-  cygwin=true
-fi
-
-if [ -z "$QPID_TOOLS" ]; then
-    if [ -z "$QPID_HOME" ]; then
-        die "QPID_TOOLS must be set"
-    else
-        QPID_TOOLS=$QPID_HOME
-    fi
-fi
-
-if $cygwin; then
-  QPID_TOOLS=$(cygpath -w $QPID_TOOLS)
-fi
-
-# Set classpath to include Qpid jar with all required jars in manifest
-QPID_LIBS=$QPID_TOOLS/lib/qpid-incubating.jar
-
-# Set other variables used by the qpid-run script before calling
-export JAVA=java \
-       JAVA_VM=-server \
-       JAVA_OPTS=-Dlog4j.configuration=file:$QPID_TOOLS/etc/mstool-log4j.xml \
-       QPID_CLASSPATH=$QPID_LIBS
-
-. qpid-run org.apache.qpid.tools.messagestore.MessageStoreTool "$@"
diff --git a/qpid/java/broker/bin/qpid-passwd b/qpid/java/broker/bin/qpid-passwd
deleted file mode 100755
index 9e3ee4ff4a..0000000000
--- a/qpid/java/broker/bin/qpid-passwd
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/bash
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-# Set classpath to include Qpid jar with all required jars in manifest
-QPID_LIBS=$QPID_HOME/lib/qpid-incubating.jar
-
-# Set other variables used by the qpid-run script before calling
-export JAVA=java \
-       JAVA_VM=-server \
-       JAVA_MEM=-Xmx1024m \
-       QPID_CLASSPATH=$QPID_LIBS
-
-. qpid-run org.apache.qpid.tools.security.Passwd "$@"
diff --git a/qpid/java/broker/bin/qpid-server b/qpid/java/broker/bin/qpid-server
deleted file mode 100755
index f1f4d72e64..0000000000
--- a/qpid/java/broker/bin/qpid-server
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/bash
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-# Set classpath to include Qpid jar with all required jars in manifest
-QPID_LIBS=$QPID_HOME/lib/qpid-incubating.jar:$QPID_HOME/lib/bdbstore-launch.jar
-
-# Set other variables used by the qpid-run script before calling
-export JAVA=java \
-       JAVA_VM=-server \
-       JAVA_MEM=-Xmx1024m \
-       JAVA_GC="-XX:-UseConcMarkSweepGC -XX:+HeapDumpOnOutOfMemoryError" \
-       QPID_CLASSPATH=$QPID_LIBS
-
-. qpid-run org.apache.qpid.server.Main "$@"
diff --git a/qpid/java/broker/bin/qpid-server-bdb.bat b/qpid/java/broker/bin/qpid-server-bdb.bat
deleted file mode 100644
index 8964e577df..0000000000
--- a/qpid/java/broker/bin/qpid-server-bdb.bat
+++ /dev/null
@@ -1,22 +0,0 @@
-@REM

-@REM Licensed to the Apache Software Foundation (ASF) under one

-@REM or more contributor license agreements.  See the NOTICE file

-@REM distributed with this work for additional information

-@REM regarding copyright ownership.  The ASF licenses this file

-@REM to you under the Apache License, Version 2.0 (the

-@REM "License"); you may not use this file except in compliance

-@REM with the License.  You may obtain a copy of the License at

-@REM 

-@REM   http://www.apache.org/licenses/LICENSE-2.0

-@REM 

-@REM Unless required by applicable law or agreed to in writing,

-@REM software distributed under the License is distributed on an

-@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-@REM KIND, either express or implied.  See the License for the

-@REM specific language governing permissions and limitations

-@REM under the License.

-@REM

-

-set BDBSTORE_HOME=c:\qpid\trunk\java\bdbstore

-set QPID_MODULE_JARS=%BDBSTORE_HOME%\target\qpid-bdbstore-1.0-incubating-M2-SNAPSHOT.jar;%BDBSTORE_HOME%\lib\bdb\je-3.1.0.jar

-.\qpid-server.bat
\ No newline at end of file
diff --git a/qpid/java/broker/bin/qpid-server.bat b/qpid/java/broker/bin/qpid-server.bat
deleted file mode 100644
index a99022cd2d..0000000000
--- a/qpid/java/broker/bin/qpid-server.bat
+++ /dev/null
@@ -1,70 +0,0 @@
-@REM

-@REM Licensed to the Apache Software Foundation (ASF) under one

-@REM or more contributor license agreements.  See the NOTICE file

-@REM distributed with this work for additional information

-@REM regarding copyright ownership.  The ASF licenses this file

-@REM to you under the Apache License, Version 2.0 (the

-@REM "License"); you may not use this file except in compliance

-@REM with the License.  You may obtain a copy of the License at

-@REM 

-@REM   http://www.apache.org/licenses/LICENSE-2.0

-@REM 

-@REM Unless required by applicable law or agreed to in writing,

-@REM software distributed under the License is distributed on an

-@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-@REM KIND, either express or implied.  See the License for the

-@REM specific language governing permissions and limitations

-@REM under the License.

-@REM

-

-echo off

-REM Script to run the Qpid Java Broker

-

-rem Guess QPID_HOME if not defined

-set CURRENT_DIR=%cd%

-if not "%QPID_HOME%" == "" goto gotHome

-set QPID_HOME=%CURRENT_DIR%

-echo %QPID_HOME%

-if exist "%QPID_HOME%\bin\qpid-server.bat" goto okHome

-cd ..

-set QPID_HOME=%cd%

-cd %CURRENT_DIR%

-:gotHome

-if exist "%QPID_HOME%\bin\qpid-server.bat" goto okHome

-echo The QPID_HOME environment variable is not defined correctly

-echo This environment variable is needed to run this program

-goto end

-:okHome

-

-if not "%JAVA_HOME%" == "" goto gotJavaHome

-echo The JAVA_HOME environment variable is not defined

-echo This environment variable is needed to run this program

-goto exit

-:gotJavaHome

-if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome

-goto okJavaHome

-:noJavaHome

-echo The JAVA_HOME environment variable is not defined correctly

-echo This environment variable is needed to run this program.

-goto exit

-:okJavaHome

-

-rem Slurp the command line arguments. This loop allows for an unlimited number

-rem of agruments (up to the command line limit, anyway).

-set QPID_ARGS=%1

-if ""%1""=="""" goto runCommand

-shift

-:loop

-if ""%1""=="""" goto runCommand

-set QPID_ARGS=%QPID_ARGS% %1

-shift

-goto loop

-

-rem QPID_OPTS intended to hold any -D props for use

-rem user must enclose any value for QPID_OPTS in double quotes

-:runCommand

-set LAUNCH_JAR=%QPID_HOME%\lib\qpid-incubating.jar

-set MODULE_JARS=%QPID_MODULE_JARS%

-"%JAVA_HOME%\bin\java" -server -Xmx1024m %QPID_OPTS% -DQPID_HOME="%QPID_HOME%" -cp "%LAUNCH_JAR%;%MODULE_JARS%" org.apache.qpid.server.Main %QPID_ARGS%

-

-:end

diff --git a/qpid/java/broker/bin/qpid.start b/qpid/java/broker/bin/qpid.start
deleted file mode 100755
index 0793aed84c..0000000000
--- a/qpid/java/broker/bin/qpid.start
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-qpid-server -run:debug "$@"
\ No newline at end of file
diff --git a/qpid/java/broker/bin/qpid.stop b/qpid/java/broker/bin/qpid.stop
deleted file mode 100755
index 6482fc3293..0000000000
--- a/qpid/java/broker/bin/qpid.stop
+++ /dev/null
@@ -1,137 +0,0 @@
-#!/bin/bash
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-# qpid.stop Script
-# 
-# Script checks for a given pid running PROGRAM and attempts to quit it
-#
-
-MAX_ATTEMPTS=1
-SLEEP_DELAY=1
-PROGRAM="DQPID"
-
-
-#
-# Print what is going to be done
-#
-printActions()
-{
-#ps=`ps o command p $1|grep $PROGRAM`
-ps=`ps -o args -p $1|grep $PROGRAM`
-echo "Attempting to kill: $ps"
-}
-
-#
-# Forcably Quit the specified PID($1)
-#
-forceQuit()
-{
-kill -9 $1
-}
-
-
-#
-# Gracefully ask the PID($1) to quit
-#
-quit()
-{
-kill $1
-}
-
-#
-# Grep the ps log for the PID ($1) to ensure that it has quit
-#
-lookup()
-{
-result=`ps -o args -p $1 |grep -v grep |grep $PROGRAM |wc -l`
-}
-
-#
-# Sleep and then check then lookup the PID($1) to ensure it has quit
-#
-check()
-{
-echo "Waiting $SLEEP_DELAY second for $1 to exit"
-sleep $SLEEP_DELAY
-lookup $1
-}
-
-
-
-#
-# Verify the PID($1) is available
-#
-verifyPid()
-{
-lookup $1
-if [[ $[$result] == 1 ]] ; then
- brokerspid=$1
-else
- echo "Unable to locate Qpid Process with PID $1"
- exit -1
-fi
-}
-
-#
-# Main Run
-#
-
-# Check if we are killing all qpid pids or just one.
-if [[ $# == 0 ]] ; then
-	echo "Killing All Qpid Brokers for user: '$USER'"
-	qpid.stopall
-	exit $?
-else	
-	verifyPid $1
-fi
-
-printActions $brokerspid
-
-# Attempt to quit the process MAX_ATTEMPTS Times
-attempt=0
-while [[ $[$result] > 0 && $[$attempt] < $[$MAX_ATTEMPTS] ]] ; do
- quit $brokerspid
- check $brokerspid
- attempt=$[$attempt + 1]
-done
-
-# Check that it has quit
-if [[ $[$result] == 0 ]] ; then
- echo "Process quit"
- exit 0
-else
-
- # Now attempt to force quit the process
- attempt=0
- while [[ $[$result] > 0 && $[$attempt] < $[$MAX_ATTEMPTS] ]] ; do
-  forceQuit $brokerspid
-  check $brokerspid
-  attempt=$[$attempt + 1]
- done
-
-
- # Output final status
- if [[ $[$result] > 0 && $[$attempt] == $[$MAX_ATTEMPTS] ]] ; then
-	echo "Stopped trying to kill process: $brokerspid"
-	echo "Attempted to stop $attempt times"
- else
-	echo "Done "
- fi
-fi
diff --git a/qpid/java/broker/bin/qpid.stopall b/qpid/java/broker/bin/qpid.stopall
deleted file mode 100755
index d71f591de8..0000000000
--- a/qpid/java/broker/bin/qpid.stopall
+++ /dev/null
@@ -1,74 +0,0 @@
-#!/bin/bash
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-# qpid.stopall script
-# 
-# Script attempts to stop all PROGRAMs running under the current user 
-#  Utilises qpid.stop to perform the actual stopping
-#
-
-PROGRAM="DQPID"
-
-#
-# grep ps for instances of $PROGRAM and collect PIDs
-#
-lookup()
-{
-#pids=`ps o pid,command  | grep $PROGRAM | grep -v grep | cut -d ' ' -f 1`
-pids=`ps -ef |grep $USER | grep $PROGRAM | grep -v grep | awk '{print $2}'`
-result=`echo -n $pids | wc -w`
-}
-
-
-#
-# Show the PS output for given set of pids
-#
-showPids()
-{
-ps -o user,pid,args -p $pids
-}
-
-
-#
-# Main Run
-#
-
-lookup
-
-if [[ $[$result] == 0 ]] ; then
- echo "No Qpid Brokers found running under user '$USER'"
- exit 0
-fi
-
-for pid in $pids ; do
-
-qpid.stop $pid
-
-done
-
-# Check we have quit all
-lookup
-
-if [[ $[$result] == 0 ]] ; then
- echo "All Qpid brokers successfully quit"
-else
- echo "Some brokers were not quit"
- showPids $pids
-fi
diff --git a/qpid/java/broker/bin/run.bat b/qpid/java/broker/bin/run.bat
deleted file mode 100755
index 5b0aa0f23b..0000000000
--- a/qpid/java/broker/bin/run.bat
+++ /dev/null
@@ -1,31 +0,0 @@
-@REM

-@REM Licensed to the Apache Software Foundation (ASF) under one

-@REM or more contributor license agreements.  See the NOTICE file

-@REM distributed with this work for additional information

-@REM regarding copyright ownership.  The ASF licenses this file

-@REM to you under the Apache License, Version 2.0 (the

-@REM "License"); you may not use this file except in compliance

-@REM with the License.  You may obtain a copy of the License at

-@REM 

-@REM   http://www.apache.org/licenses/LICENSE-2.0

-@REM 

-@REM Unless required by applicable law or agreed to in writing,

-@REM software distributed under the License is distributed on an

-@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-@REM KIND, either express or implied.  See the License for the

-@REM specific language governing permissions and limitations

-@REM under the License.

-@REM

-

-@echo off

-set CORE_CLASSES=..\classes;..\testclasses

-

-set COMMONDIR=..\..\common

-

-set COMMONLIB=%COMMONDIR%\lib\slf4j\slf4j-simple.jar;%COMMONDIR%\lib\logging-log4j\log4j-1.2.9.jar;%COMMONDIR%\lib\mina\mina-core-0.9.2.jar

-

-set DIST=..\lib\bdb\je-3.0.12.jar;..\dist\amqpd.jar;..\..\client\dist\amqp-common.jar

-

-set CP=%CORE_CLASSES%;%DIST%;%COMMONLIB%

-

-"%JAVA_HOME%\bin\java" -Xmx512m -Damqj.logging.level=INFO -cp %CP% %*

diff --git a/qpid/java/broker/bin/run.sh b/qpid/java/broker/bin/run.sh
deleted file mode 100755
index 6b62049e94..0000000000
--- a/qpid/java/broker/bin/run.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/bash
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-
-COMMONDIR=../../common
-
-COMMONLIB=$COMMONLIB:$COMMONDIR/lib/slf4j/slf4j-simple.jar
-COMMONLIB=$COMMONLIB:$COMMONDIR/lib/logging-log4j/log4j-1.2.13.jar
-COMMONLIB=$COMMONLIB:$COMMONDIR/lib/mina/mina-core-0.9.5-SNAPSHOT.jar
-COMMONLIB=$COMMONLIB:$COMMONDIR/lib/mina/mina-filter-ssl-0.9.5-SNAPSHOT.jar
-COMMONLIB=$COMMONLIB:$COMMONDIR/lib/commons-collections/commons-collections-3.1.jar
-COMMONLIB=$COMMONLIB:$COMMONDIR/lib/commons-cli/commons-cli-1.0.jar
-COMMONLIB=$COMMONLIB:$COMMONDIR/lib/commons-configuration/commons-configuration-1.2.jar
-COMMONLIB=$COMMONLIB:$COMMONDIR/lib/commons-logging/commons-logging-api.jar
-COMMONLIB=$COMMONLIB:$COMMONDIR/lib/commons-logging/commons-logging.jar
-COMMONLIB=$COMMONLIB:$COMMONDIR/lib/commons-lang/commons-lang-2.1.jar
-COMMONLIB=$COMMONLIB:$COMMONDIR/lib/junit/junit-4.0.jar
-
-DIST=../lib/bdb/je-3.0.12.jar:../dist/amqpd-tests.jar:../dist/amqpd.jar:../../client/dist/amqp-common.jar
-
-CP=../intellijclasses:$DIST:$COMMONLIB
-
-if [ "$(uname -a | fgrep Cygwin)" != "" ]; then
-    CP=$(cygpath --mixed --path $CP)
-fi
-
-"$JAVA_HOME/bin/java" -Xmx512m -Dprepopulate=10 -Damqj.logging.level=INFO -cp $CP $*
diff --git a/qpid/java/broker/bin/runAll b/qpid/java/broker/bin/runAll
deleted file mode 100755
index 4ced1d263b..0000000000
--- a/qpid/java/broker/bin/runAll
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-doRun()
-{
-    class=$1
-    shift
-    echo
-    echo ================================================================================
-    echo Running $class
-    ./run.sh $class "$@"
-}
-
-# parameters are: clients messages iterations
-doRun org.apache.qpid.server.queue.SendPerfTest 10 1000 100
-
-doRun org.apache.qpid.server.queue.QueuePerfTest
-
-doRun org.apache.qpid.server.queue.QueueConcurrentPerfTest
diff --git a/qpid/java/broker/build.xml b/qpid/java/broker/build.xml
deleted file mode 100644
index f2a6a687d5..0000000000
--- a/qpid/java/broker/build.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<!--
- -
- - Licensed to the Apache Software Foundation (ASF) under one
- - or more contributor license agreements.  See the NOTICE file
- - distributed with this work for additional information
- - regarding copyright ownership.  The ASF licenses this file
- - to you under the Apache License, Version 2.0 (the
- - "License"); you may not use this file except in compliance
- - with the License.  You may obtain a copy of the License at
- - 
- -   http://www.apache.org/licenses/LICENSE-2.0
- - 
- - Unless required by applicable law or agreed to in writing,
- - software distributed under the License is distributed on an
- - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- - KIND, either express or implied.  See the License for the
- - specific language governing permissions and limitations
- - under the License.
- -
- -->
-<project name="AMQ Broker" default="build">
-
-  <property name="module.depends" value="common"/>
-  <property name="module.main" value="org.apache.qpid.server.Main"/>
-  <property name="module.vm.version" value="1.5"/>
-
-  <import file="../module.xml"/>
-
-  <property name="output.dir" value="${module.precompiled}/org/apache/qpid/server/filter/jms/selector"/>
-
-  <target name="precompile">
-    <mkdir dir="${output.dir}"/>
-    <exec executable="javacc">
-      <arg line="-OUTPUT_DIRECTORY=${output.dir} src/main/grammar/SelectorParser.jj"/>
-    </exec>
-  </target>
-
-</project>
diff --git a/qpid/java/broker/distribution/pom.xml b/qpid/java/broker/distribution/pom.xml
deleted file mode 100644
index 3617296003..0000000000
--- a/qpid/java/broker/distribution/pom.xml
+++ /dev/null
@@ -1,153 +0,0 @@
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements. See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership. The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License. You may obtain a copy of the License at
-    
-    http://www.apache.org/licenses/LICENSE-2.0
-    
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied. See the License for the
-    specific language governing permissions and limitations
-    under the License.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.apache.qpid</groupId>
-    <artifactId>qpid-broker-distribution</artifactId>
-    <packaging>jar</packaging>
-    <version>1.0-incubating-M3-SNAPSHOT</version>
-    <name>Qpid Broker Distributions</name>
-    <url>http://cwiki.apache.org/confluence/display/qpid</url>
-
-    <parent>
-        <groupId>org.apache.qpid</groupId>
-        <artifactId>qpid</artifactId>
-        <version>1.0-incubating-M3-SNAPSHOT</version>
-    </parent>
-
-    <properties>
-        <topDirectoryLocation>..</topDirectoryLocation>
-        <java.source.version>1.5</java.source.version>
-        <qpid.version>${pom.version}</qpid.version>
-        <qpid.targetDir>${project.build.directory}</qpid.targetDir>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.qpid</groupId>
-            <artifactId>qpid-broker</artifactId>
-            <type>jar</type>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-compiler-plugin</artifactId>
-                    <configuration>
-                        <source>${java.source.version}</source>
-                        <target>${java.source.version}</target>
-                    </configuration>
-                </plugin>
-
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-assembly-plugin</artifactId>
-                    <version>${assembly.version}</version>
-                    <configuration>
-                            <descriptors>
-                                <descriptor>src/main/assembly/broker-bin.xml</descriptor>
-                            </descriptors>
-                        <finalName>qpid-${pom.version}</finalName>
-                        <outputDirectory>${qpid.targetDir}</outputDirectory>
-                        <tarLongFileMode>gnu</tarLongFileMode>
-                    </configuration>
-                </plugin>
-
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-jar-plugin</artifactId>
-                 <configuration>
-                        <finalName>qpid-incubating</finalName>
-                        <archive>
-                            <manifest>
-                                <addClasspath>true</addClasspath>
-                            </manifest>
-                        </archive>
-                    </configuration>
-                </plugin>
-
-            </plugins>
-        </pluginManagement>
-
-        <plugins>
-            <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>distribution-package</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                        <configuration>
-                            <descriptors>
-                                <descriptor>src/main/assembly/broker-bin.xml</descriptor>
-                                <descriptor>src/main/assembly/broker-src.xml</descriptor>
-                            </descriptors>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-
-    </build>
-
-    <profiles>
-        <profile>
-             <id>tests</id>
-
-            <dependencies>
-                <dependency>
-                    <groupId>org.apache.qpid</groupId>
-                    <artifactId>qpid-broker</artifactId>
-                    <type>test-jar</type>
-                    <version>${project.version}</version>
-                </dependency>
-            </dependencies>
-
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-assembly-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>distribution-package</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>single</goal>
-                                </goals>
-                                <configuration>
-                                    <descriptors>
-                                        <descriptor>src/main/assembly/broker-bin-tests.xml</descriptor>
-                                    </descriptors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-
-            </build>
-        </profile>
-    </profiles>
-</project>
diff --git a/qpid/java/broker/distribution/src/main/assembly/broker-bin-tests.xml b/qpid/java/broker/distribution/src/main/assembly/broker-bin-tests.xml
deleted file mode 100644
index fa017d6232..0000000000
--- a/qpid/java/broker/distribution/src/main/assembly/broker-bin-tests.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<assembly>
-  <id>java-broker-bin-with-tests</id>
-  <includeBaseDirectory>false</includeBaseDirectory>
-  <formats>
-    <format>tar.gz</format>
-    <format>zip</format>
-  </formats>
-
-  <fileSets>
-      <fileSet>
-          <!-- Apache license files -->
-          <directory>../../resources</directory>
-          <outputDirectory>qpid-${qpid.version}</outputDirectory>
-          <includes>
-              <include>DISCLAIMER</include>
-              <include>LICENSE.txt</include>
-              <include>NOTICE.txt</include>
-              <include>README.txt</include>
-          </includes>
-      </fileSet>
-
-      <fileSet>
-          <directory>../../release-docs</directory>
-          <outputDirectory>qpid-${qpid.version}/docs</outputDirectory>
-          <includes>
-              <include>RELEASE_NOTES.txt</include>
-          </includes>
-      </fileSet>
-
-    <!-- Include easy access to test source-->
-      <fileSet>
-          <directory>../src/test</directory>
-          <outputDirectory>qpid-${qpid.version}/src</outputDirectory>
-          <includes>
-              <include>**/*.java</include>
-          </includes>
-      </fileSet>
-
-    <!-- Execution Scripts -->
-      <fileSet>
-          <directory>../bin/</directory>
-          <outputDirectory>qpid-${qpid.version}/bin</outputDirectory>
-          <includes>
-              <include>**/*</include>
-          </includes>
-          <fileMode>777</fileMode> <!-- RWX -->
-      </fileSet>
-
-    <!-- Configuration -->
-      <fileSet>
-          <directory>../etc/</directory>
-          <outputDirectory>qpid-${qpid.version}/etc</outputDirectory>
-          <includes>
-              <include>**/*</include>
-          </includes>
-          <fileMode>420</fileMode>
-      </fileSet>
-
-    <!-- Metadata Jar -->
-      <fileSet>
-          <directory>target</directory>
-          <outputDirectory>qpid-${qpid.version}/lib</outputDirectory>
-          <includes>
-              <include>qpid-incubating.jar</include>
-          </includes>
-      </fileSet>
-  </fileSets>
-
-
-  <files>
-    <!-- Common Run scripts -->
-    <file>
-        <source>../../common/bin/qpid-run</source>
-        <outputDirectory>qpid-${qpid.version}/bin</outputDirectory>
-        <destName>qpid-run</destName>
-        <fileMode>493</fileMode>
-    </file>
-
-    <!-- Common Configuration -->
-    <file>
-        <source>../../common/etc/qpid-run.conf</source>
-        <outputDirectory>qpid-${qpid.version}/etc</outputDirectory>
-        <destName>qpid-run.conf</destName>
-        <fileMode>420</fileMode>
-    </file>
-  </files>
-
-  <dependencySets>
-      <dependencySet>
-          <outputDirectory>qpid-${qpid.version}/lib</outputDirectory>
-          <unpack>false</unpack>
-           <excludes>
-               <exclude>org.apache.qpid:qpid-broker-distribution</exclude>
-          </excludes>
-      </dependencySet>
-  </dependencySets>
-</assembly>
diff --git a/qpid/java/broker/distribution/src/main/assembly/broker-bin.xml b/qpid/java/broker/distribution/src/main/assembly/broker-bin.xml
deleted file mode 100644
index e66190a3f4..0000000000
--- a/qpid/java/broker/distribution/src/main/assembly/broker-bin.xml
+++ /dev/null
@@ -1,183 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<assembly>
-  <!-- id typically identifies the "type" (src vs bin etc) of the assembly -->
-  <id>java-broker-bin</id>
-  <includeBaseDirectory>false</includeBaseDirectory>
-  <formats>
-    <format>tar.gz</format>
-    <format>zip</format>
-  </formats>
-
-  <fileSets>
-  <!-- Apache Licensing -->
-    <fileSet>
-      <directory>../../resources</directory>
-      <outputDirectory>qpid-${qpid.version}</outputDirectory>
-      <includes>
-          <include>DISCLAIMER</include>
-          <include>LICENSE.txt</include>
-          <include>NOTICE.txt</include>
-          <include>README.txt</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>../..</directory>
-      <outputDirectory>qpid-${qpid.version}</outputDirectory>
-      <includes>
-          <include>*.txt</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>../../src/main/release-docs</directory>
-      <outputDirectory>qpid-${qpid.version}/docs</outputDirectory>
-      <includes>
-          <include>RELEASE_NOTES.txt</include>
-      </includes>
-    </fileSet>
-
-    <!-- Metadata Jar -->
-    <fileSet>
-      <directory>target</directory>
-      <outputDirectory>qpid-${qpid.version}/lib</outputDirectory>
-      <includes>
-          <include>qpid-incubating.jar</include>
-      </includes>
-    </fileSet>
-  </fileSets>
-  <files>
-    <!-- due to a bug in the assembly plugin (MASSEMBLY-153) you have
-         to use decimal numbers to specify fileMode -->
-    <file>
-      <source>../../common/etc/qpid-run.conf</source>
-      <outputDirectory>qpid-${qpid.version}/etc</outputDirectory>
-      <destName>qpid-run.conf</destName>
-      <fileMode>420</fileMode>
-    </file>
-    <file>
-      <source>../etc/config.xml</source>
-      <outputDirectory>qpid-${qpid.version}/etc</outputDirectory>
-      <destName>config.xml</destName>
-      <fileMode>420</fileMode>
-    </file>
-    <file>
-      <source>../etc/jmxremote.access</source>
-      <outputDirectory>qpid-${qpid.version}/etc</outputDirectory>
-      <destName>jmxremote.access</destName>
-      <fileMode>420</fileMode>
-    </file>
-    <file>
-      <source>../etc/log4j.xml</source>
-      <outputDirectory>qpid-${qpid.version}/etc</outputDirectory>
-      <destName>log4j.xml</destName>
-      <fileMode>420</fileMode>
-    </file>
-    <file>
-      <source>../etc/passwd</source>
-      <outputDirectory>qpid-${qpid.version}/etc</outputDirectory>
-      <destName>passwd</destName>
-      <fileMode>420</fileMode>
-    </file>
-    <file>
-      <source>../etc/qpid-server.conf</source>
-      <outputDirectory>qpid-${qpid.version}/etc</outputDirectory>
-      <destName>qpid-server.conf</destName>
-      <fileMode>420</fileMode>
-    </file>
-    <file>
-      <source>../etc/virtualhosts.xml</source>
-      <outputDirectory>qpid-${qpid.version}/etc</outputDirectory>
-      <destName>virtualhosts.xml</destName>
-      <fileMode>420</fileMode>
-    </file>
-    <file>
-      <source>../../common/bin/qpid-run</source>
-      <outputDirectory>qpid-${qpid.version}/bin</outputDirectory>
-      <destName>qpid-run</destName>
-      <fileMode>473</fileMode>
-    </file>
-    <file>
-      <source>../bin/qpid-passwd</source>
-      <outputDirectory>qpid-${qpid.version}/bin</outputDirectory>
-      <destName>qpid-passwd</destName>
-      <fileMode>473</fileMode>
-    </file>
-    <file>
-      <source>../bin/qpid-server</source>
-      <outputDirectory>qpid-${qpid.version}/bin</outputDirectory>
-      <destName>qpid-server</destName>
-      <fileMode>473</fileMode>
-    </file>
-    <file>
-      <source>../bin/qpid-server.bat</source>
-      <outputDirectory>qpid-${qpid.version}/bin</outputDirectory>
-      <destName>qpid-server.bat</destName>
-      <fileMode>473</fileMode>
-    </file>
-    <file>
-      <source>../bin/run.bat</source>
-      <outputDirectory>qpid-${qpid.version}/bin</outputDirectory>
-      <destName>run.bat</destName>
-      <fileMode>473</fileMode>
-    </file>
-    <file>
-      <source>../bin/run.sh</source>
-      <outputDirectory>qpid-${qpid.version}/bin</outputDirectory>
-      <destName>run.sh</destName>
-      <fileMode>473</fileMode>
-    </file>
-    <file>
-      <source>../bin/runAll</source>
-      <outputDirectory>qpid-${qpid.version}/bin</outputDirectory>
-      <destName>runAll</destName>
-      <fileMode>473</fileMode>
-    </file>
-  </files>
-
-  <dependencySets>
-    <dependencySet>
-      <outputDirectory>qpid-${qpid.version}/lib</outputDirectory>
-      <unpack>false</unpack>
-      <!-- This needs to be tidied up QPID-280 -->
-      <excludes>
-        <exclude>org.apache.qpid:qpid-broker-distribution</exclude>
-        <exclude>org.apache.qpid.management:org.apache.qpid.management.ui</exclude>
-        <exclude>org.eclipse.core:org.eclipse.core.commands</exclude>
-        <exclude>org.eclipse.core:org.eclipse.core.contenttype</exclude>
-        <exclude>org.eclipse.core:org.eclipse.core.expressions</exclude>
-        <exclude>org.eclipse.core:org.eclipse.core.jobs</exclude>
-        <exclude>org.eclipse.core:org.eclipse.core.runtime</exclude>
-        <exclude>org.eclipse.core:org.eclipse.core.runtime.compatibility.auth</exclude>
-        <exclude>org.eclipse.core:org.eclipse.core.runtime.compatibility.registry</exclude>
-        <exclude>org.eclipse.equinox:org.eclipse.equinox.common</exclude>
-        <exclude>org.eclipse.equinox:org.eclipse.equinox.preferences</exclude>
-        <exclude>org.eclipse.equinox:org.eclipse.equinox.registry</exclude>
-        <exclude>org.eclipse.help:org.eclipse.help</exclude>
-        <exclude>org.eclipse.jface:org.eclipse.jface</exclude>
-        <exclude>org.eclipse.osgi:org.eclipse.osgi</exclude>
-        <exclude>org.eclipse.swt:org.eclipse.swt</exclude>
-        <exclude>org.eclipse.swt:org.eclipse.swt.win32.win32.x86</exclude>
-        <exclude>org.eclipse.ui:org.eclipse.ui</exclude>
-        <exclude>org.eclipse.ui:org.eclipse.ui.forms</exclude>
-        <exclude>org.eclipse.ui:org.eclipse.ui.workbench</exclude>
-      </excludes>
-    </dependencySet>
-  </dependencySets>
-</assembly>
diff --git a/qpid/java/broker/distribution/src/main/assembly/broker-src.xml b/qpid/java/broker/distribution/src/main/assembly/broker-src.xml
deleted file mode 100644
index 28a22c3851..0000000000
--- a/qpid/java/broker/distribution/src/main/assembly/broker-src.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<assembly>
-  <!-- id typically identifies the "type" (src vs bin etc) of the assembly -->
-  <id>java-broker-src</id>
-  <includeBaseDirectory>false</includeBaseDirectory>
-  <formats>
-    <format>tar.gz</format>
-    <format>zip</format>
-  </formats>
-
-  <fileSets>
-  <!-- Apache Licensing -->
-    <fileSet>
-      <directory>../../resources</directory>
-      <outputDirectory>qpid-${qpid.version}-src</outputDirectory>
-      <includes>
-        <include>DISCLAIMER</include>
-        <include>LICENSE.txt</include>
-        <include>licenses/*.*</include>
-        <include>NOTICE.txt</include>
-        <include>README.txt</include>
-        <include>BUILDING.txt</include>
-      </includes>
-    </fileSet>
-    <!-- Broker source -->
-    <fileSet>
-      <directory>..</directory>
-      <outputDirectory>qpid-${qpid.version}-src</outputDirectory>
-      <includes>
-        <include>**/*</include>
-      </includes>
-      <!-- Tidy up wrt to QPID-280 -->
-      <excludes>
-        <exclude>build.xml</exclude>
-        <exclude>distribution/build.xml</exclude>
-        <exclude>benchmark</exclude>
-        <exclude>benchmark/**/*</exclude>
-        <exclude>**/target</exclude>
-        <exclude>**/target/**/*</exclude>
-        <exclude>**/build</exclude>
-        <exclude>**/build/**/*</exclude>
-        <exclude>**/.settings</exclude>
-        <exclude>**/.classpath</exclude>
-        <exclude>**/.project</exclude>
-        <exclude>**/.wtpmodules</exclude>
-        <exclude>**/surefire*</exclude>
-        <exclude>**/cobertura.ser</exclude>
-        <exclude>bin</exclude>
-        <exclude>bin/*</exclude>
-        <exclude>lib</exclude>
-        <exclude>lib/**/*</exclude>
-        <exclude>**/var/journal</exclude>
-        <exclude>**/build.out*</exclude>
-        <exclude>**/eclipse-plugin/bin/**</exclude>
-        <exclude>**/eclipse-plugin/plugins/**</exclude>
-        <exclude>**/eclipse-plugin/src/main/resources/**</exclude>
-      </excludes>
-    </fileSet>
-  </fileSets>
-</assembly>
diff --git a/qpid/java/broker/etc/access b/qpid/java/broker/etc/access
deleted file mode 100644
index 58b7443fa9..0000000000
--- a/qpid/java/broker/etc/access
+++ /dev/null
@@ -1,19 +0,0 @@
-#

-# Licensed to the Apache Software Foundation (ASF) under one

-# or more contributor license agreements.  See the NOTICE file

-# distributed with this work for additional information

-# regarding copyright ownership.  The ASF licenses this file

-# to you under the Apache License, Version 2.0 (the

-# "License"); you may not use this file except in compliance

-# with the License.  You may obtain a copy of the License at

-#

-#   http://www.apache.org/licenses/LICENSE-2.0

-#

-# Unless required by applicable law or agreed to in writing,

-# software distributed under the License is distributed on an

-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-# KIND, either express or implied.  See the License for the

-# specific language governing permissions and limitations

-# under the License.

-

-guest:localhost(rw),test(rw)
\ No newline at end of file
diff --git a/qpid/java/broker/etc/config.xml b/qpid/java/broker/etc/config.xml
deleted file mode 100644
index 1bb2eb5157..0000000000
--- a/qpid/java/broker/etc/config.xml
+++ /dev/null
@@ -1,186 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- -
- - Licensed to the Apache Software Foundation (ASF) under one
- - or more contributor license agreements.  See the NOTICE file
- - distributed with this work for additional information
- - regarding copyright ownership.  The ASF licenses this file
- - to you under the Apache License, Version 2.0 (the
- - "License"); you may not use this file except in compliance
- - with the License.  You may obtain a copy of the License at
- - 
- -   http://www.apache.org/licenses/LICENSE-2.0
- - 
- - Unless required by applicable law or agreed to in writing,
- - software distributed under the License is distributed on an
- - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- - KIND, either express or implied.  See the License for the
- - specific language governing permissions and limitations
- - under the License.
- -
- -->
-<broker>
-    <prefix>${QPID_HOME}</prefix>
-    <work>${QPID_WORK}</work>
-    <conf>${prefix}/etc</conf>
-    <connector>
-        <!-- Uncomment out this block and edit the keystorePath and keystorePassword
-             to enable SSL support
-        <ssl>
-            <enabled>true</enabled>
-            <sslOnly>true</sslOnly>
-            <keystorePath>/path/to/keystore.ks</keystorePath>
-            <keystorePassword>keystorepass</keystorePassword>
-        </ssl>-->
-        <qpidnio>true</qpidnio>
-        <transport>nio</transport>
-        <port>5672</port>
-        <sslport>8672</sslport>
-        <socketReceiveBuffer>32768</socketReceiveBuffer>
-        <socketSendBuffer>32768</socketSendBuffer>
-    </connector>
-    <management>
-        <enabled>true</enabled>
-        <jmxport>8999</jmxport>
-        <security-enabled>false</security-enabled>
-    </management>
-    <advanced>
-        <filterchain enableExecutorPool="true"/>
-        <enablePooledAllocator>false</enablePooledAllocator>
-        <enableDirectBuffers>false</enableDirectBuffers>
-        <framesize>65535</framesize>
-        <compressBufferOnQueue>false</compressBufferOnQueue>
-    </advanced>
-
-    <security>
-        <principal-databases>
-            <principal-database>
-                <name>passwordfile</name>
-                <class>org.apache.qpid.server.security.auth.database.PlainPasswordVhostFilePrincipalDatabase</class>
-                <attributes>
-                    <attribute>
-                        <name>passwordFile</name>
-                        <value>${conf}/passwdVhost</value>
-                    </attribute>
-                </attributes>
-            </principal-database>
-
-            <!-- Example use of Base64 encoded MD5 hashes for authentication via CRAM-MD5-Hashed
-            <principal-database>
-                <name>passwordfile</name>
-                <class>org.apache.qpid.server.security.auth.database.Base64MD5PasswordFilePrincipalDatabase</class>
-                <attributes>
-                    <attribute>
-                        <name>passwordFile</name>
-                        <value>${conf}/qpid.passwd</value>
-                    </attribute>
-                </attributes>
-            </principal-database-->
-        </principal-databases>
-
-        <access>
-            <class>org.apache.qpid.server.security.access.AllowAll</class>
-        </access>
-        <jmx>
-            <access>${conf}/jmxremote.access</access>
-            <principal-database>passwordfile</principal-database>
-        </jmx>        
-    </security>
-
-    <virtualhosts>
-        <virtualhost>
-            <name>localhost</name>
-            <localhost>
-                <store>
-                    <!-- <class>org.apache.qpid.server.store.berkeleydb.BDBMessageStore</class>
-                    <environment-path>${work}/localhost-store</environment-path> -->
-
-                    <class>org.apache.qpid.server.store.MemoryMessageStore</class>
-                </store>
-                <txn>
-                    <environment-tx-timeout>60</environment-tx-timeout>
-                	  <!-- <class>org.apache.qpid.server.store.berkeleydb.txn.TransactionManagerImpl</class> -->
-                	  <class>org.apache.qpid.server.txn.MemoryTransactionManager</class>
-                </txn>
-
-                <security>
-                    <!-- Need protocol changes to allow this-->
-                    <authentication>
-                        <name>passwordfile</name>
-                        <!-- Currently this can't be used as Vhost isn't specified at connection start only connection open -->
-                        <mechanism>PLAIN</mechanism>
-                    </authentication>
-                    <access>
-                        <class>org.apache.qpid.server.security.access.PrincipalDatabaseAccessManager</class>
-                        <attributes>
-                            <attribute>
-                                <name>principalDatabase</name>
-                                <value>passwordfile</value>
-                            </attribute>
-                            <attribute>
-                                <name>defaultAccessManager</name>
-                                <value>DenyAll</value>
-                            </attribute>
-                        </attributes>
-                    </access>
-                </security>
-            </localhost>
-        </virtualhost>
-
-        <virtualhost>
-            <name>development</name>
-            <development>
-                <store>
-                    <class>org.apache.qpid.server.store.MemoryMessageStore</class>
-                </store>             
-                <txn>
-                  	  <class>org.apache.qpid.server.txn.MemoryTransactionManager</class>
-                </txn>
-                <security>
-                    <name>passwordfile-notusedyet</name>
-                    <mechanism>PLAIN</mechanism>
-                    <mechanism>CRAM-MD5</mechanism>
-                </security>
-            </development>
-        </virtualhost>
-
-        <virtualhost>
-            <name>test</name>
-            <test>
-                <store>                  
-                    <class>org.apache.qpid.server.store.MemoryMessageStore</class>
-                </store>             
-                <txn>
-                  	  <class>org.apache.qpid.server.txn.MemoryTransactionManager</class>
-                </txn>
-                <security>
-                    <name>passwordfile-notusedyet</name>
-                    <mechanism>PLAIN</mechanism>
-                    <mechanism>CRAM-MD5</mechanism>
-                </security>
-                <access>
-                    <class>org.apache.qpid.server.security.access.PrincipalDatabaseAccessManager</class>
-                    <attributes>
-                        <attribute>
-                            <name>principalDatabase</name>
-                            <value>rubbish-to-cause-default</value>
-                        </attribute>
-                    </attributes>
-                </access>
-
-            </test>
-        </virtualhost>
-
-    </virtualhosts>
-    <heartbeat>
-        <delay>0</delay>
-        <timeoutFactor>2.0</timeoutFactor>
-    </heartbeat>
-    <queue>
-        <auto_register>true</auto_register>
-    </queue>
-
-    <virtualhosts>${conf}/virtualhosts.xml</virtualhosts>
-</broker>
-
-
diff --git a/qpid/java/broker/etc/debug.log4j.xml b/qpid/java/broker/etc/debug.log4j.xml
deleted file mode 100644
index e8fd7e119d..0000000000
--- a/qpid/java/broker/etc/debug.log4j.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0"?>
-<!--
- -
- - Licensed to the Apache Software Foundation (ASF) under one
- - or more contributor license agreements.  See the NOTICE file
- - distributed with this work for additional information
- - regarding copyright ownership.  The ASF licenses this file
- - to you under the Apache License, Version 2.0 (the
- - "License"); you may not use this file except in compliance
- - with the License.  You may obtain a copy of the License at
- -
- -   http://www.apache.org/licenses/LICENSE-2.0
- -
- - Unless required by applicable law or agreed to in writing,
- - software distributed under the License is distributed on an
- - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- - KIND, either express or implied.  See the License for the
- - specific language governing permissions and limitations
- - under the License.
- -
- -->
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
-    <appender name="ArchivingFileAppender" class="org.apache.log4j.QpidCompositeRollingAppender">
-        <!-- Ensure that logs allways have the dateFormat set-->
-        <param name="StaticLogFileName" value="false"/>
-        <param name="File" value="${QPID_WORK}/log/${logprefix}qpid${logsuffix}.log"/>
-        <param name="Append" value="false"/>
-        <!-- Change the direction so newer files have bigger numbers -->
-        <!-- So log.1 is written then log.2 etc This prevents a lot of file renames at log rollover -->
-        <param name="CountDirection" value="1"/>
-        <!-- Use default 10MB -->
-        <!--param name="MaxFileSize" value="100000"/-->
-        <param name="DatePattern" value="'.'yyyy-MM-dd-HH-mm"/>
-        <!-- Unlimited number of backups -->
-        <param name="MaxSizeRollBackups" value="-1"/>
-        <!-- Compress(gzip) the backup files-->
-        <param name="CompressBackupFiles" value="true"/>
-        <!-- Compress the backup files using a second thread -->
-        <param name="CompressAsync" value="true"/>
-        <!-- Start at zero numbered files-->
-        <param name="ZeroBased" value="true"/>
-        <!-- Backup Location -->
-        <param name="backupFilesToPath" value="${QPID_WORK}/backup/log"/>
-
-        <layout class="org.apache.log4j.PatternLayout">
-            <param name="ConversionPattern" value="%d %-5p [%t] %C{2} (%F:%L) - %m%n"/>
-        </layout>
-    </appender>
-
-    <appender name="FileAppender" class="org.apache.log4j.FileAppender">
-        <param name="File" value="${QPID_WORK}/log/${logprefix}qpid${logsuffix}.log"/>
-        <param name="Append" value="false"/>
-
-        <layout class="org.apache.log4j.PatternLayout">
-            <param name="ConversionPattern" value="%d %-5p [%t] %C{2} (%F:%L) - %m%n"/>
-        </layout>
-    </appender>
-
-    <appender name="AlertFile" class="org.apache.log4j.FileAppender">
-        <param name="File" value="${QPID_WORK}/log/alert.log"/>
-        <param name="Append" value="false"/>
-
-        <layout class="org.apache.log4j.PatternLayout">
-            <param name="ConversionPattern" value="%d %-5p [%t] %C{2} (%F:%L) - %m%n"/>
-        </layout>
-    </appender>
-
-    <appender name="STDOUT" class="org.apache.log4j.ConsoleAppender">
-
-        <layout class="org.apache.log4j.PatternLayout">
-            <param name="ConversionPattern" value="%d %-5p [%t] %C{2} (%F:%L) - %m%n"/>
-        </layout>
-    </appender>
-
-    <category name="Qpid.Broker">
-        <priority value="debug"/>
-        <appender-ref ref="AlertFile"/>
-        <!--appender-ref ref="STDOUT"/-->        
-    </category>
-
-
-    <category name="org.apache.qpid.server.queue.AMQQueueMBean">
-        <priority value="info"/>
-        <appender-ref ref="AlertFile"/>
-    </category>
-
-
-    <!-- Provide warnings to standard output -->
-    <!--category name="org.apache.qpid">
-        <priority value="warn"/>
-        <appender-ref ref="STDOUT"/>
-    </category-->
-
-
-    <!-- Additional level settings for debugging -->
-    <!-- Each class in the Broker is a category that can have its logging level adjusted. -->
-    <!-- This will provide more details if available about that classes processing. -->
-    <!--category name="org.apache.qpid.server.txn">
-        <priority value="debug"/>
-    </category>-->
-
-    <!--<category name="org.apache.qpid.server.store">
-        <priority value="debug"/>
-    </category-->
-
-    <!-- Log all info events to file -->
-    <root>
-        <priority value="info"/>
-        <appender-ref ref="STDOUT"/>
-        <appender-ref ref="FileAppender"/>
-    </root>
-
-</log4j:configuration>
diff --git a/qpid/java/broker/etc/jmxremote.access b/qpid/java/broker/etc/jmxremote.access
deleted file mode 100644
index 1a51a6991b..0000000000
--- a/qpid/java/broker/etc/jmxremote.access
+++ /dev/null
@@ -1,23 +0,0 @@
-#

-# Licensed to the Apache Software Foundation (ASF) under one

-# or more contributor license agreements.  See the NOTICE file

-# distributed with this work for additional information

-# regarding copyright ownership.  The ASF licenses this file

-# to you under the Apache License, Version 2.0 (the

-# "License"); you may not use this file except in compliance

-# with the License.  You may obtain a copy of the License at

-#

-#   http://www.apache.org/licenses/LICENSE-2.0

-#

-# Unless required by applicable law or agreed to in writing,

-# software distributed under the License is distributed on an

-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-# KIND, either express or implied.  See the License for the

-# specific language governing permissions and limitations

-# under the License.

-

-#Generated by JMX Console : Last edited by user:admin

-#Tue Jun 12 16:46:39 BST 2007

-admin=admin

-guest=readonly

-user=readwrite

diff --git a/qpid/java/broker/etc/log4j.xml b/qpid/java/broker/etc/log4j.xml
deleted file mode 100644
index f40da7751e..0000000000
--- a/qpid/java/broker/etc/log4j.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0"?>
-<!--
- -
- - Licensed to the Apache Software Foundation (ASF) under one
- - or more contributor license agreements.  See the NOTICE file
- - distributed with this work for additional information
- - regarding copyright ownership.  The ASF licenses this file
- - to you under the Apache License, Version 2.0 (the
- - "License"); you may not use this file except in compliance
- - with the License.  You may obtain a copy of the License at
- -
- -   http://www.apache.org/licenses/LICENSE-2.0
- -
- - Unless required by applicable law or agreed to in writing,
- - software distributed under the License is distributed on an
- - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- - KIND, either express or implied.  See the License for the
- - specific language governing permissions and limitations
- - under the License.
- -
- -->
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
-    <appender name="ArchivingFileAppender" class="org.apache.log4j.QpidCompositeRollingAppender">
-        <!-- Ensure that logs allways have the dateFormat set-->
-        <param name="StaticLogFileName" value="false"/>
-        <param name="File" value="${QPID_WORK}/log/${logprefix}qpid${logsuffix}.log"/>
-        <param name="Append" value="false"/>
-        <!-- Change the direction so newer files have bigger numbers -->
-        <!-- So log.1 is written then log.2 etc This prevents a lot of file renames at log rollover -->
-        <param name="CountDirection" value="1"/>
-        <!-- Use default 10MB -->
-        <!--param name="MaxFileSize" value="100000"/-->
-        <param name="DatePattern" value="'.'yyyy-MM-dd-HH-mm"/>
-        <!-- Unlimited number of backups -->
-        <param name="MaxSizeRollBackups" value="-1"/>
-        <!-- Compress(gzip) the backup files-->
-        <param name="CompressBackupFiles" value="true"/>
-        <!-- Compress the backup files using a second thread -->
-        <param name="CompressAsync" value="true"/>
-        <!-- Start at zero numbered files-->
-        <param name="ZeroBased" value="true"/>
-        <!-- Backup Location -->
-        <param name="backupFilesToPath" value="${QPID_WORK}/backup/log"/>
-
-        <layout class="org.apache.log4j.PatternLayout">
-            <param name="ConversionPattern" value="%d %-5p [%t] %C{2} (%F:%L) - %m%n"/>
-        </layout>
-    </appender>
-
-    <appender name="FileAppender" class="org.apache.log4j.FileAppender">
-        <param name="File" value="${QPID_WORK}/log/${logprefix}qpid${logsuffix}.log"/>
-        <param name="Append" value="false"/>
-
-        <layout class="org.apache.log4j.PatternLayout">
-            <param name="ConversionPattern" value="%d %-5p [%t] %C{2} (%F:%L) - %m%n"/>
-        </layout>
-    </appender>
-
-    <appender name="AlertFile" class="org.apache.log4j.FileAppender">
-        <param name="File" value="${QPID_WORK}/log/alert.log"/>
-        <param name="Append" value="false"/>
-
-        <layout class="org.apache.log4j.PatternLayout">
-            <param name="ConversionPattern" value="%d %-5p [%t] %C{2} (%F:%L) - %m%n"/>
-        </layout>
-    </appender>
-
-    <appender name="STDOUT" class="org.apache.log4j.ConsoleAppender">
-        <layout class="org.apache.log4j.PatternLayout">
-            <param name="ConversionPattern" value="%d %-5p [%t] %C{2} (%F:%L) - %m%n"/>
-        </layout>
-    </appender>
-
-    <category name="Qpid.Broker">
-        <priority value="debug"/>
-        <appender-ref ref="AlertFile"/>
-        
-    </category>
-
-    <category name="org.apache.qpid.server.queue.AMQQueueMBean">
-        <priority value="info"/>
-        <appender-ref ref="AlertFile"/>
-    </category>
-
-    <!-- Provide warnings to standard output -->
-    <!--category name="org.apache.qpid">
-        <priority value="warn"/>
-        <appender-ref ref="STDOUT"/>
-    </category-->
-
-    <category name="org.apache.qpid">
-        <priority value="info"/>
-        <appender-ref ref="STDOUT"/>
-        <appender-ref ref="FileAppender"/>
-    </category>
-
-    <!-- Examples of additional logging settings -->
-    <!-- Used to generate extra debug. See debug.log4j.xml -->
-    
-    <!--<category name="org.apache.qpid.server.store">
-        <priority value="debug"/>
-    </category-->
-
-    <!--category name="org.apache.qpid.server.queue">
-        <priority value="debug"/>
-    </category-->
-
-    <!--category name="org.apache.qpid.server.txn">
-        <priority value="debug"/>
-    </category>-->
-
-    <!-- Log all info events to file -->
-    <root>
-        <priority value="info"/>
-        <appender-ref ref="STDOUT"/>
-        <appender-ref ref="FileAppender"/>
-        <!--appender-ref ref="ArchivingFileAppender"/-->
-    </root>
-
-</log4j:configuration>
diff --git a/qpid/java/broker/etc/md5passwd b/qpid/java/broker/etc/md5passwd
deleted file mode 100644
index 6a149919de..0000000000
--- a/qpid/java/broker/etc/md5passwd
+++ /dev/null
@@ -1,21 +0,0 @@
-#

-# Licensed to the Apache Software Foundation (ASF) under one

-# or more contributor license agreements.  See the NOTICE file

-# distributed with this work for additional information

-# regarding copyright ownership.  The ASF licenses this file

-# to you under the Apache License, Version 2.0 (the

-# "License"); you may not use this file except in compliance

-# with the License.  You may obtain a copy of the License at

-#

-#   http://www.apache.org/licenses/LICENSE-2.0

-#

-# Unless required by applicable law or agreed to in writing,

-# software distributed under the License is distributed on an

-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-# KIND, either express or implied.  See the License for the

-# specific language governing permissions and limitations

-# under the License.

-#

-guest:CE4DQ6BIb/BVMN9scFyLtA==

-admin:ISMvKXpXpadDiUoOSoAfww==

-user:aBzonUodYLhwSa8s9A10sA==

diff --git a/qpid/java/broker/etc/mstool-log4j.xml b/qpid/java/broker/etc/mstool-log4j.xml
deleted file mode 100644
index 8c46010e2d..0000000000
--- a/qpid/java/broker/etc/mstool-log4j.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0"?>
-<!--
- -
- - Licensed to the Apache Software Foundation (ASF) under one
- - or more contributor license agreements.  See the NOTICE file
- - distributed with this work for additional information
- - regarding copyright ownership.  The ASF licenses this file
- - to you under the Apache License, Version 2.0 (the
- - "License"); you may not use this file except in compliance
- - with the License.  You may obtain a copy of the License at
- -
- -   http://www.apache.org/licenses/LICENSE-2.0
- -
- - Unless required by applicable law or agreed to in writing,
- - software distributed under the License is distributed on an
- - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- - KIND, either express or implied.  See the License for the
- - specific language governing permissions and limitations
- - under the License.
- -
- -->
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
-
-    <appender name="STDOUT" class="org.apache.log4j.ConsoleAppender">
-
-        <layout class="org.apache.log4j.PatternLayout">
-            <!--param name="ConversionPattern" value="%d %-5p [%t] %C{2} (%F:%L) - %m%n"/-->
-            <param name="ConversionPattern" value="%d %-5p [%t] (%F:%L) - %m%n"/>
-        </layout>
-    </appender>
-
-    <category name="org.apache.qpid.tools">
-        <priority value="info"/>
-    </category>
-
-    <category name="org.apache.qpid">
-        <priority value="error"/>
-    </category>
-
-    <category name="org.apache.qpid.server.security">
-        <priority value="error"/>
-    </category>
-
-    <category name="org.apache.qpid.server.management">
-        <priority value="error"/>
-    </category>
-
-
-    <root>
-        <priority value="info"/>
-        <appender-ref ref="STDOUT"/>
-    </root>
-</log4j:configuration>
diff --git a/qpid/java/broker/etc/passwd b/qpid/java/broker/etc/passwd
deleted file mode 100644
index 966a16153d..0000000000
--- a/qpid/java/broker/etc/passwd
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-guest:guest
diff --git a/qpid/java/broker/etc/passwdVhost b/qpid/java/broker/etc/passwdVhost
deleted file mode 100644
index 48ce8299b6..0000000000
--- a/qpid/java/broker/etc/passwdVhost
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-guest:guest:localhost,test
diff --git a/qpid/java/broker/etc/persistent_config.xml b/qpid/java/broker/etc/persistent_config.xml
deleted file mode 100644
index ed0591256b..0000000000
--- a/qpid/java/broker/etc/persistent_config.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- -
- - Licensed to the Apache Software Foundation (ASF) under one
- - or more contributor license agreements.  See the NOTICE file
- - distributed with this work for additional information
- - regarding copyright ownership.  The ASF licenses this file
- - to you under the Apache License, Version 2.0 (the
- - "License"); you may not use this file except in compliance
- - with the License.  You may obtain a copy of the License at
- - 
- -   http://www.apache.org/licenses/LICENSE-2.0
- - 
- - Unless required by applicable law or agreed to in writing,
- - software distributed under the License is distributed on an
- - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- - KIND, either express or implied.  See the License for the
- - specific language governing permissions and limitations
- - under the License.
- -
-
- This is an example config using the BDBMessageStore available from
- the Red Hat Messaging project at etp.108.redhat.com and distributed under GPL.
- -->
-        
-<broker>
-    <prefix>${QPID_HOME}</prefix>
-    <work>${QPID_WORK}</work>
-    <conf>${prefix}/etc</conf>
-    <connector>
-        <qpidnio>true</qpidnio>
-        <transport>nio</transport>
-        <port>5672</port>
-        <sslport>8672</sslport>
-        <socketReceiveBuffer>32768</socketReceiveBuffer>
-        <socketSendBuffer>32768</socketSendBuffer>
-    </connector>
-    <management>
-        <enabled>true</enabled>
-        <jmxport>8999</jmxport>
-    </management>
-    <advanced>
-        <filterchain enableExecutorPool="true"/>
-        <enablePooledAllocator>false</enablePooledAllocator>
-        <enableDirectBuffers>false</enableDirectBuffers>
-        <framesize>65535</framesize>
-        <compressBufferOnQueue>false</compressBufferOnQueue>
-    </advanced>
-
-    <security>
-        <principal-databases>
-            <principal-database>
-                <name>passwordfile</name>
-                <class>org.apache.qpid.server.security.auth.database.PlainPasswordVhostFilePrincipalDatabase</class>
-                <attributes>
-                    <attribute>
-                        <name>passwordFile</name>
-                        <value>${conf}/passwdVhost</value>
-                    </attribute>
-                </attributes>
-            </principal-database>
-        </principal-databases>
-
-        <access>
-            <class>org.apache.qpid.server.security.access.AllowAll</class>
-        </access>
-        <jmx>
-            <access>${conf}/jmxremote.access</access>
-            <principal-database>passwordfile</principal-database>
-        </jmx>
-    </security>
-
-    <virtualhosts>
-        <virtualhost>
-            <name>localhost</name>
-            <localhost>
-                <store>
-                    <environment-path>${work}/bdbstore/localhost-store</environment-path>
-                   <class>org.apache.qpid.server.store.berkeleydb.messageStore.MessageStoreImpl</class> 
-                </store>             
-                <txn>
-                    <environment-tx-timeout>60</environment-tx-timeout>
-                	 <class>org.apache.qpid.server.store.berkeleydb.txn.TransactionManagerImpl</class> 
-                </txn>
-                <security>
-                    <access>
-                        <class>org.apache.qpid.server.security.access.PrincipalDatabaseAccessManager</class>
-                        <attributes>
-                            <attribute>
-                                <name>principalDatabase</name>
-                                <value>passwordfile</value>
-                            </attribute>
-                            <attribute>
-                                <name>defaultAccessManager</name>
-                                <value>DenyAll</value>
-                            </attribute>
-                        </attributes>
-                    </access>
-                </security>
-            </localhost>
-        </virtualhost>
-
-        <virtualhost>
-            <name>development</name>
-            <development>
-            <store>                  
-                   <environment-path>${work}/bdbstore/development-store</environment-path>
-                   <class>org.apache.qpid.server.store.berkeleydb.messageStore.MessageStoreImpl</class> 
-           </store>             
-                <txn>
-                    <environment-tx-timeout>60</environment-tx-timeout>
-                	 <class>org.apache.qpid.server.store.berkeleydb.txn.TransactionManagerImpl</class> 
-                </txn>              
-            </development>
-        </virtualhost>
-
-        <virtualhost>
-            <name>test</name>
-            <test>
-              <store>                  
-                   <environment-path>${work}/bdbstore/test-store</environment-path>
-                   <class>org.apache.qpid.server.store.berkeleydb.messageStore.MessageStoreImpl</class> 
-           </store>             
-                <txn>
-                    <environment-tx-timeout>60</environment-tx-timeout>
-                	 <class>org.apache.qpid.server.store.berkeleydb.txn.TransactionManagerImpl</class> 
-                </txn>     
-            </test>
-        </virtualhost>
-
-    </virtualhosts>
-    <heartbeat>
-        <delay>0</delay>
-        <timeoutFactor>2.0</timeoutFactor>
-    </heartbeat>
-    <queue>
-        <auto_register>true</auto_register>
-    </queue>
-
-    <virtualhosts>${conf}/virtualhosts.xml</virtualhosts>
-</broker>
-
-
diff --git a/qpid/java/broker/etc/qpid-server.conf b/qpid/java/broker/etc/qpid-server.conf
deleted file mode 100644
index c310094817..0000000000
--- a/qpid/java/broker/etc/qpid-server.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-QPID_LIBS=$QPID_HOME/lib/qpid-incubating.jar:$QPID_HOME/lib/bdbstore-launch.jar
-
-export JAVA=java \
-       JAVA_VM=-server \
-       JAVA_MEM=-Xmx1024m \
-       CLASSPATH=$QPID_LIBS
diff --git a/qpid/java/broker/etc/qpid-server.conf.jpp b/qpid/java/broker/etc/qpid-server.conf.jpp
deleted file mode 100644
index 3ed2431ef3..0000000000
--- a/qpid/java/broker/etc/qpid-server.conf.jpp
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-QPID_LIBS=$(build-classpath backport-util-concurrent \
-                            commons-beanutils \
-                            commons-beanutils-core \
-                            commons-cli \
-                            commons-codec \
-                            commons-collections \
-                            commons-configuration \
-                            commons-digester \
-                            commons-lang \
-                            commons-logging \
-                            commons-logging-api \
-                            dom4j \
-                            geronimo-jms-1.1-api \
-                            isorelax \
-                            jaxen \
-                            log4j \
-                            mina/core \
-                            mina/filter-ssl \
-                            mina/java5 \
-                            msv-msv \
-                            qpid-broker \
-                            qpid-client \
-                            qpid-common \
-                            relaxngDatatype \
-                            slf4j)
-
-export JAVA=java \
-       JAVA_VM=-server \
-       JAVA_MEM=-Xmx1024m \
-       CLASSPATH=$QPID_LIBS
diff --git a/qpid/java/broker/etc/qpid.passwd b/qpid/java/broker/etc/qpid.passwd
deleted file mode 100644
index 79b5e11777..0000000000
--- a/qpid/java/broker/etc/qpid.passwd
+++ /dev/null
@@ -1,22 +0,0 @@
-#

-# Licensed to the Apache Software Foundation (ASF) under one

-# or more contributor license agreements.  See the NOTICE file

-# distributed with this work for additional information

-# regarding copyright ownership.  The ASF licenses this file

-# to you under the Apache License, Version 2.0 (the

-# "License"); you may not use this file except in compliance

-# with the License.  You may obtain a copy of the License at

-#

-#   http://www.apache.org/licenses/LICENSE-2.0

-#

-# Unless required by applicable law or agreed to in writing,

-# software distributed under the License is distributed on an

-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-# KIND, either express or implied.  See the License for the

-# specific language governing permissions and limitations

-# under the License.

-#

-guest:CE4DQ6BIb/BVMN9scFyLtA==

-admin:ISMvKXpXpadDiUoOSoAfww==

-user:CE4DQ6BIb/BVMN9scFyLtA==

-

diff --git a/qpid/java/broker/etc/transient_config.xml b/qpid/java/broker/etc/transient_config.xml
deleted file mode 100644
index ddd5203ccb..0000000000
--- a/qpid/java/broker/etc/transient_config.xml
+++ /dev/null
@@ -1,141 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- -
- - Licensed to the Apache Software Foundation (ASF) under one
- - or more contributor license agreements.  See the NOTICE file
- - distributed with this work for additional information
- - regarding copyright ownership.  The ASF licenses this file
- - to you under the Apache License, Version 2.0 (the
- - "License"); you may not use this file except in compliance
- - with the License.  You may obtain a copy of the License at
- - 
- -   http://www.apache.org/licenses/LICENSE-2.0
- - 
- - Unless required by applicable law or agreed to in writing,
- - software distributed under the License is distributed on an
- - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- - KIND, either express or implied.  See the License for the
- - specific language governing permissions and limitations
- - under the License.
- -
-
- This is an example config file that uses the MemoryMessageStore.
-  As a result it is aimed at brokers sending transient messages.
-
- -->
-<broker>
-    <prefix>${QPID_HOME}</prefix>
-    <work>${QPID_WORK}</work>
-    <conf>${prefix}/etc</conf>
-    <connector>
-        <qpidnio>true</qpidnio>
-        <transport>nio</transport>
-        <port>5672</port>
-        <sslport>8672</sslport>
-        <socketReceiveBuffer>32768</socketReceiveBuffer>
-        <socketSendBuffer>32768</socketSendBuffer>
-    </connector>
-    <management>
-        <enabled>true</enabled>
-        <jmxport>8999</jmxport>
-    </management>
-    <advanced>
-        <filterchain enableExecutorPool="true"/>
-        <enablePooledAllocator>false</enablePooledAllocator>
-        <enableDirectBuffers>false</enableDirectBuffers>
-        <framesize>65535</framesize>
-        <compressBufferOnQueue>false</compressBufferOnQueue>
-    </advanced>
-
-    <security>
-        <principal-databases>
-            <principal-database>
-                <name>passwordfile</name>
-                <class>org.apache.qpid.server.security.auth.database.PlainPasswordVhostFilePrincipalDatabase</class>
-                <attributes>
-                    <attribute>
-                        <name>passwordFile</name>
-                        <value>${conf}/passwdVhost</value>
-                    </attribute>
-                </attributes>
-            </principal-database>
-        </principal-databases>
-        <access>
-            <class>org.apache.qpid.server.security.access.AllowAll</class>
-        </access>
-        <jmx>
-            <access>${conf}/jmxremote.access</access>
-            <principal-database>passwordfile</principal-database>
-        </jmx>
-    </security>
-
-    <virtualhosts>
-        <virtualhost>
-            <name>localhost</name>
-            <localhost>
-                <store>                  
-                   <class>org.apache.qpid.server.store.berkeleydb.messageStore.MessageStoreImpl</class> 
-                </store>             
-                <txn>
-                    <environment-tx-timeout>60</environment-tx-timeout>
-                	 <class>org.apache.qpid.server.store.berkeleydb.txn.TransactionManagerImpl</class> 
-                </txn>
-            
-
-                <security>
-                    <access>
-                        <class>org.apache.qpid.server.security.access.PrincipalDatabaseAccessManager</class>
-                        <attributes>
-                            <attribute>
-                                <name>principalDatabase</name>
-                                <value>passwordfile</value>
-                            </attribute>
-                            <attribute>
-                                <name>defaultAccessManager</name>
-                                <value>DenyAll</value>
-                            </attribute>
-                        </attributes>
-                    </access>
-                </security>
-            </localhost>
-        </virtualhost>
-
-        <virtualhost>
-            <name>development</name>
-            <development>
-                  <store>                  
-                   <class>org.apache.qpid.server.store.berkeleydb.messageStore.MessageStoreImpl</class> 
-                </store>             
-                <txn>
-                    <environment-tx-timeout>60</environment-tx-timeout>
-                	 <class>org.apache.qpid.server.store.berkeleydb.txn.TransactionManagerImpl</class> 
-                </txn>
-            </development>
-        </virtualhost>
-
-        <virtualhost>
-            <name>test</name>
-            <test>
-                 <store>                  
-                   <class>org.apache.qpid.server.store.berkeleydb.messageStore.MessageStoreImpl</class> 
-                </store>             
-                <txn>
-                    <environment-tx-timeout>60</environment-tx-timeout>
-                	 <class>org.apache.qpid.server.store.berkeleydb.txn.TransactionManagerImpl</class> 
-                </txn>
-            </test>
-        </virtualhost>
-
-    </virtualhosts>
-    <heartbeat>
-        <delay>0</delay>
-        <timeoutFactor>2.0</timeoutFactor>
-    </heartbeat>
-    <queue>
-        <auto_register>true</auto_register>
-    </queue>
-
-    <virtualhosts>${conf}/virtualhosts.xml</virtualhosts>
-</broker>
-
-
diff --git a/qpid/java/broker/etc/virtualhosts.xml b/qpid/java/broker/etc/virtualhosts.xml
deleted file mode 100644
index f62ec3f5d7..0000000000
--- a/qpid/java/broker/etc/virtualhosts.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- -
- - Licensed to the Apache Software Foundation (ASF) under one
- - or more contributor license agreements.  See the NOTICE file
- - distributed with this work for additional information
- - regarding copyright ownership.  The ASF licenses this file
- - to you under the Apache License, Version 2.0 (the
- - "License"); you may not use this file except in compliance
- - with the License.  You may obtain a copy of the License at
- - 
- -   http://www.apache.org/licenses/LICENSE-2.0
- - 
- - Unless required by applicable law or agreed to in writing,
- - software distributed under the License is distributed on an
- - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- - KIND, either express or implied.  See the License for the
- - specific language governing permissions and limitations
- - under the License.
- -
- -->
-<virtualhosts>
-    <default>test</default>
-    <virtualhost>
-        <name>localhost</name>
-        <localhost>            
-            <exchanges>
-                <exchange>
-                    <type>direct</type>
-                    <name>test.direct</name>
-                    <durable>true</durable>
-                </exchange>
-                <exchange>
-                    <type>topic</type>
-                    <name>test.topic</name>
-                </exchange>
-            </exchanges>
-            <queues>
-                <exchange>amq.direct</exchange>
-                <maximumQueueDepth>4235264</maximumQueueDepth>  <!-- 4Mb -->
-                <maximumMessageSize>2117632</maximumMessageSize> <!-- 2Mb -->
-                <maximumMessageAge>600000</maximumMessageAge>  <!-- 10 mins -->
-
-                <queue>
-                    <name>queue</name>
-                </queue>
-                <queue>
-                    <name>ping</name>
-                </queue>
-                <queue>
-                    <name>test-queue</name>
-                    <test-queue>
-                        <exchange>test.direct</exchange>
-                        <durable>true</durable>
-                    </test-queue>
-                </queue>
-                <queue>
-                    <name>test-ping</name>
-                    <test-ping>
-                        <exchange>test.direct</exchange>
-                    </test-ping>
-                </queue>
-
-            </queues>
-        </localhost>
-    </virtualhost>
-
-
-    <virtualhost>
-        <name>development</name>
-        <development>
-            <queues>
-                <minimumAlertRepeatGap>30000</minimumAlertRepeatGap>
-                <maximumMessageCount>5000</maximumMessageCount>
-                <queue>
-                    <name>queue</name>
-                    <queue>
-                        <exchange>amq.direct</exchange>
-                        <maximumQueueDepth>4235264</maximumQueueDepth>  <!-- 4Mb -->
-                        <maximumMessageSize>2117632</maximumMessageSize> <!-- 2Mb -->
-                        <maximumMessageAge>600000</maximumMessageAge>  <!-- 10 mins -->
-                    </queue>
-                </queue>
-                <queue>
-                    <name>ping</name>
-                    <ping>
-                        <exchange>amq.direct</exchange>
-                        <maximumQueueDepth>4235264</maximumQueueDepth>  <!-- 4Mb -->
-                        <maximumMessageSize>2117632</maximumMessageSize> <!-- 2Mb -->
-                        <maximumMessageAge>600000</maximumMessageAge>  <!-- 10 mins -->
-                    </ping>
-                </queue>
-            </queues>
-        </development>
-    </virtualhost>
-        <virtualhost>
-            <name>test</name>
-            <test>                
-                <queues>
-                    <minimumAlertRepeatGap>30000</minimumAlertRepeatGap>
-                    <maximumMessageCount>5000</maximumMessageCount>
-                    <queue>
-                        <name>queue</name>
-                        <queue>
-                            <exchange>amq.direct</exchange>
-                            <maximumQueueDepth>4235264</maximumQueueDepth>  <!-- 4Mb -->
-                            <maximumMessageSize>2117632</maximumMessageSize> <!-- 2Mb -->
-                            <maximumMessageAge>600000</maximumMessageAge>  <!-- 10 mins -->
-                        </queue>
-                    </queue>
-                    <queue>
-                        <name>ping</name>
-                        <ping>
-                            <exchange>amq.direct</exchange>
-                            <maximumQueueDepth>4235264</maximumQueueDepth>  <!-- 4Mb -->
-                            <maximumMessageSize>2117632</maximumMessageSize> <!-- 2Mb -->
-                            <maximumMessageAge>600000</maximumMessageAge>  <!-- 10 mins -->
-                        </ping>
-                    </queue>
-                </queues>
-            </test>
-    </virtualhost>
-</virtualhosts>
diff --git a/qpid/java/broker/pom.xml b/qpid/java/broker/pom.xml
deleted file mode 100644
index ac1d442fdc..0000000000
--- a/qpid/java/broker/pom.xml
+++ /dev/null
@@ -1,241 +0,0 @@
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements. See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership. The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License. You may obtain a copy of the License at
-    
-    http://www.apache.org/licenses/LICENSE-2.0
-    
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied. See the License for the
-    specific language governing permissions and limitations
-    under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.apache.qpid</groupId>
-    <artifactId>qpid-broker</artifactId>
-    <packaging>jar</packaging>
-    <version>1.0-incubating-M3-SNAPSHOT</version>
-    <name>Qpid Broker</name>
-    <url>http://cwiki.apache.org/confluence/display/qpid</url>
-
-    <parent>
-        <groupId>org.apache.qpid</groupId>
-        <artifactId>qpid</artifactId>
-        <version>1.0-incubating-M3-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <properties>
-        <topDirectoryLocation>..</topDirectoryLocation>
-    </properties>
-
-    <dependencies>
-
-        <dependency>
-            <groupId>org.apache.qpid</groupId>
-            <artifactId>qpid-common</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>  
-            <version>1.4.0</version> 
-        </dependency>
-
-        <dependency>  
-            <groupId>org.slf4j</groupId> 
-            <artifactId>slf4j-log4j12</artifactId>  
-            <version>1.4.0</version>  
-        </dependency>
-
-        <dependency>
-            <groupId>commons-cli</groupId>
-            <artifactId>commons-cli</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>commons-configuration</groupId>
-            <artifactId>commons-configuration</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>commons-lang</groupId>
-            <artifactId>commons-lang</artifactId>
-        </dependency>
-
-        <!-- Test Dependencies -->
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.easymock</groupId>
-            <artifactId>easymockclassextension</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-
-        <plugins>
-
-
-           <!--plugin>
-                <artifactId>minijar-maven-plugin</artifactId>
-                <groupId>org.codehaus.mojo</groupId>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>minijars</goal>
-                        </goals>
-                        <configuration>
-                            <stripUnusedClasses>true</stripUnusedClasses>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin-->
-
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-            </plugin>
-
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>javacc-maven-plugin</artifactId>
-                <version>2.0</version>
-                <executions>
-                    <execution>
-                        <phase>generate-sources</phase>
-                        <configuration>
-                            <sourceDirectory>${basedir}/src/main/grammar</sourceDirectory>
-                            <outputDirectory>${basedir}/target/generated-sources</outputDirectory>
-                            <packageName>org.apache.qpid.server.filter.jms.selector</packageName>
-                        </configuration>
-                        <goals>
-                            <goal>javacc</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <systemProperties>
-                        <property>
-                            <name>amqj.noAutoCreateVMBroker</name>
-                            <value>true</value>
-                        </property>
-                        <property>
-                            <name>amqj.logging.level</name>
-                            <value>${amqj.logging.level}</value>
-                        </property>
-                        <property>
-                            <name>log4j.configuration</name>
-                            <value>file:///${basedir}/src/main/java/log4j.properties</value>
-                        </property>
-                    </systemProperties>
-                </configuration>
-            </plugin>
-
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>test-jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-
-        <testResources>
-            <testResource>
-                <targetPath>src/</targetPath>
-                <filtering>false</filtering>
-                <directory>src/test/java</directory>
-                <includes>
-                    <include>**/*.java</include>
-                </includes>
-            </testResource>
-        </testResources>
-
-        <!-- DISABLED - TOBE fixed by ritchiem - should use Jython. -->
-        <!--pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-antrun-plugin</artifactId>
-                    <version>${antrun.version}</version>
-                    <dependencies>
-                        <dependency>
-                            <groupId>ant</groupId>
-                            <artifactId>ant-nodeps</artifactId>
-                            <version>1.6.5</version>
-                        </dependency>
-                    </dependencies>
-
-                    <executions>
-                        <execution>
-                            <id>python_test</id>
-                            <phase>test</phase>
-                            <configuration>
-                                <tasks>
-
-                                    <condition property="broker.dir" 
-                                               else="${user.dir}${file.separator}broker"
-                                               value="${user.dir}">
-                                        <contains string="${user.dir}" substring="broker" />
-                                    </condition>
-
-                                    <condition property="skip-python-tests" value="true">
-                                        <isset property="skip.python.tests"/>
-                                    </condition>
-
-                                    <property name="command" 
-                                              value="python run-tests -v -I java_failing_0-8.txt"/>
-
-                                              <-value="bash -c 'python run-tests -v -I java_failing.txt'"/>->
-
-                                    <ant antfile="python-test.xml" inheritRefs="true">
-                                        <target name="run-tests" />
-                                    </ant>
-
-                                </tasks>
-                            </configuration>
-                            <goals>
-                                <goal>run</goal>
-                            </goals>
-                        </execution>
-                    </executions>
-                </plugin>
-            </plugins>
-        </pluginManagement-->
-
-
-    </build>
-
-</project>
diff --git a/qpid/java/broker/python-test.xml b/qpid/java/broker/python-test.xml
deleted file mode 100755
index a31dae0060..0000000000
--- a/qpid/java/broker/python-test.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<!-- ====================================================================== -->
-<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above.        -->
-<!-- ====================================================================== -->
-
-<project basedir="." default="default">
-
-  <target name="default" >
-      <echo message="Used via maven to run python tests."/>
-  </target>
-
-  <property name="pythondir" value="../../python"/>
-
-  <target name="run-tests" unless="skip-python-tests">
-
-	<echo message="Starting Broker with command"/>
-
-	<java classname="org.apache.qpid.server.RunBrokerWithCommand"
-			fork="true"
-			dir="${pythondir}"
-			failonerror="true"
-			>
-		<arg value="${command}"/>
-		
-		<classpath refid="maven.test.classpath"/>
-		<sysproperty key="QPID_HOME" value="${broker.dir}"/>
-		<sysproperty key="QPID_WORK" value="${broker.dir}${file.separator}target"/>
-	</java>
-
-	</target>
-</project>
diff --git a/qpid/java/broker/src/main/grammar/SelectorParser.jj b/qpid/java/broker/src/main/grammar/SelectorParser.jj
deleted file mode 100644
index 61638e5e26..0000000000
--- a/qpid/java/broker/src/main/grammar/SelectorParser.jj
+++ /dev/null
@@ -1,604 +0,0 @@
-/*

- *

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- *

- *   http://www.apache.org/licenses/LICENSE-2.0

- *

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- *

- */

-

- //

- // Original File from r450141 of the Apache ActiveMQ project <http://www.activemq.org/site/home.html>

- //

-

-// ----------------------------------------------------------------------------

-// OPTIONS

-// ----------------------------------------------------------------------------

-options {

-  STATIC = false;

-  UNICODE_INPUT = true;

-

-  // some performance optimizations

-  OPTIMIZE_TOKEN_MANAGER = true;

-  ERROR_REPORTING = false;

-}

-

-// ----------------------------------------------------------------------------

-// PARSER

-// ----------------------------------------------------------------------------

-

-PARSER_BEGIN(SelectorParser)

-/*

- *

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- *

- *   http://www.apache.org/licenses/LICENSE-2.0

- *

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- *

- */

-

-package org.apache.qpid.server.filter.jms.selector;

-

-import java.io.StringReader;

-import java.util.ArrayList;

-

-import org.apache.qpid.AMQInvalidArgumentException;

-import org.apache.qpid.server.filter.ArithmeticExpression;

-import org.apache.qpid.server.filter.BooleanExpression;

-import org.apache.qpid.server.filter.ComparisonExpression;

-import org.apache.qpid.server.filter.ConstantExpression;

-import org.apache.qpid.server.filter.Expression;

-import org.apache.qpid.server.filter.LogicExpression;

-import org.apache.qpid.server.filter.PropertyExpression;

-import org.apache.qpid.server.filter.UnaryExpression;

-

-/**

- * JMS Selector Parser generated by JavaCC

- *

- * Do not edit this .java file directly - it is autogenerated from SelectorParser.jj

- */

-public class SelectorParser {

-

-    public SelectorParser() {

-        this(new StringReader(""));

-    }

-

-    public BooleanExpression parse(String sql) throws AMQInvalidArgumentException {

-        this.ReInit(new StringReader(sql));

-

-        try {

-            return this.JmsSelector();

-        }

-        catch (Throwable e) {

-	        throw new AMQInvalidArgumentException(sql, e);

-        }

-

-    }

-

-    private BooleanExpression asBooleanExpression(Expression value) throws ParseException  {

-        if (value instanceof BooleanExpression) {

-            return (BooleanExpression) value;

-        }

-        if (value instanceof PropertyExpression) {

-            return UnaryExpression.createBooleanCast( value );

-        }

-        throw new ParseException("Expression will not result in a boolean value: " + value);

-    }

-

-

-}

-

-PARSER_END(SelectorParser)

-

-// ----------------------------------------------------------------------------

-// Tokens

-// ----------------------------------------------------------------------------

-

-/* White Space */

-SPECIAL_TOKEN :

-{

-  " " | "\t" | "\n" | "\r" | "\f"

-}

-

-/* Comments */

-SKIP:

-{

-  <LINE_COMMENT: "--" (~["\n","\r"])* ("\n"|"\r"|"\r\n") >

-}

-

-SKIP:

-{

-  <BLOCK_COMMENT: "/*" (~["*"])* "*" ("*" | (~["*","/"] (~["*"])* "*"))* "/">

-}

-

-/* Reserved Words */

-TOKEN [IGNORE_CASE] :

-{

-    <  NOT     : "NOT">

-  | <  AND     : "AND">

-  | <  OR      : "OR">

-  | <  BETWEEN : "BETWEEN">

-  | <  LIKE    : "LIKE">

-  | <  ESCAPE  : "ESCAPE">

-  | <  IN      : "IN">

-  | <  IS      : "IS">

-  | <  TRUE    : "TRUE" >

-  | <  FALSE   : "FALSE" >

-  | <  NULL    : "NULL" >

-  | <  XPATH   : "XPATH" >

-  | <  XQUERY  : "XQUERY" >

-}

-

-/* Literals */

-TOKEN [IGNORE_CASE] :

-{

-

-    < DECIMAL_LITERAL: ["1"-"9"] (["0"-"9"])* (["l","L"])? >

-  | < HEX_LITERAL: "0" ["x","X"] (["0"-"9","a"-"f","A"-"F"])+ >

-  | < OCTAL_LITERAL: "0" (["0"-"7"])* >

-  | < FLOATING_POINT_LITERAL:

-          (["0"-"9"])+ "." (["0"-"9"])* (<EXPONENT>)? // matches: 5.5 or 5. or 5.5E10 or 5.E10

-        | "." (["0"-"9"])+ (<EXPONENT>)?              // matches: .5 or .5E10

-        | (["0"-"9"])+ <EXPONENT>                     // matches: 5E10

-    >

-  | < #EXPONENT: "E" (["+","-"])? (["0"-"9"])+ >

-  | < STRING_LITERAL: "'" ( ("''") | ~["'"] )*  "'" >

-}

-

-TOKEN [IGNORE_CASE] :

-{

-    < ID : ["a"-"z", "_", "$"] (["a"-"z","0"-"9","_", "$"])* >

-}

-

-// ----------------------------------------------------------------------------

-// Grammer

-// ----------------------------------------------------------------------------

-BooleanExpression JmsSelector() :

-{

-    Expression left=null;

-}

-{

-    (

-        left = orExpression()

-    )

-    {

-        return asBooleanExpression(left);

-    }

-

-}

-

-Expression orExpression() :

-{

-    Expression left;

-    Expression right;

-}

-{

-    (

-        left = andExpression()

-        (

-            <OR> right = andExpression()

-            {

-                left = LogicExpression.createOR(asBooleanExpression(left), asBooleanExpression(right));

-            }

-        )*

-    )

-    {

-        return left;

-    }

-

-}

-

-

-Expression andExpression() :

-{

-    Expression left;

-    Expression right;

-}

-{

-    (

-        left = equalityExpression()

-        (

-            <AND> right = equalityExpression()

-            {

-                left = LogicExpression.createAND(asBooleanExpression(left), asBooleanExpression(right));

-            }

-        )*

-    )

-    {

-        return left;

-    }

-}

-

-Expression equalityExpression() :

-{

-    Expression left;

-    Expression right;

-}

-{

-    (

-        left = comparisonExpression()

-        (

-

-            "=" right = comparisonExpression()

-            {

-                left = ComparisonExpression.createEqual(left, right);

-            }

-            |

-            "<>" right = comparisonExpression()

-            {

-                left = ComparisonExpression.createNotEqual(left, right);

-            }

-            |

-            LOOKAHEAD(2)

-            <IS> <NULL>

-            {

-                left = ComparisonExpression.createIsNull(left);

-            }

-            |

-            <IS> <NOT> <NULL>

-            {

-                left = ComparisonExpression.createIsNotNull(left);

-            }

-        )*

-    )

-    {

-        return left;

-    }

-}

-

-Expression comparisonExpression() :

-{

-    Expression left;

-    Expression right;

-    Expression low;

-    Expression high;

-    String t, u;

-	boolean not;

-	ArrayList list;

-}

-{

-    (

-        left = addExpression()

-        (

-

-                ">" right = addExpression()

-                {

-                    left = ComparisonExpression.createGreaterThan(left, right);

-                }

-            |

-                ">=" right = addExpression()

-                {

-                    left = ComparisonExpression.createGreaterThanEqual(left, right);

-                }

-            |

-                "<" right = addExpression()

-                {

-                    left = ComparisonExpression.createLessThan(left, right);

-                }

-            |

-                "<=" right = addExpression()

-                {

-                    left = ComparisonExpression.createLessThanEqual(left, right);

-                }

-           |

-				{

-					u=null;

-				}

-		        <LIKE> t = stringLitteral()

-		        	[ <ESCAPE> u = stringLitteral() ]

-		        {

-                    left = ComparisonExpression.createLike(left, t, u);

-		        }

-           |

-	        	LOOKAHEAD(2)

-				{

-					u=null;

-				}

-		        <NOT> <LIKE> t = stringLitteral() [ <ESCAPE> u = stringLitteral() ]

-		        {

-                    left = ComparisonExpression.createNotLike(left, t, u);

-		        }

-            |

-		        <BETWEEN> low = addExpression() <AND> high = addExpression()

-		        {

-					left = ComparisonExpression.createBetween(left, low, high);

-		        }

-	        |

-	        	LOOKAHEAD(2)

-		        <NOT> <BETWEEN> low = addExpression() <AND> high = addExpression()

-		        {

-					left = ComparisonExpression.createNotBetween(left, low, high);

-		        }

-            |

-				<IN>

-		        "("

-		            t = stringLitteral()

-		            {

-			            list = new ArrayList();

-			            list.add( t );

-		            }

-			        (

-			        	","

-			            t = stringLitteral()

-			            {

-				            list.add( t );

-			            }

-

-			        )*

-		        ")"

-		        {

-		           left = ComparisonExpression.createInFilter(left, list);

-		        }

-            |

-	        	LOOKAHEAD(2)

-	            <NOT> <IN>

-		        "("

-		            t = stringLitteral()

-		            {

-			            list = new ArrayList();

-			            list.add( t );

-		            }

-			        (

-			        	","

-			            t = stringLitteral()

-			            {

-				            list.add( t );

-			            }

-

-			        )*

-		        ")"

-		        {

-		           left = ComparisonExpression.createNotInFilter(left, list);

-		        }

-

-        )*

-    )

-    {

-        return left;

-    }

-}

-

-Expression addExpression() :

-{

-    Expression left;

-    Expression right;

-}

-{

-    left = multExpr()

-    (

-	    LOOKAHEAD( ("+"|"-") multExpr())

-	    (

-	        "+" right = multExpr()

-	        {

-	            left = ArithmeticExpression.createPlus(left, right);

-	        }

-	        |

-	        "-" right = multExpr()

-	        {

-	            left = ArithmeticExpression.createMinus(left, right);

-	        }

-        )

-

-    )*

-    {

-        return left;

-    }

-}

-

-Expression multExpr() :

-{

-    Expression left;

-    Expression right;

-}

-{

-    left = unaryExpr()

-    (

-        "*" right = unaryExpr()

-        {

-	        left = ArithmeticExpression.createMultiply(left, right);

-        }

-        |

-        "/" right = unaryExpr()

-        {

-	        left = ArithmeticExpression.createDivide(left, right);

-        }

-        |

-        "%" right = unaryExpr()

-        {

-	        left = ArithmeticExpression.createMod(left, right);

-        }

-

-    )*

-    {

-        return left;

-    }

-}

-

-

-Expression unaryExpr() :

-{

-    String s=null;

-    Expression left=null;

-}

-{

-	(

-		LOOKAHEAD( "+" unaryExpr() )

-	    "+" left=unaryExpr()

-	    |

-	    "-" left=unaryExpr()

-	    {

-	        left = UnaryExpression.createNegate(left);

-	    }

-	    |

-	    <NOT> left=unaryExpr()

-	    {

-		    left = UnaryExpression.createNOT( asBooleanExpression(left) );

-	    }

-	    |

-	    <XPATH> s=stringLitteral()

-	    {

-		    left = UnaryExpression.createXPath( s );

-	    }

-	    |

-	    <XQUERY> s=stringLitteral()

-	    {

-		    left = UnaryExpression.createXQuery( s );

-	    }

-	    |

-	    left = primaryExpr()

-    )

-    {

-        return left;

-    }

-

-}

-

-Expression primaryExpr() :

-{

-    Expression left=null;

-}

-{

-    (

-        left = literal()

-        |

-        left = variable()

-        |

-        "(" left = orExpression() ")"

-    )

-    {

-        return left;

-    }

-}

-

-

-

-ConstantExpression literal() :

-{

-    Token t;

-    String s;

-    ConstantExpression left=null;

-}

-{

-    (

-        (

-            s = stringLitteral()

-            {

-                left = new ConstantExpression(s);

-            }

-        )

-        |

-        (

-            t = <DECIMAL_LITERAL>

-            {

-            	left = ConstantExpression.createFromDecimal(t.image);

-            }

-        )

-        |

-        (

-            t = <HEX_LITERAL>

-            {

-            	left = ConstantExpression.createFromHex(t.image);

-            }

-        )

-        |

-        (

-            t = <OCTAL_LITERAL>

-            {

-            	left = ConstantExpression.createFromOctal(t.image);

-            }

-        )

-        |

-        (

-            t = <FLOATING_POINT_LITERAL>

-            {

-            	left = ConstantExpression.createFloat(t.image);

-            }

-        )

-        |

-        (

-            <TRUE>

-            {

-                left = ConstantExpression.TRUE;

-            }

-        )

-        |

-        (

-            <FALSE>

-            {

-                left = ConstantExpression.FALSE;

-            }

-        )

-        |

-        (

-            <NULL>

-            {

-                left = ConstantExpression.NULL;

-            }

-        )

-    )

-    {

-        return left;

-    }

-}

-

-String stringLitteral() :

-{

-    Token t;

-    StringBuffer rc = new StringBuffer();

-    boolean first=true;

-}

-{

-    t = <STRING_LITERAL>

-    {

-    	// Decode the sting value.

-    	String image = t.image;

-    	for( int i=1; i < image.length()-1; i++ ) {

-    		char c = image.charAt(i);

-    		if( c == '\'' )

-    			i++;

-   			rc.append(c);

-    	}

-	    return rc.toString();

-    }

-}

-

-PropertyExpression variable() :

-{

-    Token t;

-    PropertyExpression left=null;

-}

-{

-    (

-        t = <ID>

-        {

-            left = new PropertyExpression(t.image);

-        }

-    )

-    {

-        return left;

-    }

-}

diff --git a/qpid/java/broker/src/main/java/log4j.properties b/qpid/java/broker/src/main/java/log4j.properties
deleted file mode 100644
index 87f04f4991..0000000000
--- a/qpid/java/broker/src/main/java/log4j.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-log4j.rootCategory=${amqj.logging.level}, console
-
-log4j.appender.console=org.apache.log4j.ConsoleAppender
-log4j.appender.console.Threshold=info
-log4j.appender.console.layout=org.apache.log4j.PatternLayout
-log4j.appender.console.layout.ConversionPattern=%t %d %p [%c{4}] %m%n
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
deleted file mode 100644
index 7e0c4defe1..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/log4j/QpidCompositeRollingAppender.java
+++ /dev/null
@@ -1,1007 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.log4j;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.Writer;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.concurrent.ConcurrentLinkedQueue;
-import java.util.concurrent.Executor;
-import java.util.concurrent.Executors;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.zip.GZIPOutputStream;
-
-import org.apache.log4j.helpers.CountingQuietWriter;
-import org.apache.log4j.helpers.LogLog;
-import org.apache.log4j.helpers.OptionConverter;
-import org.apache.log4j.spi.LoggingEvent;
-
-/**
- * <p>CompositeRollingAppender combines RollingFileAppender and DailyRollingFileAppender<br> It can function as either
- * or do both at the same time (making size based rolling files like RollingFileAppender until a data/time boundary is
- * crossed at which time it rolls all of those files as per the DailyRollingFileAppender) based on the setting for
- * <code>rollingStyle</code>.<br> <br> To use CompositeRollingAppender to roll log files as they reach a certain size
- * (like RollingFileAppender), set rollingStyle=1 (@see config.size)<br> To use CompositeRollingAppender to roll log
- * files at certain time intervals (daily for example), set rollingStyle=2 and a datePattern (@see config.time)<br> To
- * have CompositeRollingAppender roll log files at a certain size AND rename those according to time intervals, set
- * rollingStyle=3 (@see config.composite)<br>
- *
- * <p>A of few additional optional features have been added:<br> -- Attach date pattern for current log file (@see
- * staticLogFileName)<br> -- Backup number increments for newer files (@see countDirection)<br> -- Infinite number of
- * backups by file size (@see maxSizeRollBackups)<br> <br> <p>A few notes and warnings:  For large or infinite number of
- * backups countDirection > 0 is highly recommended, with staticLogFileName = false if time based rolling is also used
- * -- this will reduce the number of file renamings to few or none.  Changing staticLogFileName or countDirection
- * without clearing the directory could have nasty side effects.  If Date/Time based rolling is enabled,
- * CompositeRollingAppender will attempt to roll existing files in the directory without a date/time tag based on the
- * last modified date of the base log files last modification.<br> <br> <p>A maximum number of backups based on
- * date/time boundries would be nice but is not yet implemented.<br>
- *
- * @author Kevin Steppe
- * @author Heinz Richter
- * @author Eirik Lygre
- * @author Ceki G&uuml;lc&uuml;
- * @author Martin Ritchie
- */
-public class QpidCompositeRollingAppender extends FileAppender
-{
-    // The code assumes that the following 'time' constants are in a increasing
-    // sequence.
-    static final int TOP_OF_TROUBLE = -1;
-    static final int TOP_OF_MINUTE = 0;
-    static final int TOP_OF_HOUR = 1;
-    static final int HALF_DAY = 2;
-    static final int TOP_OF_DAY = 3;
-    static final int TOP_OF_WEEK = 4;
-    static final int TOP_OF_MONTH = 5;
-
-    /** Style of rolling to use */
-    static final int BY_SIZE = 1;
-    static final int BY_DATE = 2;
-    static final int BY_COMPOSITE = 3;
-
-    // Not currently used
-    static final String S_BY_SIZE = "Size";
-    static final String S_BY_DATE = "Date";
-    static final String S_BY_COMPOSITE = "Composite";
-
-    /** The date pattern. By default, the pattern is set to "'.'yyyy-MM-dd" meaning daily rollover. */
-    private String datePattern = "'.'yyyy-MM-dd";
-
-    /**
-     * The actual formatted filename that is currently being written to or will be the file transferred to on roll over
-     * (based on staticLogFileName).
-     */
-    private String scheduledFilename = null;
-
-    /** The timestamp when we shall next recompute the filename. */
-    private long nextCheck = System.currentTimeMillis() - 1;
-
-    /** Holds date of last roll over */
-    Date now = new Date();
-
-    SimpleDateFormat sdf;
-
-    /** Helper class to determine next rollover time */
-    RollingCalendar rc = new RollingCalendar();
-
-    /** Current period for roll overs */
-    int checkPeriod = TOP_OF_TROUBLE;
-
-    /** The default maximum file size is 10MB. */
-    protected 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;
-
-    /** not yet implemented */
-    protected int maxTimeRollBackups = -1;
-    protected 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;
-
-    /** 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;
-
-    /**
-     * 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;
-
-    /** FileName provided in configuration.  Used for rolling properly */
-    protected String baseFileName;
-
-    /** Do we want to .gz our backup files. */
-    protected boolean compress = false;
-
-    /** Do we want to use a second thread when compressing our backup files. */
-    protected boolean compressAsync = false;
-
-    /** Do we want to start numbering files at zero. */
-    protected boolean zeroBased = false;
-
-    /** Path provided in configuration.  Used for moving backup files to */
-    protected String backupFilesToPath = null;
-    private final ConcurrentLinkedQueue<CompressJob> _compress = new ConcurrentLinkedQueue<CompressJob>();
-    private AtomicBoolean _compressing = new AtomicBoolean(false);
-
-    /** The default constructor does nothing. */
-    public QpidCompositeRollingAppender()
-    { }
-
-    /**
-     * Instantiate a <code>CompositeRollingAppender</code> and open the file designated by <code>filename</code>. The
-     * opened filename will become the ouput destination for this appender.
-     */
-    public QpidCompositeRollingAppender(Layout layout, String filename, String datePattern) throws IOException
-    {
-        this(layout, filename, datePattern, true);
-    }
-
-    /**
-     * Instantiate a CompositeRollingAppender and open the file designated by <code>filename</code>. The opened filename
-     * will become the ouput destination for this appender.
-     *
-     * <p>If the <code>append</code> parameter is true, the file will be appended to. Otherwise, the file desginated by
-     * <code>filename</code> will be truncated before being opened.
-     */
-    public QpidCompositeRollingAppender(Layout layout, String filename, boolean append) throws IOException
-    {
-        super(layout, filename, append);
-    }
-
-    /**
-     * Instantiate a CompositeRollingAppender and open the file designated by <code>filename</code>. The opened filename
-     * will become the ouput destination for this appender.
-     */
-    public QpidCompositeRollingAppender(Layout layout, String filename, String datePattern, boolean append)
-        throws IOException
-    {
-        super(layout, filename, append);
-        this.datePattern = datePattern;
-        activateOptions();
-    }
-
-    /**
-     * Instantiate a CompositeRollingAppender and open the file designated by <code>filename</code>. The opened filename
-     * will become the output destination for this appender.
-     *
-     * <p>The file will be appended to.  DatePattern is default.
-     */
-    public QpidCompositeRollingAppender(Layout layout, String filename) throws IOException
-    {
-        super(layout, filename);
-    }
-
-    /**
-     * The <b>DatePattern</b> takes a string in the same format as expected by {@link java.text.SimpleDateFormat}. This
-     * options determines the rollover schedule.
-     */
-    public void setDatePattern(String pattern)
-    {
-        datePattern = pattern;
-    }
-
-    /** Returns the value of the <b>DatePattern</b> option. */
-    public String getDatePattern()
-    {
-        return datePattern;
-    }
-
-    /** Returns the value of the <b>maxSizeRollBackups</b> option. */
-    public int getMaxSizeRollBackups()
-    {
-        return maxSizeRollBackups;
-    }
-
-    /**
-     * Get the maximum size that the output file is allowed to reach before being rolled over to backup files.
-     *
-     * @since 1.1
-     */
-    public long getMaximumFileSize()
-    {
-        return maxFileSize;
-    }
-
-    /**
-     * <p>Set the maximum number of backup files to keep around based on file size.
-     *
-     * <p>The <b>MaxSizeRollBackups</b> option determines how many backup files are kept before the oldest is erased.
-     * This option takes an integer value. If set to zero, then there will be no backup files and the log file will be
-     * truncated when it reaches <code>MaxFileSize</code>.  If a negative number is supplied then no deletions will be
-     * made.  Note that this could result in very slow performance as a large number of files are rolled over unless
-     * {@link #setCountDirection} up is used.
-     *
-     * <p>The maximum applys to -each- time based group of files and -not- the total. Using a daily roll the maximum
-     * total files would be (#days run) * (maxSizeRollBackups)
-     */
-    public void setMaxSizeRollBackups(int maxBackups)
-    {
-        maxSizeRollBackups = maxBackups;
-    }
-
-    /**
-     * Set the maximum size that the output file is allowed to reach before being rolled over to backup files.
-     *
-     * <p>This method is equivalent to {@link #setMaxFileSize} except that it is required for differentiating the setter
-     * taking a <code>long</code> argument from the setter taking a <code>String</code> argument by the JavaBeans {@link
-     * java.beans.Introspector Introspector}.
-     *
-     * @see #setMaxFileSize(String)
-     */
-    public void setMaxFileSize(long maxFileSize)
-    {
-        this.maxFileSize = maxFileSize;
-    }
-
-    /**
-     * Set the maximum size that the output file is allowed to reach before being rolled over to backup files.
-     *
-     * <p>This method is equivalent to {@link #setMaxFileSize} except that it is required for differentiating the setter
-     * taking a <code>long</code> argument from the setter taking a <code>String</code> argument by the JavaBeans {@link
-     * java.beans.Introspector Introspector}.
-     *
-     * @see #setMaxFileSize(String)
-     */
-    public void setMaximumFileSize(long maxFileSize)
-    {
-        this.maxFileSize = maxFileSize;
-    }
-
-    /**
-     * Set the maximum size that the output file is allowed to reach before being rolled over to backup files.
-     *
-     * <p>In configuration files, the <b>MaxFileSize</b> option takes an long integer in the range 0 - 2^63. You can
-     * specify the value with the suffixes "KB", "MB" or "GB" so that the integer is interpreted being expressed
-     * respectively in kilobytes, megabytes or gigabytes. For example, the value "10KB" will be interpreted as 10240.
-     */
-    public void setMaxFileSize(String value)
-    {
-        maxFileSize = OptionConverter.toFileSize(value, maxFileSize + 1);
-    }
-
-    protected void setQWForFiles(Writer writer)
-    {
-        qw = new CountingQuietWriter(writer, errorHandler);
-    }
-
-    // Taken verbatum from DailyRollingFileAppender
-    int computeCheckPeriod()
-    {
-        RollingCalendar c = new RollingCalendar();
-        // set sate to 1970-01-01 00:00:00 GMT
-        Date epoch = new Date(0);
-        if (datePattern != null)
-        {
-            for (int i = TOP_OF_MINUTE; i <= TOP_OF_MONTH; i++)
-            {
-                String r0 = sdf.format(epoch);
-                c.setType(i);
-                Date next = new Date(c.getNextCheckMillis(epoch));
-                String r1 = sdf.format(next);
-                // LogLog.debug("Type = "+i+", r0 = "+r0+", r1 = "+r1);
-                if ((r0 != null) && (r1 != null) && !r0.equals(r1))
-                {
-                    return i;
-                }
-            }
-        }
-
-        return TOP_OF_TROUBLE; // Deliberately head for trouble...
-    }
-
-    // Now for the new stuff
-    /**
-     * Handles append time behavior for CompositeRollingAppender.  This checks if a roll over either by date (checked
-     * first) or time (checked second) is need and then appends to the file last.
-     */
-    protected void subAppend(LoggingEvent event)
-    {
-
-        if (rollDate)
-        {
-            long n = System.currentTimeMillis();
-            if (n >= nextCheck)
-            {
-                now.setTime(n);
-                nextCheck = rc.getNextCheckMillis(now);
-
-                rollOverTime();
-            }
-        }
-
-        if (rollSize)
-        {
-            if ((fileName != null) && (((CountingQuietWriter) qw).getCount() >= maxFileSize))
-            {
-                rollOverSize();
-            }
-        }
-
-        super.subAppend(event);
-    }
-
-    public void setFile(String file)
-    {
-        baseFileName = file.trim();
-        fileName = file.trim();
-    }
-
-    /**
-     * Creates and opens the file for logging.  If <code>staticLogFileName</code> is false then the fully qualified name
-     * is determined and used.
-     */
-    public synchronized void setFile(String fileName, boolean append) throws IOException
-    {
-        if (!staticLogFileName)
-        {
-            scheduledFilename = fileName = fileName.trim() + sdf.format(now);
-            if (countDirection > 0)
-            {
-                scheduledFilename = fileName = fileName + '.' + (++curSizeRollBackups);
-            }
-        }
-
-        super.setFile(fileName, append, bufferedIO, bufferSize);
-
-        if (append)
-        {
-            File f = new File(fileName);
-            ((CountingQuietWriter) qw).setCount(f.length());
-        }
-    }
-
-    public int getCountDirection()
-    {
-        return countDirection;
-    }
-
-    public void setCountDirection(int direction)
-    {
-        countDirection = direction;
-    }
-
-    public int getRollingStyle()
-    {
-        return rollingStyle;
-    }
-
-    public void setRollingStyle(int style)
-    {
-        rollingStyle = style;
-        switch (rollingStyle)
-        {
-
-        case BY_SIZE:
-            rollDate = false;
-            rollSize = true;
-            break;
-
-        case BY_DATE:
-            rollDate = true;
-            rollSize = false;
-            break;
-
-        case BY_COMPOSITE:
-            rollDate = true;
-            rollSize = true;
-            break;
-
-        default:
-            errorHandler.error("Invalid rolling Style, use 1 (by size only), 2 (by date only) or 3 (both)");
-        }
-    }
-
-    /*
-        public void setRollingStyle(String style) {
-            if (style == S_BY_SIZE) {
-                rollingStyle = BY_SIZE;
-            }
-            else if (style == S_BY_DATE) {
-                rollingStyle = BY_DATE;
-            }
-            else if (style == S_BY_COMPOSITE) {
-                rollingStyle = BY_COMPOSITE;
-            }
-        }
-     */
-    public boolean getStaticLogFileName()
-    {
-        return staticLogFileName;
-    }
-
-    public void setStaticLogFileName(boolean s)
-    {
-        staticLogFileName = s;
-    }
-
-    public void setStaticLogFileName(String value)
-    {
-        setStaticLogFileName(OptionConverter.toBoolean(value, true));
-    }
-
-    public boolean getCompressBackupFiles()
-    {
-        return compress;
-    }
-
-    public void setCompressBackupFiles(boolean c)
-    {
-        compress = c;
-    }
-
-    public boolean getCompressAsync()
-    {
-        return compressAsync;
-    }
-
-    public void setCompressAsync(boolean c)
-    {
-        compressAsync = c;
-        if (compressAsync)
-        {
-            executor = Executors.newFixedThreadPool(1);
-
-            compressor = new Compressor();
-        }
-    }
-
-    public boolean getZeroBased()
-    {
-        return zeroBased;
-    }
-
-    public void setZeroBased(boolean z)
-    {
-        zeroBased = z;
-    }
-
-    public String getBackupFilesToPath()
-    {
-        return backupFilesToPath;
-    }
-
-    public void setbackupFilesToPath(String path)
-    {
-        File td = new File(path);
-        if (!td.exists())
-        {
-            td.mkdirs();
-        }
-
-        backupFilesToPath = path;
-    }
-
-    /**
-     * Initializes based on exisiting conditions at time of <code> activateOptions</code>.  The following is done:<br>
-     * <br> A) determine curSizeRollBackups<br> B) determine curTimeRollBackups (not implemented)<br> C) initiates a
-     * roll over if needed for crossing a date boundary since the last run.
-     */
-    protected void existingInit()
-    {
-
-        if (zeroBased)
-        {
-            curSizeRollBackups = -1;
-        }
-
-        curTimeRollBackups = 0;
-
-        // part A starts here
-        String filter;
-        if (staticLogFileName || !rollDate)
-        {
-            filter = baseFileName + ".*";
-        }
-        else
-        {
-            filter = scheduledFilename + ".*";
-        }
-
-        File f = new File(baseFileName);
-        f = f.getParentFile();
-        if (f == null)
-        {
-            f = new File(".");
-        }
-
-        LogLog.debug("Searching for existing files in: " + f);
-        String[] files = f.list();
-
-        if (files != null)
-        {
-            for (int i = 0; i < files.length; i++)
-            {
-                if (!files[i].startsWith(baseFileName))
-                {
-                    continue;
-                }
-
-                int index = files[i].lastIndexOf(".");
-
-                if (staticLogFileName)
-                {
-                    int endLength = files[i].length() - index;
-                    if ((baseFileName.length() + endLength) != files[i].length())
-                    {
-                        // file is probably scheduledFilename + .x so I don't care
-                        continue;
-                    }
-                }
-
-                try
-                {
-                    int backup = Integer.parseInt(files[i].substring(index + 1, files[i].length()));
-                    LogLog.debug("From file: " + files[i] + " -> " + backup);
-                    if (backup > curSizeRollBackups)
-                    {
-                        curSizeRollBackups = backup;
-                    }
-                }
-                catch (Exception e)
-                {
-                    // this happens when file.log -> file.log.yyyy-mm-dd which is normal
-                    // when staticLogFileName == false
-                    LogLog.debug("Encountered a backup file not ending in .x " + files[i]);
-                }
-            }
-        }
-
-        LogLog.debug("curSizeRollBackups starts at: " + curSizeRollBackups);
-        // part A ends here
-
-        // part B not yet implemented
-
-        // part C
-        if (staticLogFileName && rollDate)
-        {
-            File old = new File(baseFileName);
-            if (old.exists())
-            {
-                Date last = new Date(old.lastModified());
-                if (!(sdf.format(last).equals(sdf.format(now))))
-                {
-                    scheduledFilename = baseFileName + sdf.format(last);
-                    LogLog.debug("Initial roll over to: " + scheduledFilename);
-                    rollOverTime();
-                }
-            }
-        }
-
-        LogLog.debug("curSizeRollBackups after rollOver at: " + curSizeRollBackups);
-        // part C ends here
-
-    }
-
-    /**
-     * Sets initial conditions including date/time roll over information, first check, scheduledFilename, and calls
-     * <code>existingInit</code> to initialize the current # of backups.
-     */
-    public void activateOptions()
-    {
-
-        // REMOVE removed rollDate from boolean to enable Alex's change
-        if (datePattern != null)
-        {
-            now.setTime(System.currentTimeMillis());
-            sdf = new SimpleDateFormat(datePattern);
-            int type = computeCheckPeriod();
-            // printPeriodicity(type);
-            rc.setType(type);
-            // next line added as this removes the name check in rollOver
-            nextCheck = rc.getNextCheckMillis(now);
-        }
-        else
-        {
-            if (rollDate)
-            {
-                LogLog.error("Either DatePattern or rollingStyle options are not set for [" + name + "].");
-            }
-        }
-
-        existingInit();
-
-        if (rollDate && (fileName != null) && (scheduledFilename == null))
-        {
-            scheduledFilename = fileName + sdf.format(now);
-        }
-
-        try
-        {
-            this.setFile(fileName, true);
-        }
-        catch (IOException e)
-        {
-            errorHandler.error("Cannot set file name:" + fileName);
-        }
-
-        super.activateOptions();
-    }
-
-    /**
-     * Rollover the file(s) to date/time tagged file(s). Opens the new file (through setFile) and resets
-     * curSizeRollBackups.
-     */
-    protected void rollOverTime()
-    {
-
-        curTimeRollBackups++;
-
-        this.closeFile(); // keep windows happy.
-
-        // delete the old stuff here
-
-        if (staticLogFileName)
-        {
-            /* Compute filename, but only if datePattern is specified */
-            if (datePattern == null)
-            {
-                errorHandler.error("Missing DatePattern option in rollOver().");
-
-                return;
-            }
-
-            // is the new file name equivalent to the 'current' one
-            // something has gone wrong if we hit this -- we should only
-            // roll over if the new file will be different from the old
-            String dateFormat = sdf.format(now);
-            if (scheduledFilename.equals(fileName + dateFormat))
-            {
-                errorHandler.error("Compare " + scheduledFilename + " : " + fileName + dateFormat);
-
-                return;
-            }
-
-            // close current file, and rename it to datedFilename
-            this.closeFile();
-
-            // we may have to roll over a large number of backups here
-            String from, to;
-            for (int i = 1; i <= curSizeRollBackups; i++)
-            {
-                from = fileName + '.' + i;
-                to = scheduledFilename + '.' + i;
-                rollFile(from, to, false);
-            }
-
-            rollFile(fileName, scheduledFilename, compress);
-        }
-        else
-        {
-            if (compress)
-            {
-                compress(fileName);
-            }
-        }
-
-        try
-        {
-            // This will also close the file. This is OK since multiple
-            // close operations are safe.
-            curSizeRollBackups = 0; // We're cleared out the old date and are ready for the new
-
-            // new scheduled name
-            scheduledFilename = fileName + sdf.format(now);
-            this.setFile(baseFileName, false);
-        }
-        catch (IOException e)
-        {
-            errorHandler.error("setFile(" + fileName + ", false) call failed.");
-        }
-
-    }
-
-    /**
-     * Renames file <code>from</code> to file <code>to</code>.  It also checks for existence of target file and deletes
-     * if it does.
-     */
-    protected void rollFile(String from, String to, boolean compress)
-    {
-        if (from.equals(to))
-        {
-            if (compress)
-            {
-                LogLog.debug("Attempting to compress file with same output name.");
-            }
-
-            return;
-        }
-
-        File target = new File(to);
-        if (target.exists())
-        {
-            LogLog.debug("deleting existing target file: " + target);
-            target.delete();
-        }
-
-        File file = new File(from);
-        if (compress)
-        {
-            compress(file, target);
-        }
-        else
-        {
-            if (!file.getPath().equals(target.getPath()))
-            {
-                file.renameTo(target);
-            }
-        }
-
-        LogLog.debug(from + " -> " + to);
-    }
-
-    protected void compress(String file)
-    {
-        File f = new File(file);
-        compress(f, f);
-    }
-
-    private void compress(File from, File target)
-    {
-        if (compressAsync)
-        {
-            synchronized (_compress)
-            {
-                _compress.offer(new CompressJob(from, target));
-            }
-
-            startCompression();
-        }
-        else
-        {
-            doCompress(from, target);
-        }
-    }
-
-    private void startCompression()
-    {
-        if (_compressing.compareAndSet(false, true))
-        {
-            executor.execute(compressor);
-        }
-    }
-
-    /** Delete's the specified file if it exists */
-    protected static void deleteFile(String fileName)
-    {
-        File file = new File(fileName);
-        if (file.exists())
-        {
-            file.delete();
-        }
-    }
-
-    /**
-     * Implements roll overs base on file size.
-     *
-     * <p>If the maximum number of size based backups is reached (<code>curSizeRollBackups == maxSizeRollBackups</code)
-     * then the oldest file is deleted -- it's index determined by the sign of countDirection.<br> If
-     * <code>countDirection</code> < 0, then files {<code>File.1</code>, ..., <code>File.curSizeRollBackups -1</code>}
-     * are renamed to {<code>File.2</code>, ..., <code>File.curSizeRollBackups</code>}.  Moreover, <code>File</code> is
-     * renamed <code>File.1</code> and closed.<br>
-     *
-     * A new file is created to receive further log output.
-     *
-     * <p>If <code>maxSizeRollBackups</code> is equal to zero, then the <code>File</code> is truncated with no backup
-     * files created.
-     *
-     * <p>If <code>maxSizeRollBackups</code> < 0, then <code>File</code> is renamed if needed and no files are deleted.
-     */
-
-    // synchronization not necessary since doAppend is alreasy synched
-    protected void rollOverSize()
-    {
-        File file;
-
-        this.closeFile(); // keep windows happy.
-
-        LogLog.debug("rolling over count=" + ((CountingQuietWriter) qw).getCount());
-        LogLog.debug("maxSizeRollBackups = " + maxSizeRollBackups);
-        LogLog.debug("curSizeRollBackups = " + curSizeRollBackups);
-        LogLog.debug("countDirection = " + countDirection);
-
-        // If maxBackups <= 0, then there is no file renaming to be done.
-        if (maxSizeRollBackups != 0)
-        {
-
-            if (countDirection < 0)
-            {
-                // Delete the oldest file, to keep Windows happy.
-                if (curSizeRollBackups == maxSizeRollBackups)
-                {
-                    deleteFile(fileName + '.' + maxSizeRollBackups);
-                    curSizeRollBackups--;
-                }
-
-                // Map {(maxBackupIndex - 1), ..., 2, 1} to {maxBackupIndex, ..., 3, 2}
-                for (int i = curSizeRollBackups; i >= 1; i--)
-                {
-                    rollFile((fileName + "." + i), (fileName + '.' + (i + 1)), false);
-                }
-
-                curSizeRollBackups++;
-                // Rename fileName to fileName.1
-                rollFile(fileName, fileName + ".1", compress);
-
-            } // REMOVE This code branching for Alexander Cerna's request
-            else if (countDirection == 0)
-            {
-                // rollFile based on date pattern
-                curSizeRollBackups++;
-                now.setTime(System.currentTimeMillis());
-                scheduledFilename = fileName + sdf.format(now);
-                rollFile(fileName, scheduledFilename, compress);
-            }
-            else
-            { // countDirection > 0
-                if ((curSizeRollBackups >= maxSizeRollBackups) && (maxSizeRollBackups > 0))
-                {
-                    // delete the first and keep counting up.
-                    int oldestFileIndex = curSizeRollBackups - maxSizeRollBackups + 1;
-                    deleteFile(fileName + '.' + oldestFileIndex);
-                }
-
-                if (staticLogFileName)
-                {
-                    curSizeRollBackups++;
-                    rollFile(fileName, fileName + '.' + curSizeRollBackups, compress);
-                }
-                else
-                {
-                    if (compress)
-                    {
-                        compress(fileName);
-                    }
-                }
-            }
-        }
-
-        try
-        {
-            // This will also close the file. This is OK since multiple
-            // close operations are safe.
-            this.setFile(baseFileName, false);
-        }
-        catch (IOException e)
-        {
-            LogLog.error("setFile(" + fileName + ", false) call failed.", e);
-        }
-    }
-
-    protected synchronized void doCompress(File from, File to)
-    {
-        String toFile;
-        if (backupFilesToPath == null)
-        {
-            toFile = to.getPath() + ".gz";
-        }
-        else
-        {
-            toFile = backupFilesToPath + System.getProperty("file.separator") + to.getName() + ".gz";
-        }
-
-        File target = new File(toFile);
-        if (target.exists())
-        {
-            LogLog.debug("deleting existing target file: " + target);
-            target.delete();
-        }
-
-        try
-        {
-            // Create the GZIP output stream
-            GZIPOutputStream out = new GZIPOutputStream(new FileOutputStream(target));
-
-            // Open the input file
-            FileInputStream in = new FileInputStream(from);
-
-            // Transfer bytes from the input file to the GZIP output stream
-            byte[] buf = new byte[1024];
-            int len;
-            while ((len = in.read(buf)) > 0)
-            {
-                out.write(buf, 0, len);
-            }
-
-            in.close();
-
-            // Complete the GZIP file
-            out.finish();
-            out.close();
-            // Remove old file.
-            from.delete();
-        }
-        catch (IOException e)
-        {
-            if (target.exists())
-            {
-                target.delete();
-            }
-
-            rollFile(from.getPath(), to.getPath(), false);
-        }
-    }
-
-    private class CompressJob
-    {
-        File _from, _to;
-
-        CompressJob(File from, File to)
-        {
-            _from = from;
-            _to = to;
-        }
-
-        File getFrom()
-        {
-            return _from;
-        }
-
-        File getTo()
-        {
-            return _to;
-        }
-    }
-
-    Compressor compressor = null;
-
-    Executor executor;
-
-    private class Compressor implements Runnable
-    {
-        public void run()
-        {
-            boolean running = true;
-            while (running)
-            {
-                CompressJob job = _compress.poll();
-
-                doCompress(job.getFrom(), job.getTo());
-
-                synchronized (_compress)
-                {
-                    if (_compress.isEmpty())
-                    {
-                        running = false;
-                        _compressing.set(false);
-                    }
-                }
-            }
-
-        }
-    }
-}
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
deleted file mode 100644
index 40ff590a0a..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/configuration/Configuration.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.    
- * 
- */
-package org.apache.qpid.configuration;
-
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.Option;
-import org.apache.commons.cli.Options;
-import org.apache.commons.cli.ParseException;
-import org.apache.commons.cli.PosixParser;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.File;
-
-public class Configuration
-{
-    public static final String QPID_HOME = "QPID_HOME";
-
-    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;
-
-
-    public Configuration()
-    {
-
-    }
-
-    public void processCommandline(String[] args) throws InitException
-    {
-        try
-        {
-            _commandLine = new PosixParser().parse(_options, args);
-        }
-        catch (ParseException e)
-        {
-            throw new InitException("Unable to parse commmandline", e);
-        }
-
-        final File defaultConfigFile = new File(QPIDHOME, DEFAULT_CONFIG_FILE);
-        setConfig(new File(_commandLine.getOptionValue("c", defaultConfigFile.getPath())));
-    }
-
-    public void setConfig(File file)
-    {
-        _configFile = file;
-    }
-
-    /**
-     * @param option The option to set.
-     */
-    public void setOption(Option option)
-    {
-        _options.addOption(option);
-    }
-
-    /**
-     * getOptionValue from the configuration
-     * @param option variable argument, first string is option to get, second if present is the default value.
-     * @return the String for the given option or null if not present (if default value not specified)
-     */
-    public String getOptionValue(String... option)
-    {
-        if (option.length == 1)
-        {
-            return _commandLine.getOptionValue(option[0]);
-        }
-        else if (option.length == 2)
-        {
-            return _commandLine.getOptionValue(option[0], option[1]);
-        }
-        return null;
-    }
-
-    public void loadConfig(File file) throws InitException
-    {
-        setConfig(file);
-        loadConfig();
-    }
-
-    private void loadConfig() throws InitException
-    {
-        if (!_configFile.exists())
-        {
-            String error = "File " + _configFile + " could not be found. Check the file exists and is readable.";
-
-            if (QPIDHOME == null)
-            {
-                error = error + "\nNote: " + QPID_HOME + " is not set.";
-            }
-
-            throw new InitException(error, null);
-        }
-        else
-        {
-            _devlog.debug("Using configuration file " + _configFile.getAbsolutePath());
-        }
-
-//        String logConfig = _commandLine.getOptionValue("l");
-//        String logWatchConfig = _commandLine.getOptionValue("w", "0");
-//        if (logConfig != null)
-//        {
-//            File logConfigFile = new File(logConfig);
-//            configureLogging(logConfigFile, logWatchConfig);
-//        }
-//        else
-//        {
-//            File configFileDirectory = _configFile.getParentFile();
-//            File logConfigFile = new File(configFileDirectory, DEFAULT_LOG_CONFIG_FILENAME);
-//            configureLogging(logConfigFile, logWatchConfig);
-//        }
-    }
-
-
-//    private void configureLogging(File logConfigFile, String logWatchConfig)
-//    {
-//        int logWatchTime = 0;
-//        try
-//        {
-//            logWatchTime = Integer.parseInt(logWatchConfig);
-//        }
-//        catch (NumberFormatException e)
-//        {
-//            _devlog.error("Log watch configuration value of " + logWatchConfig + " is invalid. Must be "
-//                          + "a non-negative integer. Using default of zero (no watching configured");
-//        }
-//
-//        if (logConfigFile.exists() && logConfigFile.canRead())
-//        {
-//            _devlog.info("Configuring logger using configuration file " + logConfigFile.getAbsolutePath());
-//            if (logWatchTime > 0)
-//            {
-//                _devlog.info("log file " + logConfigFile.getAbsolutePath() + " will be checked for changes every "
-//                             + logWatchTime + " seconds");
-//                // log4j expects the watch interval in milliseconds
-//                DOMConfigurator.configureAndWatch(logConfigFile.getAbsolutePath(), logWatchTime * 1000);
-//            }
-//            else
-//            {
-//                DOMConfigurator.configure(logConfigFile.getAbsolutePath());
-//            }
-//        }
-//        else
-//        {
-//            System.err.println("Logging configuration error: unable to read file " + logConfigFile.getAbsolutePath());
-//            System.err.println("Using basic log4j configuration");
-//            BasicConfigurator.configure();
-//        }
-//    }
-
-    public File getConfigFile()
-    {
-        return _configFile;
-    }
-
-
-    public class InitException extends Exception
-    {
-        InitException(String msg, Throwable cause)
-        {
-            super(msg, cause);
-        }
-    }
-}
\ No newline at end of file
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
deleted file mode 100644
index 6d67686d1c..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQBrokerManagerMBean.java
+++ /dev/null
@@ -1,256 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-/*
- *
- * Copyright (c) 2006 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package org.apache.qpid.server;
-
-import org.apache.commons.configuration.Configuration;
-import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.server.configuration.Configurator;
-import org.apache.qpid.server.configuration.VirtualHostConfiguration;
-import org.apache.qpid.server.exchange.Exchange;
-import org.apache.qpid.server.exchange.ExchangeFactory;
-import org.apache.qpid.server.exchange.ExchangeRegistry;
-import org.apache.qpid.server.management.AMQManagedObject;
-import org.apache.qpid.server.management.MBeanConstructor;
-import org.apache.qpid.server.management.MBeanDescription;
-import org.apache.qpid.server.management.ManagedBroker;
-import org.apache.qpid.server.management.ManagedObject;
-import org.apache.qpid.server.queue.AMQQueue;
-import org.apache.qpid.server.queue.QueueRegistry;
-import org.apache.qpid.server.store.MessageStore;
-import org.apache.qpid.server.virtualhost.VirtualHost;
-
-import javax.management.JMException;
-import javax.management.MBeanException;
-import javax.management.MalformedObjectNameException;
-import javax.management.ObjectName;
-
-/**
- * This MBean implements the broker management interface and exposes the
- * Broker level management features like creating and deleting exchanges and queue.
- */
-@MBeanDescription("This MBean exposes the broker level management features")
-public class AMQBrokerManagerMBean extends AMQManagedObject implements ManagedBroker
-{
-    private final QueueRegistry _queueRegistry;
-    private final ExchangeRegistry _exchangeRegistry;
-    private final ExchangeFactory _exchangeFactory;
-    private final MessageStore _messageStore;
-
-    private final VirtualHost.VirtualHostMBean _virtualHostMBean;
-
-    @MBeanConstructor("Creates the Broker Manager MBean")
-    public AMQBrokerManagerMBean(VirtualHost.VirtualHostMBean virtualHostMBean) throws JMException
-    {
-        super(ManagedBroker.class, ManagedBroker.TYPE);
-
-        _virtualHostMBean = virtualHostMBean;
-        VirtualHost virtualHost = virtualHostMBean.getVirtualHost();
-
-        _queueRegistry = virtualHost.getQueueRegistry();
-        _exchangeRegistry = virtualHost.getExchangeRegistry();
-        _messageStore = virtualHost.getMessageStore();
-        _exchangeFactory = virtualHost.getExchangeFactory();
-    }
-
-    public String getObjectInstanceName()
-    {
-        return _virtualHostMBean.getVirtualHost().getName();
-    }
-
-    /**
-     * Creates new exchange and registers it with the registry.
-     *
-     * @param exchangeName
-     * @param type
-     * @param durable
-     * @throws JMException
-     */
-    public void createNewExchange(String exchangeName, String type, boolean durable) throws JMException
-    {
-        try
-        {
-            synchronized (_exchangeRegistry)
-            {
-                Exchange exchange = _exchangeRegistry.getExchange(new AMQShortString(exchangeName));
-                if (exchange == null)
-                {
-                    exchange = _exchangeFactory.createExchange(new AMQShortString(exchangeName),
-                                                               new AMQShortString(type), durable, false, 0);
-                    _exchangeRegistry.registerExchange(exchange);
-                }
-                else
-                {
-                    throw new JMException("The exchange \"" + exchangeName + "\" already exists.");
-                }
-            }
-        }
-        catch (AMQException ex)
-        {
-            throw new MBeanException(ex, "Error in creating exchange " + exchangeName);
-        }
-    }
-
-    /**
-     * Unregisters the exchange from registry.
-     *
-     * @param exchangeName
-     * @throws JMException
-     */
-    public void unregisterExchange(String exchangeName) throws JMException
-    {
-        // TODO
-        // Check if the exchange is in use.
-        // boolean inUse = false;
-        // Check if there are queue-bindings with the exchange and unregister
-        // when there are no bindings.
-        try
-        {
-            _exchangeRegistry.unregisterExchange(new AMQShortString(exchangeName), false);
-        }
-        catch (AMQException ex)
-        {
-            throw new MBeanException(ex, "Error in unregistering exchange " + exchangeName);
-        }
-    }
-
-    /**
-     * Creates a new queue and registers it with the registry and puts it
-     * in persistance storage if durable queue.
-     *
-     * @param queueName
-     * @param durable
-     * @param owner
-     * @throws JMException
-     */
-    public void createNewQueue(String queueName, String owner, boolean durable) throws JMException
-    {
-        AMQQueue queue = _queueRegistry.getQueue(new AMQShortString(queueName));
-        if (queue != null)
-        {
-            throw new JMException("The queue \"" + queueName + "\" already exists.");
-        }
-
-        try
-        {
-            AMQShortString ownerShortString = null;
-            if (owner != null)
-            {
-                ownerShortString = new AMQShortString(owner);
-            }
-
-            queue = new AMQQueue(new AMQShortString(queueName), durable, ownerShortString, false, getVirtualHost());
-            if (queue.isDurable() && !queue.isAutoDelete())
-            {
-                //DTX MessageStore
-//                try
-//                {
-                    _messageStore.createQueue(queue);
-//                }
-//                catch (Exception e)
-//                {
-//                    JMException jme = new JMException("problem creating queue " + queue.getName());
-//                    jme.initCause(e);
-//                    throw jme;
-//                }
-            }
-
-            Configuration virtualHostDefaultQueueConfiguration =
-                    VirtualHostConfiguration.getDefaultQueueConfiguration(queue);
-            if (virtualHostDefaultQueueConfiguration != null)
-            {
-                Configurator.configure(queue, virtualHostDefaultQueueConfiguration);
-            }
-
-            _queueRegistry.registerQueue(queue);
-        }
-        catch (AMQException ex)
-        {
-            throw new MBeanException(ex, "Error in creating queue " + queueName);
-        }
-    }
-
-    private VirtualHost getVirtualHost()
-    {
-        return _virtualHostMBean.getVirtualHost();
-    }
-
-    /**
-     * Deletes the queue from queue registry and persistant storage.
-     *
-     * @param queueName
-     * @throws JMException
-     */
-    public void deleteQueue(String queueName) throws JMException
-    {
-        AMQQueue queue = _queueRegistry.getQueue(new AMQShortString(queueName));
-        if (queue == null)
-        {
-            throw new JMException("The Queue " + queueName + " is not a registerd queue.");
-        }
-
-        try
-        {
-            queue.delete();
-
-            //DTX MessageStore
-//            if (queue.isDurable())
-//            {
-//                _messageStore.destroyQueue(queue);
-            _messageStore.removeQueue(queue.getName());
-//            }
-        }
-        catch (Exception ex)
-        {
-            /*ex.printStackTrace();
-            JMException jme = new JMException(ex.getMessage());*/
-            throw new MBeanException(ex, "Error in deleting queue " + queueName);
-        }
-    }
-
-    public ManagedObject getParentObject()
-    {
-        return _virtualHostMBean;
-    }
-
-    // This will have a single instance for a virtual host, so not having the name property in the ObjectName
-    public ObjectName getObjectName() throws MalformedObjectNameException
-    {
-        return getObjectNameForSingleInstanceMBean();
-    }
-} // End of MBean class
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
deleted file mode 100644
index bd93ae2f85..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
+++ /dev/null
@@ -1,980 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server;
-
-import org.apache.log4j.Logger;
-import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.framing.ContentBody;
-import org.apache.qpid.framing.ContentHeaderBody;
-import org.apache.qpid.framing.FieldTable;
-import org.apache.qpid.framing.abstraction.MessagePublishInfo;
-import org.apache.qpid.server.ack.UnacknowledgedMessage;
-import org.apache.qpid.server.ack.UnacknowledgedMessageMap;
-import org.apache.qpid.server.ack.UnacknowledgedMessageMapImpl;
-import org.apache.qpid.server.exchange.MessageRouter;
-import org.apache.qpid.server.exchange.NoRouteException;
-import org.apache.qpid.server.protocol.AMQProtocolSession;
-import org.apache.qpid.server.queue.AMQMessage;
-import org.apache.qpid.server.queue.AMQQueue;
-import org.apache.qpid.server.queue.MessageHandleFactory;
-import org.apache.qpid.server.queue.Subscription;
-import org.apache.qpid.server.store.MessageStore;
-import org.apache.qpid.server.store.StoreContext;
-import org.apache.qpid.server.txn.LocalTransactionalContext;
-import org.apache.qpid.server.txn.NonTransactionalContext;
-import org.apache.qpid.server.txn.TransactionManager;
-import org.apache.qpid.server.txn.TransactionalContext;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicLong;
-
-public class AMQChannel
-{
-    public static final int DEFAULT_PREFETCH = 5000;
-
-    private static final Logger _log = Logger.getLogger(AMQChannel.class);
-
-    private final int _channelId;
-
-    // private boolean _transactional;
-
-    private long _prefetch_HighWaterMark;
-
-    private long _prefetch_LowWaterMark;
-
-    private long _prefetchSize;
-
-    /**
-     * The delivery tag is unique per channel. This is pre-incremented before putting into the deliver frame so that
-     * value of this represents the <b>last</b> tag sent out
-     */
-    private AtomicLong _deliveryTag = new AtomicLong(0);
-
-    /** A channel has a default queue (the last declared) that is used when no queue name is explictily set */
-    private AMQQueue _defaultQueue;
-
-    /** This tag is unique per subscription to a queue. The server returns this in response to a basic.consume request. */
-    private int _consumerTag;
-
-    /**
-     * The current message - which may be partial in the sense that not all frames have been received yet - which has
-     * been received by this channel. As the frames are received the message gets updated and once all frames have been
-     * received the message can then be routed.
-     */
-    private AMQMessage _currentMessage;
-
-    /** Maps from consumer tag to queue instance. Allows us to unsubscribe from a queue. */
-    private final Map<AMQShortString, AMQQueue> _consumerTag2QueueMap = new HashMap<AMQShortString, AMQQueue>();
-
-    private final MessageStore _messageStore;
-
-    private final TransactionManager _transactionManager;
-
-    private UnacknowledgedMessageMap _unacknowledgedMessageMap = new UnacknowledgedMessageMapImpl(DEFAULT_PREFETCH);
-
-    private final AtomicBoolean _suspended = new AtomicBoolean(false);
-
-    private final MessageRouter _exchanges;
-
-    private TransactionalContext _txnContext, _nonTransactedContext;
-
-    /**
-     * A context used by the message store enabling it to track context for a given channel even across thread
-     * boundaries
-     */
-    private final StoreContext _storeContext;
-
-    private final List<RequiredDeliveryException> _returnMessages = new LinkedList<RequiredDeliveryException>();
-
-    private MessageHandleFactory _messageHandleFactory = new MessageHandleFactory();
-
-    private Set<Long> _browsedAcks = new HashSet<Long>();
-
-    // Why do we need this reference ? - ritchiem
-    private final AMQProtocolSession _session;
-    private boolean _closing;
-
-    public AMQChannel(AMQProtocolSession session, int channelId, TransactionManager transactionManager,
-                      MessageStore messageStore, MessageRouter exchanges) throws AMQException
-    {
-        _session = session;
-        _channelId = channelId;
-        _storeContext = new StoreContext("Session: " + session.getClientIdentifier() + "; channel: " + channelId);
-        _prefetch_HighWaterMark = DEFAULT_PREFETCH;
-        _prefetch_LowWaterMark = _prefetch_HighWaterMark / 2;
-        _messageStore = messageStore;
-        _transactionManager = transactionManager;
-        _exchanges = exchanges;
-        // by default the session is non-transactional
-        _txnContext = new NonTransactionalContext(_messageStore, _storeContext, this, _returnMessages, _browsedAcks);
-    }
-
-    /** Sets this channel to be part of a local transaction */
-    public void setLocalTransactional()
-    {
-
-        _txnContext = new LocalTransactionalContext(_messageStore, _storeContext, _returnMessages);
-
-        // Why is the LocalTransactionalContext always a DTX one?
-//        _txnContext =
-//            new DistributedTransactionalContext(_transactionManager, _messageStore, _storeContext, _returnMessages);
-    }
-
-    public boolean isTransactional()
-    {
-        // this does not look great but there should only be one "non-transactional"
-        // transactional context, while there could be several transactional ones in
-        // theory
-        return !(_txnContext instanceof NonTransactionalContext);
-    }
-
-    public int getChannelId()
-    {
-        return _channelId;
-    }
-
-    public long getPrefetchCount()
-    {
-        return _prefetch_HighWaterMark;
-    }
-
-    public void setPrefetchCount(long prefetchCount)
-    {
-        _prefetch_HighWaterMark = prefetchCount;
-    }
-
-    public long getPrefetchSize()
-    {
-        return _prefetchSize;
-    }
-
-    public void setPrefetchSize(long prefetchSize)
-    {
-        _prefetchSize = prefetchSize;
-    }
-
-    public long getPrefetchLowMarkCount()
-    {
-        return _prefetch_LowWaterMark;
-    }
-
-    public void setPrefetchLowMarkCount(long prefetchCount)
-    {
-        _prefetch_LowWaterMark = prefetchCount;
-    }
-
-    public long getPrefetchHighMarkCount()
-    {
-        return _prefetch_HighWaterMark;
-    }
-
-    public void setPrefetchHighMarkCount(long prefetchCount)
-    {
-        _prefetch_HighWaterMark = prefetchCount;
-    }
-
-    public void setPublishFrame(MessagePublishInfo info, AMQProtocolSession publisher) throws AMQException
-    {
-
-        _currentMessage = new AMQMessage(_messageStore.getNewMessageId(), info, _txnContext);
-        _currentMessage.setPublisher(publisher);
-    }
-
-    public void publishContentHeader(ContentHeaderBody contentHeaderBody, AMQProtocolSession protocolSession)
-            throws AMQException
-    {
-        if (_currentMessage == null)
-        {
-            throw new AMQException(null, "Received content header without previously receiving a BasicPublish frame", null);
-        }
-        else
-        {
-            if (_log.isTraceEnabled())
-            {
-                _log.trace(debugIdentity() + "Content header received on channel " + _channelId);
-            }
-
-            _currentMessage.setContentHeaderBody(contentHeaderBody);
-            _currentMessage.setExpiration();
-
-            routeCurrentMessage();
-            _currentMessage.routingComplete(_messageStore, _storeContext, _messageHandleFactory);
-
-            // check and deliver if header says body length is zero
-            if (contentHeaderBody.bodySize == 0)
-            {
-                _txnContext.messageProcessed(protocolSession);
-                _currentMessage = null;
-            }
-        }
-    }
-
-    public void publishContentBody(ContentBody contentBody, AMQProtocolSession protocolSession) throws AMQException
-    {
-        if (_currentMessage == null)
-        {
-            throw new AMQException(null, "Received content body without previously receiving a JmsPublishBody", null);
-        }
-
-        if (_log.isTraceEnabled())
-        {
-            _log.trace(debugIdentity() + "Content body received on channel " + _channelId);
-        }
-
-        try
-        {
-
-            // returns true iff the message was delivered (i.e. if all data was
-            // received
-            if (_currentMessage.addContentBodyFrame(_storeContext,
-                                                    protocolSession.getRegistry().getProtocolVersionMethodConverter().convertToContentChunk(
-                                                            contentBody)))
-            {
-                // callback to allow the context to do any post message processing
-                // primary use is to allow message return processing in the non-tx case
-                _txnContext.messageProcessed(protocolSession);
-                _currentMessage = null;
-            }
-        }
-        catch (AMQException e)
-        {
-            // we want to make sure we don't keep a reference to the message in the
-            // event of an error
-            _currentMessage = null;
-            throw e;
-        }
-    }
-
-    protected void routeCurrentMessage() throws AMQException
-    {
-        try
-        {
-            _exchanges.routeContent(_currentMessage);
-        }
-        catch (NoRouteException e)
-        {
-            _returnMessages.add(e);
-        }
-    }
-
-    public long getNextDeliveryTag()
-    {
-        return _deliveryTag.incrementAndGet();
-    }
-
-    public int getNextConsumerTag()
-    {
-        return ++_consumerTag;
-    }
-
-    /**
-     * Subscribe to a queue. We register all subscriptions in the channel so that if the channel is closed we can clean
-     * up all subscriptions, even if the client does not explicitly unsubscribe from all queues.
-     *
-     * @param tag       the tag chosen by the client (if null, server will generate one)
-     * @param queue     the queue to subscribe to
-     * @param session   the protocol session of the subscriber
-     * @param noLocal   Flag stopping own messages being receivied.
-     * @param exclusive Flag requesting exclusive access to the queue
-     * @param acks      Are acks enabled for this subscriber
-     * @param filters   Filters to apply to this subscriber
-     *
-     * @return the consumer tag. This is returned to the subscriber and used in subsequent unsubscribe requests
-     *
-     * @throws ConsumerTagNotUniqueException if the tag is not unique
-     * @throws AMQException                  if something goes wrong
-     */
-    public AMQShortString subscribeToQueue(AMQShortString tag, AMQQueue queue, AMQProtocolSession session, boolean acks,
-                                           FieldTable filters, boolean noLocal, boolean exclusive) throws AMQException, ConsumerTagNotUniqueException
-    {
-        if (tag == null)
-        {
-            tag = new AMQShortString("sgen_" + getNextConsumerTag());
-        }
-
-        if (_consumerTag2QueueMap.containsKey(tag))
-        {
-            throw new ConsumerTagNotUniqueException();
-        }
-
-        queue.registerProtocolSession(session, _channelId, tag, acks, filters, noLocal, exclusive);
-        _consumerTag2QueueMap.put(tag, queue);
-
-        return tag;
-    }
-
-    public void unsubscribeConsumer(AMQProtocolSession session, final AMQShortString consumerTag) throws AMQException
-    {
-        final AMQQueue q = _consumerTag2QueueMap.remove(consumerTag);
-        if (q != null)
-        {
-            q.unregisterProtocolSession(session, _channelId, consumerTag);
-        }
-    }
-
-    /**
-     * Called from the protocol session to close this channel and clean up. T
-     *
-     * @param session The session to close
-     *
-     * @throws AMQException if there is an error during closure
-     */
-    public void close(AMQProtocolSession session) throws AMQException
-    {
-        _txnContext.rollback();
-        unsubscribeAllConsumers(session);
-        requeue();
-
-        setClosing(true);
-    }
-
-    private void setClosing(boolean closing)
-    {
-        _closing = closing;
-    }
-
-    private void unsubscribeAllConsumers(AMQProtocolSession session) throws AMQException
-    {
-        if (_log.isInfoEnabled())
-        {
-            if (!_consumerTag2QueueMap.isEmpty())
-            {
-                _log.info("Unsubscribing all consumers on channel " + toString());
-            }
-            else
-            {
-                _log.info("No consumers to unsubscribe on channel " + toString());
-            }
-        }
-
-        for (Map.Entry<AMQShortString, AMQQueue> me : _consumerTag2QueueMap.entrySet())
-        {
-            if (_log.isInfoEnabled())
-            {
-                _log.info("Unsubscribing consumer '" + me.getKey() + "' on channel " + toString());
-            }
-
-            me.getValue().unregisterProtocolSession(session, _channelId, me.getKey());
-        }
-
-        _consumerTag2QueueMap.clear();
-    }
-
-    /**
-     * Add a message to the channel-based list of unacknowledged messages
-     *
-     * @param message     the message that was delivered
-     * @param deliveryTag the delivery tag used when delivering the message (see protocol spec for description of the
-     *                    delivery tag)
-     * @param consumerTag The tag for the consumer that is to acknowledge this message.
-     * @param queue       the queue from which the message was delivered
-     */
-    public void addUnacknowledgedMessage(AMQMessage message, long deliveryTag, AMQShortString consumerTag, AMQQueue queue)
-    {
-        if (_log.isDebugEnabled())
-        {
-            if (queue == null)
-            {
-                _log.debug("Adding unacked message with a null queue:" + message.debugIdentity());
-            }
-            else
-            {
-                if (_log.isDebugEnabled())
-                {
-                    _log.debug(debugIdentity() + " Adding unacked message(" + message.toString() + " DT:" + deliveryTag
-                               + ") with a queue(" + queue + ") for " + consumerTag);
-                }
-            }
-        }
-
-        synchronized (_unacknowledgedMessageMap.getLock())
-        {
-            _unacknowledgedMessageMap.add(deliveryTag, new UnacknowledgedMessage(queue, message, consumerTag, deliveryTag));
-            checkSuspension();
-        }
-    }
-
-    private final String id = "(" + System.identityHashCode(this) + ")";
-
-    public String debugIdentity()
-    {
-        return _channelId + id;
-    }
-
-    /**
-     * Called to attempt re-delivery all outstanding unacknowledged messages on the channel. May result in delivery to
-     * this same channel or to other subscribers.
-     *
-     * @throws org.apache.qpid.AMQException if the requeue fails
-     */
-    public void requeue() throws AMQException
-    {
-        // we must create a new map since all the messages will get a new delivery tag when they are redelivered
-        Collection<UnacknowledgedMessage> messagesToBeDelivered = _unacknowledgedMessageMap.cancelAllMessages();
-
-        // Deliver these messages out of the transaction as their delivery was never
-        // part of the transaction only the receive.
-        TransactionalContext deliveryContext = null;
-
-        if (!messagesToBeDelivered.isEmpty())
-        {
-            if (_log.isInfoEnabled())
-            {
-                _log.info("Requeuing " + messagesToBeDelivered.size() + " unacked messages. for " + toString());
-            }
-
-            if (!(_txnContext instanceof NonTransactionalContext))
-            {
-                // if (_nonTransactedContext == null)
-                {
-                    _nonTransactedContext =
-                            new NonTransactionalContext(_messageStore, _storeContext, this, _returnMessages, _browsedAcks);
-                }
-
-                deliveryContext = _nonTransactedContext;
-            }
-            else
-            {
-                deliveryContext = _txnContext;
-            }
-        }
-
-        for (UnacknowledgedMessage unacked : messagesToBeDelivered)
-        {
-            if (unacked.queue != null)
-            {
-                // Ensure message is released for redelivery
-                unacked.message.release(unacked.queue);
-
-                // Mark message redelivered
-                unacked.message.setRedelivered(true);
-
-                // Deliver Message
-                deliveryContext.deliver(unacked.message, unacked.queue, true);
-
-                // Should we allow access To the DM to directy deliver the message?
-                // As we don't need to check for Consumers or worry about incrementing the message count?
-                // unacked.queue.getDeliveryManager().deliver(_storeContext, unacked.queue.getName(), unacked.message, false);
-            }
-        }
-
-    }
-
-    /**
-     * Requeue a single message
-     *
-     * @param deliveryTag The message to requeue
-     *
-     * @throws AMQException If something goes wrong.
-     */
-    public void requeue(long deliveryTag) throws AMQException
-    {
-        UnacknowledgedMessage unacked = _unacknowledgedMessageMap.remove(deliveryTag);
-
-        if (unacked != null)
-        {
-
-            // Ensure message is released for redelivery
-            if (unacked.queue != null)
-            {
-                unacked.message.release(unacked.queue);
-            }
-
-            // Mark message redelivered
-            unacked.message.setRedelivered(true);
-
-            // Deliver these messages out of the transaction as their delivery was never
-            // part of the transaction only the receive.
-            TransactionalContext deliveryContext;
-            if (!(_txnContext instanceof NonTransactionalContext))
-            {
-                // if (_nonTransactedContext == null)
-                {
-                    _nonTransactedContext =
-                            new NonTransactionalContext(_messageStore, _storeContext, this, _returnMessages, _browsedAcks);
-                }
-
-                deliveryContext = _nonTransactedContext;
-            }
-            else
-            {
-                deliveryContext = _txnContext;
-            }
-
-            if (unacked.queue != null)
-            {
-                // Redeliver the messages to the front of the queue
-                deliveryContext.deliver(unacked.message, unacked.queue, true);
-                // Deliver increments the message count but we have already deliverted this once so don't increment it again
-                // this was because deliver did an increment changed this.
-            }
-            else
-            {
-                _log.warn(System.identityHashCode(this) + " Requested requeue of message(" + unacked.message.debugIdentity()
-                          + "):" + deliveryTag + " but no queue defined and no DeadLetter queue so DROPPING message.");
-                // _log.error("Requested requeue of message:" + deliveryTag +
-                // " but no queue defined using DeadLetter queue:" + getDeadLetterQueue());
-                //
-                // deliveryContext.deliver(unacked.message, getDeadLetterQueue(), false);
-                //
-            }
-        }
-        else
-        {
-            _log.warn("Requested requeue of message:" + deliveryTag + " but no such delivery tag exists."
-                      + _unacknowledgedMessageMap.size());
-
-            if (_log.isDebugEnabled())
-            {
-                _unacknowledgedMessageMap.visit(new UnacknowledgedMessageMap.Visitor()
-                {
-                    int count = 0;
-
-                    public boolean callback(UnacknowledgedMessage message) throws AMQException
-                    {
-                        _log.debug(
-                                (count++) + ": (" + message.message.debugIdentity() + ")" + "[" + message.deliveryTag + "]");
-
-                        return false; // Continue
-                    }
-
-                    public void visitComplete()
-                    {
-                    }
-                });
-            }
-        }
-
-    }
-
-    /**
-     * Called to resend all outstanding unacknowledged messages to this same channel.
-     *
-     * @param requeue Are the messages to be requeued or dropped.
-     *
-     * @throws AMQException When something goes wrong.
-     */
-    public void resend(final boolean requeue) throws AMQException
-    {
-        final List<UnacknowledgedMessage> msgToRequeue = new LinkedList<UnacknowledgedMessage>();
-        final List<UnacknowledgedMessage> msgToResend = new LinkedList<UnacknowledgedMessage>();
-
-        if (_log.isDebugEnabled())
-        {
-            _log.debug("unacked map Size:" + _unacknowledgedMessageMap.size());
-        }
-
-        // Process the Unacked-Map.
-        // Marking messages who still have a consumer for to be resent
-        // and those that don't to be requeued.
-        _unacknowledgedMessageMap.visit(new UnacknowledgedMessageMap.Visitor()
-        {
-            public boolean callback(UnacknowledgedMessage message) throws AMQException
-            {
-                AMQShortString consumerTag = message.consumerTag;
-                AMQMessage msg = message.message;
-                msg.setRedelivered(true);
-                if (consumerTag != null)
-                {
-                    // Consumer exists
-                    if (_consumerTag2QueueMap.containsKey(consumerTag))
-                    {
-                        msgToResend.add(message);
-                    }
-                    else // consumer has gone
-                    {
-                        msgToRequeue.add(message);
-                    }
-                }
-                else
-                {
-                    // Message has no consumer tag, so was "delivered" to a GET
-                    // or consumer no longer registered
-                    // cannot resend, so re-queue.
-                    if (message.queue != null)
-                    {
-                        if (requeue)
-                        {
-                            msgToRequeue.add(message);
-                        }
-                        else
-                        {
-                            _log.info("No DeadLetter Queue and requeue not requested so dropping message:" + message);
-                        }
-                    }
-                    else
-                    {
-                        _log.info("Message.queue is null and no DeadLetter Queue so dropping message:" + message);
-                    }
-                }
-
-                // false means continue processing
-                return false;
-            }
-
-            public void visitComplete()
-            {
-            }
-        });
-
-        // Process Messages to Resend
-        if (_log.isDebugEnabled())
-        {
-            if (!msgToResend.isEmpty())
-            {
-                _log.debug("Preparing (" + msgToResend.size() + ") message to resend.");
-            }
-            else
-            {
-                _log.debug("No message to resend.");
-            }
-        }
-
-        for (UnacknowledgedMessage message : msgToResend)
-        {
-            AMQMessage msg = message.message;
-
-            // Our Java Client will always suspend the channel when resending!
-            // If the client has requested the messages be resent then it is
-            // their responsibility to ensure that thay are capable of receiving them
-            // i.e. The channel hasn't been server side suspended.
-            // if (isSuspended())
-            // {
-            // _log.info("Channel is suspended so requeuing");
-            // //move this message to requeue
-            // msgToRequeue.add(message);
-            // }
-            // else
-            // {
-            // release to allow it to be delivered
-            msg.release(message.queue);
-
-            // Without any details from the client about what has been processed we have to mark
-            // all messages in the unacked map as redelivered.
-            msg.setRedelivered(true);
-
-            Subscription sub = msg.getDeliveredSubscription(message.queue);
-
-            if (sub != null)
-            {
-                // Get the lock so we can tell if the sub scription has closed.
-                // will stop delivery to this subscription until the lock is released.
-                // note: this approach would allow the use of a single queue if the
-                // PreDeliveryQueue would allow head additions.
-                // In the Java Qpid client we are suspended whilst doing this so it is all rather Mute..
-                // needs guidance from AMQP WG Model SIG
-                synchronized (sub.getSendLock())
-                {
-                    if (sub.isClosed())
-                    {
-                        if (_log.isDebugEnabled())
-                        {
-                            _log.debug("Subscription(" + System.identityHashCode(sub)
-                                       + ") closed during resend so requeuing message");
-                        }
-                        // move this message to requeue
-                        msgToRequeue.add(message);
-                    }
-                    else
-                    {
-                        if (_log.isDebugEnabled())
-                        {
-                            _log.debug("Requeuing " + msg.debugIdentity() + " for resend via sub:"
-                                       + System.identityHashCode(sub));
-                        }
-
-                        sub.addToResendQueue(msg);
-                        _unacknowledgedMessageMap.remove(message.deliveryTag);
-                    }
-                } // sync(sub.getSendLock)
-            }
-            else
-            {
-
-                if (_log.isInfoEnabled())
-                {
-                    _log.info("DeliveredSubscription not recorded so just requeueing(" + message.toString()
-                              + ")to prevent loss");
-                }
-                // move this message to requeue
-                msgToRequeue.add(message);
-            }
-        } // for all messages
-        // } else !isSuspend
-
-        if (_log.isInfoEnabled())
-        {
-            if (!msgToRequeue.isEmpty())
-            {
-                _log.info("Preparing (" + msgToRequeue.size() + ") message to requeue to.");
-            }
-        }
-
-        // Deliver these messages out of the transaction as their delivery was never
-        // part of the transaction only the receive.
-        TransactionalContext deliveryContext;
-        if (!(_txnContext instanceof NonTransactionalContext))
-        {
-            if (_nonTransactedContext == null)
-            {
-                _nonTransactedContext =
-                        new NonTransactionalContext(_messageStore, _storeContext, this, _returnMessages, _browsedAcks);
-            }
-
-            deliveryContext = _nonTransactedContext;
-        }
-        else
-        {
-            deliveryContext = _txnContext;
-        }
-
-        // Process Messages to Requeue at the front of the queue
-        for (UnacknowledgedMessage message : msgToRequeue)
-        {
-            message.message.release(message.queue);
-            message.message.setRedelivered(true);
-
-            deliveryContext.deliver(message.message, message.queue, true);
-
-            _unacknowledgedMessageMap.remove(message.deliveryTag);
-        }
-    }
-
-    /**
-     * Callback indicating that a queue has been deleted. We must update the structure of unacknowledged messages to
-     * remove the queue reference and also decrement any message reference counts, without actually removing the item
-     * since we may get an ack for a delivery tag that was generated from the deleted queue.
-     *
-     * @param queue the queue that has been deleted
-     *
-     * @throws org.apache.qpid.AMQException if there is an error processing the unacked messages
-     */
-    public void queueDeleted(final AMQQueue queue) throws AMQException
-    {
-        _unacknowledgedMessageMap.visit(new UnacknowledgedMessageMap.Visitor()
-        {
-            public boolean callback(UnacknowledgedMessage message) throws AMQException
-            {
-                if (message.queue == queue)
-                {
-                    try
-                    {
-                        message.discard(_storeContext);
-                        message.queue = null;
-                    }
-                    catch (AMQException e)
-                    {
-                        _log.error(
-                                "Error decrementing ref count on message " + message.message.getMessageId() + ": " + e, e);
-                    }
-                }
-
-                return false;
-            }
-
-            public void visitComplete()
-            {
-            }
-        });
-    }
-
-    /**
-     * Acknowledge one or more messages.
-     *
-     * @param deliveryTag the last delivery tag
-     * @param multiple    if true will acknowledge all messages up to an including the delivery tag. if false only
-     *                    acknowledges the single message specified by the delivery tag
-     *
-     * @throws AMQException if the delivery tag is unknown (e.g. not outstanding) on this channel
-     */
-    public void acknowledgeMessage(long deliveryTag, boolean multiple) throws AMQException
-    {
-        synchronized (_unacknowledgedMessageMap.getLock())
-        {
-            if (_log.isDebugEnabled())
-            {
-                _log.debug("Unacked (PreAck) Size:" + _unacknowledgedMessageMap.size());
-            }
-
-            _unacknowledgedMessageMap.acknowledgeMessage(deliveryTag, multiple, _txnContext);
-
-            if (_log.isDebugEnabled())
-            {
-                _log.debug("Unacked (PostAck) Size:" + _unacknowledgedMessageMap.size());
-            }
-
-        }
-
-        checkSuspension();
-    }
-
-    /**
-     * Used only for testing purposes.
-     *
-     * @return the map of unacknowledged messages
-     */
-    public UnacknowledgedMessageMap getUnacknowledgedMessageMap()
-    {
-        return _unacknowledgedMessageMap;
-    }
-
-    private void checkSuspension()
-    {
-        boolean suspend;
-
-        suspend =
-                ((_prefetch_HighWaterMark != 0) && (_unacknowledgedMessageMap.size() >= _prefetch_HighWaterMark))
-                || ((_prefetchSize != 0) && (_prefetchSize < _unacknowledgedMessageMap.getUnacknowledgeBytes()));
-
-        setSuspended(suspend);
-    }
-
-    public void setSuspended(boolean suspended)
-    {
-        boolean isSuspended = _suspended.get();
-
-        if (isSuspended && !suspended)
-        {
-            // Continue being suspended if we are above the _prefetch_LowWaterMark
-            suspended = _unacknowledgedMessageMap.size() > _prefetch_LowWaterMark;
-        }
-
-        boolean wasSuspended = _suspended.getAndSet(suspended);
-        if (wasSuspended != suspended)
-        {
-            if (wasSuspended)
-            {
-                _log.debug("Unsuspending channel " + this);
-                // may need to deliver queued messages
-                for (AMQQueue q : _consumerTag2QueueMap.values())
-                {
-                    q.deliverAsync();
-                }
-            }
-            else
-            {
-                _log.debug("Suspending channel " + this);
-            }
-        }
-    }
-
-    public boolean isSuspended()
-    {
-        return _suspended.get();
-    }
-
-    public void commit() throws AMQException
-    {
-        if (!isTransactional())
-        {
-            throw new AMQException(null, "Fatal error: commit called on non-transactional channel", null);
-        }
-
-        _txnContext.commit();
-    }
-
-    public void rollback() throws AMQException
-    {
-        _txnContext.rollback();
-    }
-
-    public String toString()
-    {
-        StringBuilder sb = new StringBuilder(30);
-        sb.append("Channel: id ").append(_channelId).append(", transaction mode: ").append(isTransactional());
-        sb.append(", prefetch marks: ").append(_prefetch_LowWaterMark);
-        sb.append("/").append(_prefetch_HighWaterMark);
-
-        return sb.toString();
-    }
-
-    public void setDefaultQueue(AMQQueue queue)
-    {
-        _defaultQueue = queue;
-    }
-
-    public AMQQueue getDefaultQueue()
-    {
-        return _defaultQueue;
-    }
-
-    public StoreContext getStoreContext()
-    {
-        return _storeContext;
-    }
-
-    public void processReturns(AMQProtocolSession session) throws AMQException
-    {
-        for (RequiredDeliveryException bouncedMessage : _returnMessages)
-        {
-            AMQMessage message = bouncedMessage.getAMQMessage();
-            session.getProtocolOutputConverter().writeReturn(message, _channelId, bouncedMessage.getReplyCode().getCode(),
-                                                             new AMQShortString(bouncedMessage.getMessage()));
-        }
-
-        _returnMessages.clear();
-    }
-
-    public boolean wouldSuspend(AMQMessage msg)
-    {
-        if (isSuspended())
-        {
-            return true;
-        }
-        else
-        {
-            boolean willSuspend =
-                    ((_prefetch_HighWaterMark != 0) && ((_unacknowledgedMessageMap.size() + 1) > _prefetch_HighWaterMark));
-            if (!willSuspend)
-            {
-                final long unackedSize = _unacknowledgedMessageMap.getUnacknowledgeBytes();
-
-                willSuspend = (_prefetchSize != 0) && (unackedSize != 0) && (_prefetchSize < (msg.getSize() + unackedSize));
-            }
-
-            if (willSuspend)
-            {
-                setSuspended(true);
-            }
-
-            return willSuspend;
-        }
-
-    }
-
-    public TransactionalContext getTransactionalContext()
-    {
-        return _txnContext;
-    }
-
-    public boolean isClosing()
-    {
-        return _closing;
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/ConsumerTagNotUniqueException.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/ConsumerTagNotUniqueException.java
deleted file mode 100644
index 3dc2654bd5..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/ConsumerTagNotUniqueException.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server;
-
-/**
- * ConsumerTagNotUniqueException indicates that a client has attempted to connect with a consumer tag that is already
- * used.
- *
- * <p/><table id="crc"><caption>CRC Card</caption>
- * <tr><th> Responsibilities <th> Collaborations
- * <tr><td> Represents error when clients connects with a non-unique tag.
- * </table>
- *
- * @todo Consider replacing with an AMQNotAllowedException, as this is the status code returned when this happens.
- */
-public class ConsumerTagNotUniqueException extends Exception
-{
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java
deleted file mode 100644
index 8932dd25f0..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java
+++ /dev/null
@@ -1,573 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server;
-
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.HelpFormatter;
-import org.apache.commons.cli.Option;
-import org.apache.commons.cli.OptionBuilder;
-import org.apache.commons.cli.Options;
-import org.apache.commons.cli.ParseException;
-import org.apache.commons.cli.PosixParser;
-import org.apache.commons.configuration.Configuration;
-import org.apache.commons.configuration.ConfigurationException;
-import org.apache.log4j.BasicConfigurator;
-import org.apache.log4j.Logger;
-import org.apache.log4j.xml.DOMConfigurator;
-import org.apache.mina.common.ByteBuffer;
-import org.apache.mina.common.IoAcceptor;
-import org.apache.mina.common.SimpleByteBufferAllocator;
-import org.apache.mina.transport.socket.nio.SocketAcceptorConfig;
-import org.apache.mina.transport.socket.nio.SocketSessionConfig;
-import org.apache.qpid.AMQException;
-import org.apache.qpid.common.QpidProperties;
-import org.apache.qpid.framing.ProtocolVersion;
-import org.apache.qpid.pool.ReadWriteThreadModel;
-import org.apache.qpid.server.configuration.VirtualHostConfiguration;
-import org.apache.qpid.server.management.JMXManagedObjectRegistry;
-import org.apache.qpid.server.protocol.AMQPFastProtocolHandler;
-import org.apache.qpid.server.protocol.AMQPProtocolProvider;
-import org.apache.qpid.server.registry.ApplicationRegistry;
-import org.apache.qpid.server.registry.ConfigurationFileApplicationRegistry;
-import org.apache.qpid.server.transport.ConnectorConfiguration;
-import org.apache.qpid.url.URLSyntaxException;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.BindException;
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.util.Collection;
-import java.util.List;
-
-/**
- * Main entry point for AMQPD.
- *
- */
-@SuppressWarnings({"AccessStaticViaInstance"})
-public class Main
-{
-    /** Used for debugging. */
-    private static final Logger _logger = Logger.getLogger(Main.class);
-
-    /** Used for logging operator messages. */
-    public static final Logger _brokerLogger = Logger.getLogger("Qpid.Broker");
-
-    private static final String DEFAULT_CONFIG_FILE = "etc/config.xml";
-
-    private static final String DEFAULT_LOG_CONFIG_FILENAME = "log4j.xml";
-    public static final String QPID_HOME = "QPID_HOME";
-    private static final int IPV4_ADDRESS_LENGTH = 4;
-
-    private static final char IPV4_LITERAL_SEPARATOR = '.';
-
-    protected static class InitException extends Exception
-    {
-        InitException(String msg, Throwable cause)
-        {
-            super(msg, cause);
-        }
-    }
-
-    protected final Options options = new Options();
-    protected CommandLine commandLine;
-
-    /**
-     * @todo Side-effecting constructor; eliminate. Put the processing sequence in the main method.
-     */
-    protected Main(String[] args)
-    {
-        setOptions(options);
-        if (parseCommandline(args))
-        {
-            execute();
-        }
-    }
-
-    protected boolean parseCommandline(String[] args)
-    {
-        try
-        {
-            commandLine = new PosixParser().parse(options, args);
-
-            return true;
-        }
-        catch (ParseException e)
-        {
-            System.err.println("Error: " + e.getMessage());
-            HelpFormatter formatter = new HelpFormatter();
-            formatter.printHelp("Qpid", options, true);
-
-            return false;
-        }
-    }
-
-    /**
-     * Sets up the command line options, with usage help, ready for parsing the command line against.
-     *
-     * @param options The object to store the configured command line options in.
-     */
-    protected void setOptions(Options options)
-    {
-        Option help = new Option("h", "help", false, "print this message");
-        Option version = new Option("v", "version", false, "print the version information and exit");
-        Option configFile =
-            OptionBuilder.withArgName("file").hasArg().withDescription("use given configuration file").withLongOpt("config")
-                         .create("c");
-        Option port =
-            OptionBuilder.withArgName("port").hasArg()
-                         .withDescription("listen on the specified port. Overrides any value in the config file")
-                         .withLongOpt("port").create("p");
-        Option mport =
-                OptionBuilder.withArgName("mport").hasArg()
-                        .withDescription("listen on the specified management port. Overrides any value in the config file")
-                        .withLongOpt("mport").create("m");
-
-
-        Option bind =
-            OptionBuilder.withArgName("bind").hasArg()
-                         .withDescription("bind to the specified address. Overrides any value in the config file")
-                         .withLongOpt("bind").create("b");
-        Option logconfig =
-            OptionBuilder.withArgName("logconfig").hasArg()
-                         .withDescription("use the specified log4j xml configuration file. By "
-                + "default looks for a file named " + DEFAULT_LOG_CONFIG_FILENAME
-                + " in the same directory as the configuration file").withLongOpt("logconfig").create("l");
-        Option logwatchconfig =
-            OptionBuilder.withArgName("logwatch").hasArg()
-                         .withDescription("monitor the log file configuration file for changes. Units are seconds. "
-                + "Zero means do not check for changes.").withLongOpt("logwatch").create("w");
-
-        options.addOption(help);
-        options.addOption(version);
-        options.addOption(configFile);
-        options.addOption(logconfig);
-        options.addOption(logwatchconfig);
-        options.addOption(port);
-        options.addOption(mport);
-        options.addOption(bind);
-    }
-
-    /**
-     * @todo Handles command line, but there is already a parse command line method. Put all command line handling
-     *       in a single flow of control. Also part implements the top-level handler, which would more neatly be kept
-     *       together in one place.
-     */
-    protected void execute()
-    {
-        // note this understands either --help or -h. If an option only has a long name you can use that but if
-        // an option has a short name and a long name you must use the short name here.
-        if (commandLine.hasOption("h"))
-        {
-            HelpFormatter formatter = new HelpFormatter();
-            formatter.printHelp("Qpid", options, true);
-        }
-        else if (commandLine.hasOption("v"))
-        {
-            String ver = QpidProperties.getVersionString();
-
-            StringBuilder protocol = new StringBuilder("AMQP version(s) [major.minor]: ");
-
-            boolean first = true;
-            for (ProtocolVersion pv : ProtocolVersion.getSupportedProtocolVersions())
-            {
-                if (first)
-                {
-                    first = false;
-                }
-                else
-                {
-                    protocol.append(", ");
-                }
-
-                protocol.append(pv.getMajorVersion()).append('-').append(pv.getMinorVersion());
-
-            }
-
-            System.out.println(ver + " (" + protocol + ")");
-        }
-        else
-        {
-            try
-            {
-                startup();
-            }
-            catch (InitException e)
-            {
-                System.out.println(e.getMessage());
-                _brokerLogger.error("Initialisation Error : " + e.getMessage());
-
-            }
-            catch (ConfigurationException e)
-            {
-                System.out.println("Error configuring message broker: " + e);
-                _brokerLogger.error("Error configuring message broker: " + e);
-                e.printStackTrace();
-            }
-            catch (Exception e)
-            {
-                System.out.println("Error intialising message broker: " + e);
-                _brokerLogger.error("Error intialising message broker: " + e);
-                e.printStackTrace();
-            }
-        }
-    }
-
-    /**
-     * Reads the configuration file and performs configuration specified in it. Then hands over to bind to do the
-     * actual broker start-up.
-     *
-     * @todo A bit confusing, seperate out configuration from start-up. Call config method to handle the configuration
-     *       from the config file, in the main flow of control (possibly #main method). Then call #startup or #bind
-     *       to start the broker.
-     */
-    protected void startup() throws InitException, ConfigurationException, Exception
-    {
-        final String QpidHome = System.getProperty(QPID_HOME);
-        final File defaultConfigFile = new File(QpidHome, DEFAULT_CONFIG_FILE);
-        final File configFile = new File(commandLine.getOptionValue("c", defaultConfigFile.getPath()));
-        if (!configFile.exists())
-        {
-            String error = "File " + configFile + " could not be found. Check the file exists and is readable.";
-
-            if (QpidHome == null)
-            {
-                error = error + "\nNote: " + QPID_HOME + " is not set.";
-            }
-
-            throw new InitException(error, null);
-        }
-        else
-        {
-            System.out.println("Using configuration file " + configFile.getAbsolutePath());
-        }
-
-        String logConfig = commandLine.getOptionValue("l");
-        String logWatchConfig = commandLine.getOptionValue("w", "0");
-        if (logConfig != null)
-        {
-            File logConfigFile = new File(logConfig);
-            configureLogging(logConfigFile, logWatchConfig);
-        }
-        else
-        {
-            File configFileDirectory = configFile.getParentFile();
-            File logConfigFile = new File(configFileDirectory, DEFAULT_LOG_CONFIG_FILENAME);
-            configureLogging(logConfigFile, logWatchConfig);
-        }
-
-        ConfigurationFileApplicationRegistry config = new ConfigurationFileApplicationRegistry(configFile);
-
-
-        updateManagementPort(config.getConfiguration(), commandLine.getOptionValue("m"));
-
-
-
-        ApplicationRegistry.initialise(config);
-
-
-        //fixme .. use QpidProperties.getVersionString when we have fixed the classpath issues
-        // that are causing the broker build to pick up the wrong properties file and hence say
-        // Starting Qpid Client
-        _brokerLogger.info("Starting Qpid Broker " + QpidProperties.getReleaseVersion()
-                           + " build: " + QpidProperties.getBuildVersion());
-
-        ConnectorConfiguration connectorConfig =
-            ApplicationRegistry.getInstance().getConfiguredObject(ConnectorConfiguration.class);
-
-        ByteBuffer.setUseDirectBuffers(connectorConfig.enableDirectBuffers);
-
-        // the MINA default is currently to use the pooled allocator although this may change in future
-        // once more testing of the performance of the simple allocator has been done
-        if (!connectorConfig.enablePooledAllocator)
-        {
-            ByteBuffer.setAllocator(new SimpleByteBufferAllocator());
-        }
-
-        int port = connectorConfig.port;
-
-        String portStr = commandLine.getOptionValue("p");
-        if (portStr != null)
-        {
-            try
-            {
-                port = Integer.parseInt(portStr);
-            }
-            catch (NumberFormatException e)
-            {
-                throw new InitException("Invalid port: " + portStr, e);
-            }
-        }
-
-        String VIRTUAL_HOSTS = "virtualhosts";
-
-        Object virtualHosts = ApplicationRegistry.getInstance().getConfiguration().getProperty(VIRTUAL_HOSTS);
-
-        if (virtualHosts != null)
-        {
-            if (virtualHosts instanceof Collection)
-            {
-                int totalVHosts = ((Collection) virtualHosts).size();
-                for (int vhost = 0; vhost < totalVHosts; vhost++)
-                {
-                    setupVirtualHosts(configFile.getParent(), (String) ((List) virtualHosts).get(vhost));
-                }
-            }
-            else
-            {
-                setupVirtualHosts(configFile.getParent(), (String) virtualHosts);
-            }
-        }
-
-        bind(port, connectorConfig);
-
-    }
-
-    /**
-     * Update the configuration data with the management port.
-     * @param configuration
-     * @param managementPort The string from the command line
-     */
-    private void updateManagementPort(Configuration configuration, String managementPort)
-    {
-        if (managementPort != null)
-        {
-            int mport;
-            int defaultMPort = configuration.getInt(JMXManagedObjectRegistry.MANAGEMENT_PORT_CONFIG_PATH);
-            try
-            {
-                mport = Integer.parseInt(managementPort);
-                configuration.setProperty(JMXManagedObjectRegistry.MANAGEMENT_PORT_CONFIG_PATH, mport);
-            }
-            catch (NumberFormatException e)
-            {
-                _logger.warn("Invalid management port: " + managementPort + " will use default:" + defaultMPort, e);
-            }
-        }
-    }
-
-    protected void setupVirtualHosts(String configFileParent, String configFilePath)
-        throws ConfigurationException, AMQException, URLSyntaxException
-    {
-        String configVar = "${conf}";
-
-        if (configFilePath.startsWith(configVar))
-        {
-            configFilePath = configFileParent + configFilePath.substring(configVar.length());
-        }
-
-        if (configFilePath.indexOf(".xml") != -1)
-        {
-            VirtualHostConfiguration vHostConfig = new VirtualHostConfiguration(configFilePath);
-            vHostConfig.performBindings();
-        }
-        else
-        {
-            // the virtualhosts value is a path. Search it for XML files.
-
-            File virtualHostDir = new File(configFilePath);
-
-            String[] fileNames = virtualHostDir.list();
-
-            for (int each = 0; each < fileNames.length; each++)
-            {
-                if (fileNames[each].endsWith(".xml"))
-                {
-                    VirtualHostConfiguration vHostConfig =
-                        new VirtualHostConfiguration(configFilePath + "/" + fileNames[each]);
-                    vHostConfig.performBindings();
-                }
-            }
-        }
-    }
-
-    /**
-     * Assembles/configures the components that Mina needs, then start Mina running to accept connections.
-     *
-     * @todo Partially implements top-level error handler. Better to let these errors fall through to a single
-     *       top-level handler.
-     */
-    protected void bind(int port, ConnectorConfiguration connectorConfig) throws BindException
-    {
-        String bindAddr = commandLine.getOptionValue("b");
-        if (bindAddr == null)
-        {
-            bindAddr = connectorConfig.bindAddress;
-        }
-
-        try
-        {
-            // IoAcceptor acceptor = new SocketAcceptor(connectorConfig.processors);
-            IoAcceptor acceptor = connectorConfig.createAcceptor();
-            SocketAcceptorConfig sconfig = (SocketAcceptorConfig) acceptor.getDefaultConfig();
-            SocketSessionConfig sc = (SocketSessionConfig) sconfig.getSessionConfig();
-
-            sc.setReceiveBufferSize(connectorConfig.socketReceiveBufferSize);
-            sc.setSendBufferSize(connectorConfig.socketWriteBuferSize);
-            sc.setTcpNoDelay(connectorConfig.tcpNoDelay);
-
-            // if we do not use the executor pool threading model we get the default leader follower
-            // implementation provided by MINA
-            if (connectorConfig.enableExecutorPool)
-            {
-                sconfig.setThreadModel(ReadWriteThreadModel.getInstance());
-            }
-
-            if (!connectorConfig.enableSSL || !connectorConfig.sslOnly)
-            {
-                AMQPFastProtocolHandler handler = new AMQPProtocolProvider().getHandler();
-                InetSocketAddress bindAddress;
-                if (bindAddr.equals("wildcard"))
-                {
-                    bindAddress = new InetSocketAddress(port);
-                }
-                else
-                {
-                    bindAddress = new InetSocketAddress(InetAddress.getByAddress(parseIP(bindAddr)), port);
-                }
-
-                acceptor.bind(bindAddress, handler, sconfig);
-                // fixme  qpid.AMQP should be using qpidproperties to get value
-                _brokerLogger.info("Qpid.AMQP listening on non-SSL address " + bindAddress);
-            }
-
-            if (connectorConfig.enableSSL)
-            {
-                AMQPFastProtocolHandler handler = new AMQPProtocolProvider().getHandler();
-                try
-                {
-
-                    acceptor.bind(new InetSocketAddress(connectorConfig.sslPort), handler, sconfig);
-                    // fixme  qpid.AMQP should be using qpidproperties to get value
-                    _brokerLogger.info("Qpid.AMQP listening on SSL port " + connectorConfig.sslPort);
-
-                }
-                catch (IOException e)
-                {
-                    _brokerLogger.error("Unable to listen on SSL port: " + e, e);
-                }
-            }
-
-            // fixme  qpid.AMQP should be using qpidproperties to get value
-            _brokerLogger.info("Qpid Broker Ready :" + QpidProperties.getReleaseVersion()
-                               + " build: " + QpidProperties.getBuildVersion());
-        }
-        catch (Exception e)
-        {
-            _logger.error("Unable to bind service to registry: " + e, e);
-            //fixme this need tidying up
-            throw new BindException(e.getMessage());
-        }
-    }
-
-    /**
-     * Processes the command line and starts the broker running. This method acts as a top-level error handler for
-     * any exceptions that fall out of the code below this point. These exceptions are logged before System.exit is
-     * called with an error code.
-     *
-     * @param args The command line arguments.
-     */
-    public static void main(String[] args)
-    {
-        // Use a try block so that any exceptions that fall through to the top-level are logged before the application
-        // exits with an error code.
-        // try
-        {
-            // Parse the command line.
-
-            // Create an instance of the Main broker entry point class and start it running.
-        }
-        // catch ()
-        {
-            // Log the exception as an error.
-
-            // Exit with an error code.
-        }
-
-        new Main(args);
-    }
-
-    private byte[] parseIP(String address) throws Exception
-    {
-        char[] literalBuffer = address.toCharArray();
-        int byteCount = 0;
-        int currByte = 0;
-        byte[] ip = new byte[IPV4_ADDRESS_LENGTH];
-        for (int i = 0; i < literalBuffer.length; i++)
-        {
-            char currChar = literalBuffer[i];
-            if ((currChar >= '0') && (currChar <= '9'))
-            {
-                currByte = (currByte * 10) + (Character.digit(currChar, 10) & 0xFF);
-            }
-
-            if ((currChar == IPV4_LITERAL_SEPARATOR) || ((i + 1) == literalBuffer.length))
-            {
-                ip[byteCount++] = (byte) currByte;
-                currByte = 0;
-            }
-        }
-
-        if (byteCount != 4)
-        {
-            throw new Exception("Invalid IP address: " + address);
-        }
-
-        return ip;
-    }
-
-    private void configureLogging(File logConfigFile, String logWatchConfig)
-    {
-        int logWatchTime = 0;
-        try
-        {
-            logWatchTime = Integer.parseInt(logWatchConfig);
-        }
-        catch (NumberFormatException e)
-        {
-            System.err.println("Log watch configuration value of " + logWatchConfig + " is invalid. Must be "
-                + "a non-negative integer. Using default of zero (no watching configured");
-        }
-
-        if (logConfigFile.exists() && logConfigFile.canRead())
-        {
-            System.out.println("Configuring logger using configuration file " + logConfigFile.getAbsolutePath());
-            if (logWatchTime > 0)
-            {
-                System.out.println("log file " + logConfigFile.getAbsolutePath() + " will be checked for changes every "
-                    + logWatchTime + " seconds");
-                // log4j expects the watch interval in milliseconds
-                DOMConfigurator.configureAndWatch(logConfigFile.getAbsolutePath(), logWatchTime * 1000);
-            }
-            else
-            {
-                DOMConfigurator.configure(logConfigFile.getAbsolutePath());
-            }
-        }
-        else
-        {
-            System.err.println("Logging configuration error: unable to read file " + logConfigFile.getAbsolutePath());
-            System.err.println("Using basic log4j configuration");
-            BasicConfigurator.configure();
-        }
-    }
-
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/ManagedChannel.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/ManagedChannel.java
deleted file mode 100644
index e76f9c3f6c..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/ManagedChannel.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-package org.apache.qpid.server;
-
-import java.io.IOException;
-
-import javax.management.JMException;
-
-/**
- * The managed interface exposed to allow management of channels.
- * @author   Bhupendra Bhardwaj
- * @version  0.1
- */
-public interface ManagedChannel
-{
-    static final String TYPE = "Channel";
-
-    /**
-     * Tells whether the channel is transactional.
-     * @return true if the channel is transactional.
-     * @throws IOException
-     */
-    boolean isTransactional() throws IOException;
-
-    /**
-     * Tells the number of unacknowledged messages in this channel.
-     * @return number of unacknowledged messages.
-     * @throws IOException
-     */
-    int getUnacknowledgedMessageCount() throws IOException;
-
-    
-    //********** Operations *****************//
-
-    /**
-     * Commits the transactions if the channel is transactional.
-     * @throws IOException
-     * @throws JMException
-     */
-    void commitTransactions() throws IOException, JMException;
-
-    /**
-     * Rollsback the transactions if the channel is transactional.
-     * @throws IOException
-     * @throws JMException
-     */
-    void rollbackTransactions() throws IOException, JMException;
-
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/RequiredDeliveryException.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/RequiredDeliveryException.java
deleted file mode 100644
index 37c5f38ea3..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/RequiredDeliveryException.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.protocol.AMQConstant;
-import org.apache.qpid.server.queue.AMQMessage;
-
-/**
- * Signals that a required delivery could not be made. This could be bacuse of the immediate flag being set and the
- * queue having no consumers, or the mandatory flag being set and the exchange having no valid bindings.
- *
- * <p/>The failed message is associated with this error condition, by taking a reference to it. This enables the
- * correct compensating action to be taken against the message, for example, bouncing it back to the sender.
- *
- * <p/><table id="crc"><caption>CRC Card</caption>
- * <tr><th> Responsibilities <th> Collaborations
- * <tr><td> Represent failure to deliver a message that must be delivered.
- * <tr><td> Associate the failed message with the error condition. <td> {@link AMQMessage}
- * </table>
- */
-public abstract class RequiredDeliveryException extends AMQException
-{
-    private final AMQMessage _amqMessage;
-
-    public RequiredDeliveryException(String message, AMQMessage payload, Throwable cause)
-    {
-        super(null, message, cause);
-
-        // Increment the reference as this message is in the routing phase
-        // and so will have the ref decremented as routing fails.
-        // we need to keep this message around so we can return it in the
-        // handler. So increment here.
-        _amqMessage = payload.takeReference();
-
-        // payload.incrementReference();
-    }
-
-    public AMQMessage getAMQMessage()
-    {
-        return _amqMessage;
-    }
-
-    public AMQConstant getErrorCode()
-    {
-        return getReplyCode();
-    }
-
-    public abstract AMQConstant getReplyCode();
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/ack/TxAck.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/ack/TxAck.java
deleted file mode 100644
index 5ca8d57f7c..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/ack/TxAck.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.ack;
-
-import java.util.LinkedList;
-import java.util.List;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.server.store.StoreContext;
-import org.apache.qpid.server.txn.TxnOp;
-
-/**
- * A TxnOp implementation for handling accumulated acks
- */
-public class TxAck implements TxnOp
-{
-    private final UnacknowledgedMessageMap _map;
-    private final List <UnacknowledgedMessage> _unacked = new LinkedList<UnacknowledgedMessage>();
-    private final List<Long> _individual = new LinkedList<Long>();
-    private long _deliveryTag;
-    private boolean _multiple;
-
-    public TxAck(UnacknowledgedMessageMap map)
-    {
-        _map = map;
-    }
-
-    public void update(long deliveryTag, boolean multiple)
-    {
-        if (!multiple)
-        {
-            //have acked a single message that is not part of
-            //the previously acked region so record
-            //individually
-            _individual.add(deliveryTag);//_multiple && !multiple
-        }
-        else if (deliveryTag > _deliveryTag)
-        {
-            //have simply moved the last acked message on a
-            //bit
-            _deliveryTag = deliveryTag;
-            _multiple = true;
-        }
-    }
-
-    public void consolidate()
-    {
-        //lookup all the unacked messages that have been acked in this transaction
-        if (_multiple)
-        {
-            //get all the unacked messages for the accumulated
-            //multiple acks
-            _map.collect(_deliveryTag, true, _unacked);
-        }
-        //get any unacked messages for individual acks outside the
-        //range covered by multiple acks
-        for (long tag : _individual)
-        {
-            if(_deliveryTag < tag)
-            {
-                _map.collect(tag, false, _unacked);
-            }
-        }
-    }
-
-    public boolean checkPersistent() throws AMQException
-    {
-        //if any of the messages in unacked are persistent the txn
-        //buffer must be marked as persistent:
-        for (UnacknowledgedMessage msg : _unacked)
-        {
-            if (msg.message.isPersistent())
-            {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    public void prepare(StoreContext storeContext) throws AMQException
-    {
-        //make persistent changes, i.e. dequeue and decrementReference
-        for (UnacknowledgedMessage msg : _unacked)
-        {
-            msg.restoreTransientMessageData();
-
-            //Message has been ack so discard it. This will dequeue and decrement the reference.
-            msg.discard(storeContext);
-        }
-    }
-
-    public void undoPrepare()
-    {
-        //decrementReference is annoyingly untransactional (due to
-        //in memory counter) so if we failed in prepare for full
-        //txn, this op will have to compensate by fixing the count
-        //in memory (persistent changes will be rolled back by store)
-        for (UnacknowledgedMessage msg : _unacked)
-        {
-            msg.clearTransientMessageData();
-            msg.message.takeReference();
-        }
-    }
-
-    public void commit(StoreContext storeContext)
-    {
-        //remove the unacked messages from the channels map
-        _map.remove(_unacked);
-        for (UnacknowledgedMessage msg : _unacked)
-        {
-            msg.clearTransientMessageData();
-        }
-
-    }
-
-    public void rollback(StoreContext storeContext)
-    {
-    }
-}
-
-
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/ack/UnacknowledgedMessage.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/ack/UnacknowledgedMessage.java
deleted file mode 100644
index b8c5e821f7..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/ack/UnacknowledgedMessage.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.ack;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.server.queue.AMQMessage;
-import org.apache.qpid.server.queue.AMQQueue;
-import org.apache.qpid.server.store.StoreContext;
-
-public class UnacknowledgedMessage
-{
-    public final AMQMessage message;
-    public final AMQShortString consumerTag;
-    public final long deliveryTag;
-    public AMQQueue queue;
-
-    public UnacknowledgedMessage(AMQQueue queue, AMQMessage message, AMQShortString consumerTag, long deliveryTag)
-    {
-        this.queue = queue;
-        this.message = message;
-        this.consumerTag = consumerTag;
-        this.deliveryTag = deliveryTag;
-    }
-
-    public String toString()
-    {
-        StringBuilder sb = new StringBuilder();
-        sb.append("Q:");
-        sb.append(queue);
-        sb.append(" M:");
-        sb.append(message);
-        sb.append(" CT:");
-        sb.append(consumerTag);
-        sb.append(" DT:");
-        sb.append(deliveryTag);
-
-        return sb.toString();
-    }
-
-    public void discard(StoreContext storeContext) throws AMQException
-    {
-        if (queue != null)
-        {
-            message.dequeue(storeContext, queue);
-        }
-        //if the queue is null then the message is waiting to be acked, but has been removed.
-        message.decrementReference(storeContext);
-    }
-
-    public void restoreTransientMessageData() throws AMQException
-    {
-        message.restoreTransientMessageData();
-    }
-
-    public void clearTransientMessageData()
-    {
-        message.clearTransientMessageData();
-    }
-}
-
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/ack/UnacknowledgedMessageMap.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/ack/UnacknowledgedMessageMap.java
deleted file mode 100644
index b69a917081..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/ack/UnacknowledgedMessageMap.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.ack;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Set;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.server.txn.TransactionalContext;
-
-public interface UnacknowledgedMessageMap
-{
-    public interface Visitor
-    {
-        /**
-         * @param message the message being iterated over
-         * @return true to stop iteration, false to continue
-         * @throws AMQException
-         */
-        boolean callback(UnacknowledgedMessage message) throws AMQException;
-
-        void visitComplete();
-    }
-
-    void visit(Visitor visitor) throws AMQException;
-
-    Object getLock();
-
-    void add(long deliveryTag, UnacknowledgedMessage message);
-
-    void collect(long deliveryTag, boolean multiple, List<UnacknowledgedMessage> msgs);
-
-    boolean contains(long deliveryTag) throws AMQException;
-
-    void remove(List<UnacknowledgedMessage> msgs);
-
-    UnacknowledgedMessage remove(long deliveryTag);
-
-    void drainTo(Collection<UnacknowledgedMessage> destination, long deliveryTag) throws AMQException;
-
-    Collection<UnacknowledgedMessage> cancelAllMessages();
-
-    void acknowledgeMessage(long deliveryTag, boolean multiple, TransactionalContext txnContext) throws AMQException;
-
-    int size();
-
-    void clear();
-
-    UnacknowledgedMessage get(long deliveryTag);
-
-    /**
-     * Get the set of delivery tags that are outstanding.
-     *
-     * @return a set of delivery tags
-     */
-    Set<Long> getDeliveryTags();
-
-    public long getUnacknowledgeBytes();
-}
-
-
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/ack/UnacknowledgedMessageMapImpl.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/ack/UnacknowledgedMessageMapImpl.java
deleted file mode 100644
index 1604d94539..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/ack/UnacknowledgedMessageMapImpl.java
+++ /dev/null
@@ -1,235 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.ack;
-
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.server.protocol.AMQProtocolSession;
-import org.apache.qpid.server.queue.AMQMessage;
-import org.apache.qpid.server.txn.TransactionalContext;
-
-public class UnacknowledgedMessageMapImpl implements UnacknowledgedMessageMap
-{
-    private final Object _lock = new Object();
-
-    private long _unackedSize;
-
-    private Map<Long, UnacknowledgedMessage> _map;
-
-    private long _lastDeliveryTag;
-
-    private final int _prefetchLimit;
-
-    public UnacknowledgedMessageMapImpl(int prefetchLimit)
-    {
-        _prefetchLimit = prefetchLimit;
-        _map = new LinkedHashMap<Long, UnacknowledgedMessage>(prefetchLimit);
-    }
-
-    /*public UnacknowledgedMessageMapImpl(Object lock, Map<Long, UnacknowledgedMessage> map)
-    {
-        _lock = lock;
-        _map = map;
-    } */
-
-    public void collect(long deliveryTag, boolean multiple, List<UnacknowledgedMessage> msgs)
-    {
-        if (multiple)
-        {
-            collect(deliveryTag, msgs);
-        }
-        else
-        {
-            msgs.add(get(deliveryTag));
-        }
-
-    }
-
-    public boolean contains(long deliveryTag) throws AMQException
-    {
-        synchronized (_lock)
-        {
-            return _map.containsKey(deliveryTag);
-        }
-    }
-
-    public void remove(List<UnacknowledgedMessage> msgs)
-    {
-        synchronized (_lock)
-        {
-            for (UnacknowledgedMessage msg : msgs)
-            {
-                remove(msg.deliveryTag);
-            }
-        }
-    }
-
-    public UnacknowledgedMessage remove(long deliveryTag)
-    {
-        synchronized (_lock)
-        {
-
-            UnacknowledgedMessage message = _map.remove(deliveryTag);
-            if(message != null)
-            {
-                _unackedSize -= message.message.getSize();
-            }
-
-            return message;
-        }
-    }
-
-    public void visit(Visitor visitor) throws AMQException
-    {
-        synchronized (_lock)
-        {
-            Collection<UnacknowledgedMessage> currentEntries = _map.values();
-            for (UnacknowledgedMessage msg : currentEntries)
-            {
-                visitor.callback(msg);
-            }
-            visitor.visitComplete();
-        }
-    }
-
-    public Object getLock()
-    {
-        return _lock;
-    }
-
-    public void add(long deliveryTag, UnacknowledgedMessage message)
-    {
-        synchronized (_lock)
-        {
-            _map.put(deliveryTag, message);
-            _unackedSize += message.message.getSize();            
-            _lastDeliveryTag = deliveryTag;
-        }
-    }
-
-    public Collection<UnacknowledgedMessage> cancelAllMessages()
-    {
-        synchronized (_lock)
-        {
-            Collection<UnacknowledgedMessage> currentEntries = _map.values();
-            _map = new LinkedHashMap<Long, UnacknowledgedMessage>(_prefetchLimit);
-            _unackedSize = 0l;
-            return currentEntries;
-        }
-    }
-
-    public void acknowledgeMessage(long deliveryTag, boolean multiple, TransactionalContext txnContext)
-            throws AMQException
-    {
-        synchronized (_lock)
-        {
-            txnContext.acknowledgeMessage(deliveryTag, _lastDeliveryTag, multiple, this);
-        }
-    }
-
-    public int size()
-    {
-        synchronized (_lock)
-        {
-            return _map.size();
-        }
-    }
-
-    public void clear()
-    {
-        synchronized (_lock)
-        {
-            _map.clear();
-            _unackedSize = 0l;
-        }
-    }
-
-    public void drainTo(Collection<UnacknowledgedMessage> destination, long deliveryTag) throws AMQException
-    {
-        synchronized (_lock)
-        {
-            Iterator<Map.Entry<Long, UnacknowledgedMessage>> it = _map.entrySet().iterator();
-            while (it.hasNext())
-            {
-                Map.Entry<Long, UnacknowledgedMessage> unacked = it.next();
-
-                if (unacked.getKey() > deliveryTag)
-                {
-                    //This should not occur now.
-                    throw new AMQException(null, "UnacknowledgedMessageMap is out of order:" + unacked.getKey() +
-                                           " When deliveryTag is:" + deliveryTag + "ES:" + _map.entrySet().toString(), null);
-                }
-
-                it.remove();
-                _unackedSize -= unacked.getValue().message.getSize();
-
-                destination.add(unacked.getValue());
-                if (unacked.getKey() == deliveryTag)
-                {
-                    break;
-                }
-            }
-        }
-    }
-    
-    public UnacknowledgedMessage get(long key)
-    {
-        synchronized (_lock)
-        {
-            return _map.get(key);
-        }
-    }
-
-    public Set<Long> getDeliveryTags()
-    {
-        synchronized (_lock)
-        {
-            return _map.keySet();
-        }
-    }
-
-    private void collect(long key, List<UnacknowledgedMessage> msgs)
-    {
-        synchronized (_lock)
-        {
-            for (Map.Entry<Long, UnacknowledgedMessage> entry : _map.entrySet())
-            {
-                msgs.add(entry.getValue());
-                if (entry.getKey() == key)
-                {
-                    break;
-                }
-            }
-        }
-    }
-
-    public long getUnacknowledgeBytes()
-    {
-        return _unackedSize;
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/Configurator.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/Configurator.java
deleted file mode 100644
index 31c1b61a21..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/Configurator.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.configuration;
-
-import java.lang.reflect.Field;
-
-import org.apache.commons.configuration.Configuration;
-import org.apache.log4j.Logger;
-import org.apache.qpid.configuration.Configured;
-import org.apache.qpid.configuration.PropertyException;
-import org.apache.qpid.configuration.PropertyUtils;
-import org.apache.qpid.server.registry.ApplicationRegistry;
-
-/**
- * This class contains utilities for populating classes automatically from values pulled from configuration
- * files.
- */
-public class Configurator
-{
-    private static final Logger _logger = Logger.getLogger(Configurator.class);
-
-
-    /**
-     * Configure a given instance using the supplied configuration. Note that superclasses are <b>not</b>
-     * currently configured but this could easily be added if required.
-     * @param instance the instance to configure
-     * @param config the configuration to use to configure the object
-     */
-    public static void configure(Object instance, Configuration config)
-    {
-
-        for (Field f : instance.getClass().getDeclaredFields())
-        {
-            Configured annotation = f.getAnnotation(Configured.class);
-            if (annotation != null)
-            {
-                setValueInField(f, instance, config, annotation);
-            }
-        }
-    }
-
-
-
-    /**
-     * Configure a given instance using the application configuration. Note that superclasses are <b>not</b>
-     * currently configured but this could easily be added if required.
-     * @param instance the instance to configure
-     */
-    public static void configure(Object instance)
-    {
-        configure(instance, ApplicationRegistry.getInstance().getConfiguration());
-    }
-
-    private static void setValueInField(Field f, Object instance, Configuration config, Configured annotation)
-    {
-        Class fieldClass = f.getType();
-        String configPath = annotation.path();
-        try
-        {
-            if (fieldClass == String.class)
-            {
-                String val = config.getString(configPath, annotation.defaultValue());
-                val = PropertyUtils.replaceProperties(val);
-                f.set(instance, val);
-            }
-            else if (fieldClass == int.class)
-            {
-                int val = config.getInt(configPath, Integer.parseInt(annotation.defaultValue()));
-                f.setInt(instance, val);
-            }
-            else if (fieldClass == long.class)
-            {
-                long val = config.getLong(configPath, Long.parseLong(annotation.defaultValue()));
-                f.setLong(instance, val);
-            }
-            else if (fieldClass == double.class)
-            {
-                double val = config.getDouble(configPath, Double.parseDouble(annotation.defaultValue()));
-                f.setDouble(instance, val);
-            }
-            else if (fieldClass == boolean.class)
-            {
-                boolean val = config.getBoolean(configPath, Boolean.parseBoolean(annotation.defaultValue()));
-                f.setBoolean(instance, val);
-            }
-            else
-            {
-                _logger.error("Unsupported field type " + fieldClass + " for " + f + " IGNORING configured value");
-            }
-        }
-        catch (PropertyException e)
-        {
-            _logger.error("Unable to expand property: " + e + " INGORING field " + f, e);
-        }
-        catch (IllegalAccessException e)
-        {
-            _logger.error("Unable to access field " + f + " IGNORING configured value");
-        }
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java
deleted file mode 100644
index d1589092e9..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java
+++ /dev/null
@@ -1,290 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.configuration;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.apache.commons.configuration.CompositeConfiguration;
-import org.apache.commons.configuration.Configuration;
-import org.apache.commons.configuration.ConfigurationException;
-import org.apache.commons.configuration.XMLConfiguration;
-import org.apache.log4j.Logger;
-import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.server.exchange.Exchange;
-import org.apache.qpid.server.exchange.ExchangeRegistry;
-import org.apache.qpid.server.exchange.ExchangeFactory;
-import org.apache.qpid.server.queue.AMQQueue;
-import org.apache.qpid.server.queue.QueueRegistry;
-import org.apache.qpid.server.registry.ApplicationRegistry;
-import org.apache.qpid.server.store.MessageStore;
-import org.apache.qpid.server.virtualhost.VirtualHost;
-import org.apache.qpid.server.exception.InternalErrorException;
-import org.apache.qpid.server.exception.QueueAlreadyExistsException;
-
-public class VirtualHostConfiguration
-{
-    private static final Logger _logger = Logger.getLogger(VirtualHostConfiguration.class);
-
-    private static XMLConfiguration _config;
-
-    private static final String VIRTUALHOST_PROPERTY_BASE = "virtualhost.";
-
-
-    public VirtualHostConfiguration(String configFile)
-            throws
-            ConfigurationException
-    {
-        _logger.info("Loading Config file:" + configFile);
-
-        _config = new XMLConfiguration(configFile);
-
-    }
-
-
-    private void configureVirtualHost(String virtualHostName, Configuration configuration)
-            throws
-            ConfigurationException,
-            AMQException
-    {
-        _logger.debug("Loding configuration for virtaulhost: " + virtualHostName);
-
-
-        VirtualHost virtualHost = ApplicationRegistry.getInstance().getVirtualHostRegistry().getVirtualHost(virtualHostName);
-
-
-        if (virtualHost == null)
-        {
-            throw new ConfigurationException("Unknown virtual host: " + virtualHostName);
-        }
-
-        List exchangeNames = configuration.getList("exchanges.exchange.name");
-
-        for (Object exchangeNameObj : exchangeNames)
-        {
-            String exchangeName = String.valueOf(exchangeNameObj);
-            configureExchange(virtualHost, exchangeName, configuration);
-        }
-
-
-        List queueNames = configuration.getList("queues.queue.name");
-
-        for (Object queueNameObj : queueNames)
-        {
-            String queueName = String.valueOf(queueNameObj);
-            configureQueue(virtualHost, queueName, configuration);
-        }
-
-    }
-
-    private void configureExchange(VirtualHost virtualHost, String exchangeNameString, Configuration configuration)
-            throws
-            AMQException
-    {
-
-        CompositeConfiguration exchangeConfiguration = new CompositeConfiguration();
-
-        exchangeConfiguration.addConfiguration(configuration.subset("exchanges.exchange." + exchangeNameString));
-        exchangeConfiguration.addConfiguration(configuration.subset("exchanges"));
-
-        QueueRegistry queueRegistry = virtualHost.getQueueRegistry();
-        MessageStore messageStore = virtualHost.getMessageStore();
-        ExchangeRegistry exchangeRegistry = virtualHost.getExchangeRegistry();
-        ExchangeFactory exchangeFactory = virtualHost.getExchangeFactory();
-
-        AMQShortString exchangeName = new AMQShortString(exchangeNameString);
-
-
-        Exchange exchange;
-
-
-        synchronized (exchangeRegistry)
-        {
-            exchange = exchangeRegistry.getExchange(exchangeName);
-            if (exchange == null)
-            {
-
-                AMQShortString type = new AMQShortString(exchangeConfiguration.getString("type", "direct"));
-                boolean durable = exchangeConfiguration.getBoolean("durable", false);
-                boolean autodelete = exchangeConfiguration.getBoolean("autodelete", false);
-
-                Exchange newExchange = exchangeFactory.createExchange(exchangeName, type, durable, autodelete, 0);
-                exchangeRegistry.registerExchange(newExchange);
-            }
-
-        }
-    }
-
-    public static CompositeConfiguration getDefaultQueueConfiguration(AMQQueue queue)
-    {
-        CompositeConfiguration queueConfiguration = null;
-        if (_config == null)
-            return null;
-
-        Configuration vHostConfiguration = _config.subset(VIRTUALHOST_PROPERTY_BASE + queue.getVirtualHost().getName());
-
-        if (vHostConfiguration == null)
-            return null;
-
-        Configuration defaultQueueConfiguration = vHostConfiguration.subset("queues");
-        if (defaultQueueConfiguration != null)
-        {
-            queueConfiguration = new CompositeConfiguration();
-            queueConfiguration.addConfiguration(defaultQueueConfiguration);
-        }
-
-        return queueConfiguration;
-    }
-
-    private void configureQueue(VirtualHost virtualHost, String queueNameString, Configuration configuration)
-            throws
-            AMQException,
-            ConfigurationException
-    {
-        CompositeConfiguration queueConfiguration = new CompositeConfiguration();
-
-        queueConfiguration.addConfiguration(configuration.subset("queues.queue." + queueNameString));
-        queueConfiguration.addConfiguration(configuration.subset("queues"));
-
-        QueueRegistry queueRegistry = virtualHost.getQueueRegistry();
-        MessageStore messageStore = virtualHost.getMessageStore();
-        ExchangeRegistry exchangeRegistry = virtualHost.getExchangeRegistry();
-
-
-        AMQShortString queueName = new AMQShortString(queueNameString);
-
-        AMQQueue queue;
-
-        synchronized (queueRegistry)
-        {
-            queue = queueRegistry.getQueue(queueName);
-
-            if (queue == null)
-            {
-                _logger.info("Creating queue '" + queueName + "' on virtual host " + virtualHost.getName());
-
-                boolean durable = queueConfiguration.getBoolean("durable", false);
-                boolean autodelete = queueConfiguration.getBoolean("autodelete", false);
-                String owner = queueConfiguration.getString("owner", null);
-
-                queue = new AMQQueue(queueName,
-                        durable,
-                        owner == null ? null : new AMQShortString(owner) /* These queues will have no owner */,
-                        autodelete /* Therefore autodelete makes no sence */, virtualHost);
-
-                if (queue.isDurable())
-                {
-
-                    messageStore.createQueue(queue);
-                    //DTX MessageStore
-//                    try
-//                    {
-//                        messageStore.createQueue(queue);
-//                    } catch (InternalErrorException e)
-//                    {
-//                        _logger.error("Problem when creating Queue '" + queueNameString
-//                                + "' on virtual host " + virtualHost.getName() + ", not creating.");
-//
-//                    } catch (QueueAlreadyExistsException e)
-//                    {
-//                        _logger.error("Queue '" + queueNameString
-//                                + "' already exists on virtual host " + virtualHost.getName() + ", not creating.");
-//                    }
-                }
-
-                queueRegistry.registerQueue(queue);
-            } else
-            {
-                _logger.info("Queue '" + queueNameString + "' already exists on virtual host " + virtualHost.getName() + ", not creating.");
-            }
-
-            String exchangeName = queueConfiguration.getString("exchange", null);
-
-            Exchange exchange = exchangeRegistry.getExchange(exchangeName == null ? null : new AMQShortString(exchangeName));
-
-            if (exchange == null)
-            {
-                exchange = virtualHost.getExchangeRegistry().getDefaultExchange();
-            }
-
-            if (exchange == null)
-            {
-                throw new ConfigurationException("Attempt to bind queue to unknown exchange:" + exchangeName);
-            }
-
-            synchronized (exchange)
-            {
-                List routingKeys = queueConfiguration.getList("routingKey");
-                if (routingKeys == null || routingKeys.isEmpty())
-                {
-                    routingKeys = Collections.singletonList(queue.getName());
-                }
-
-                for (Object routingKeyNameObj : routingKeys)
-                {
-                    AMQShortString routingKey = new AMQShortString(String.valueOf(routingKeyNameObj));
-
-
-                    queue.bind(routingKey, null, exchange);
-
-
-                    _logger.info("Queue '" + queue.getName() + "' bound to exchange:" + exchangeName + " RK:'" + routingKey + "'");
-                }
-
-                if (exchange != virtualHost.getExchangeRegistry().getDefaultExchange())
-                {
-                    queue.bind(queue.getName(), null, virtualHost.getExchangeRegistry().getDefaultExchange());
-                }
-            }
-
-        }
-
-
-        Configurator.configure(queue, queueConfiguration);
-    }
-
-
-    public void performBindings() throws AMQException, ConfigurationException
-    {
-        List virtualHostNames = _config.getList(VIRTUALHOST_PROPERTY_BASE + "name");
-        String defaultVirtualHostName = _config.getString("default");
-        if (defaultVirtualHostName != null)
-        {
-            ApplicationRegistry.getInstance().getVirtualHostRegistry().setDefaultVirtualHostName(defaultVirtualHostName);
-        }
-        _logger.info("Configuring " + virtualHostNames == null ? 0 : virtualHostNames.size() + " virtual hosts: " + virtualHostNames);
-
-        for (Object nameObject : virtualHostNames)
-        {
-            String name = String.valueOf(nameObject);
-            configureVirtualHost(name, _config.subset(VIRTUALHOST_PROPERTY_BASE + name));
-        }
-
-        if (virtualHostNames == null || virtualHostNames.isEmpty())
-        {
-            throw new ConfigurationException(
-                    "Virtualhost Configuration document does not contain a valid virtualhost.");
-        }
-    }
-
-
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/exception/CommandInvalidException.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exception/CommandInvalidException.java
deleted file mode 100644
index 2b5fbf9795..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/exception/CommandInvalidException.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- *

- *   http://www.apache.org/licenses/LICENSE-2.0

- *

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- */

-package org.apache.qpid.server.exception;

-

-/**

- * CommandInvalidException indicates that an innapropriate request has been made to a transaction manager. For example,

- * calling prepare on an already prepared transaction.

- *

- * <p/><table id="crc"><caption>CRC Card</caption>

- * <tr><th> Responsibilities <th> Collaborations

- * <tr><td> Represents an error due to an innapropriate request to a transction manager.

- * </table>

- */

-public class CommandInvalidException extends Exception

-{

-    /**

-     * Constructs a new CommandInvalidException with the specified detail message and

-     * cause.

-     *

-     * @param message the detail message .

-     * @param cause   the cause.

-     */

-    public CommandInvalidException(String message, Throwable cause)

-    {

-        super(message, cause);

-    }

-

-    /**

-     * Constructs a new CommandInvalidException with the specified detail message.

-     *

-     * @param message the detail message.

-     *

-     * @deprected

-     */

-    public CommandInvalidException(String message)

-    {

-        super(message);

-    }

-

-    /**

-     * Constructs a new CommandInvalidException with the specified cause.

-     *

-     * @param cause the cause

-     *

-     * @deprected

-     */

-    public CommandInvalidException(Throwable cause)

-    {

-        super(cause);

-    }

-}

diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/exception/InternalErrorException.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exception/InternalErrorException.java
deleted file mode 100644
index 60e1514d2b..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/exception/InternalErrorException.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- *

- *   http://www.apache.org/licenses/LICENSE-2.0

- *

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- */

-package org.apache.qpid.server.exception;

-

-/**

- * General purpose exception for non-specifc error cases. Do not use.

- *

- * @deprected Far too broad to be a checked exception. Will be abused as a "don't know what to do with it" exception

- *            when Runtimes should be used. If this has a specific meaning within transaction managers, it should

- *            be renamed to something like TxManagerException, for example. At the moment, transaction managers are not

- *            catching this exception and taking some action, so it is clear that it is being used for errors that are

- *            not recoverable/handleable from; use runtimes. So far, it is only caught to be rethrown as AMQException,

- *            which is the other catch-all exception case to be eliminated. There are sequences in the code where

- *            AMQException is caught and rethrown as InternalErrorException, which is cause and rethrown as AMQException.

- */

-public class InternalErrorException extends Exception

-{

-    /**

-     * Constructs a new InternalErrorException with the specified detail message.

-     *

-     * @param message the detail message.

-     *

-     * @deprected

-     */

-    public InternalErrorException(String message)

-    {

-        super(message);

-    }

-

-    /**

-     * Constructs a new InternalErrorException with the specified detail message and

-     * cause.

-     *

-     * @param message the detail message .

-     * @param cause   the cause.

-     */

-    public InternalErrorException(String message, Throwable cause)

-    {

-        super(message, cause);

-    }

-

-    /**

-     * Constructs a new InternalErrorException with the specified cause.

-     *

-     * @param cause the cause

-     *

-     * @deprected

-     */

-    public InternalErrorException(Throwable cause)

-    {

-        super(cause);

-    }

-}

diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/exception/InvalidXidException.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exception/InvalidXidException.java
deleted file mode 100644
index 277614afff..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/exception/InvalidXidException.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- *

- *   http://www.apache.org/licenses/LICENSE-2.0

- *

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- */

-package org.apache.qpid.server.exception;

-

-import javax.transaction.xa.Xid;

-

-/**

- * InvalidXidException indicates that an Xid under which to conduct a transaction is invalid. This may be because it

- * has an incorrect format, is null, or a transcaction with the same Xid is already running.

- *

- * <p/><table id="crc"><caption>CRC Card</caption>

- * <tr><th> Responsibilities <th> Collaborations

- * <tr><td> Represents an invalid Xid for a transaction.

- * <tr><td>

- */

-public class InvalidXidException extends Exception

-{

-    /**

-     * Constructs a newr InvalidXidException with a standard message

-     *

-     * @param xid The invalid xid.

-     *

-     * @deprected

-     */

-    public InvalidXidException(Xid xid)

-    {

-        super("The Xid: " + xid + " is invalid");

-    }

-

-    /**

-     * Constructs a newr InvalidXidException with a cause

-     *

-     * @param xid   The invalid xid.

-     * @param cause The casue for the xid to be invalid

-     *

-     * @deprected

-     */

-    public InvalidXidException(Xid xid, Throwable cause)

-    {

-        super("The Xid: " + xid + " is invalid", cause);

-    }

-

-    /**

-     * Constructs a newr InvalidXidException with a reason message

-     *

-     * @param reason The reason why the xid is invalid

-     * @param xid    The invalid xid.

-     */

-    public InvalidXidException(Xid xid, String reason)

-    {

-        super("The Xid: " + xid + " is invalid, The reason is: " + reason);

-    }

-

-    /**

-     * Constructs a newr InvalidXidException with a reason message and cause

-     *

-     * @param reason The reason why the xid is invalid

-     * @param xid    The invalid xid.

-     * @param cause  The casue for the xid to be invalid

-     *

-     * @deprected

-     */

-    public InvalidXidException(Xid xid, String reason, Throwable cause)

-    {

-        super("The Xid: " + xid + " is invalid, The reason is: " + reason, cause);

-    }

-}

diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/exception/MessageAlreadyStagedException.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exception/MessageAlreadyStagedException.java
deleted file mode 100644
index 336f5fdf64..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/exception/MessageAlreadyStagedException.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- *

- *   http://www.apache.org/licenses/LICENSE-2.0

- *

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- */

-package org.apache.qpid.server.exception;

-

-/**

- * @todo Need to understand what message staging is to document properly.

- */

-public class MessageAlreadyStagedException extends Exception

-{

-    /**

-     * Constructs a new MessageAlreadyStagedException with the specified detail message.

-     *

-     * @param message the detail message.

-     */

-    public MessageAlreadyStagedException(String message)

-    {

-        super(message);

-    }

-

-    /**

-     * Constructs a new MessageAlreadyStagedException with the specified detail message and

-     * cause.

-     *

-     * @param message the detail message .

-     * @param cause   the cause.

-     *

-     * @deprected

-     */

-    public MessageAlreadyStagedException(String message, Throwable cause)

-    {

-        super(message, cause);

-    }

-

-    /**

-     * Constructs a new MessageAlreadyStagedException with the specified cause.

-     *

-     * @param cause the cause

-     *

-     * @deprected

-     */

-    public MessageAlreadyStagedException(Throwable cause)

-    {

-        super(cause);

-    }

-}

diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/exception/MessageDoesntExistException.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exception/MessageDoesntExistException.java
deleted file mode 100644
index 544d669d4b..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/exception/MessageDoesntExistException.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- *

- *   http://www.apache.org/licenses/LICENSE-2.0

- *

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- */

-package org.apache.qpid.server.exception;

-

-/**

- * MessageDoesntExistException indicates that a message store cannot find a message looked up by its id. This may

- * indicate message loss.

- *

- * <p/><table id="crc"><caption>CRC Card</caption>

- * <tr><th> Responsibilities <th> Collaborations

- * <tr><td> Represents failure of message store to find a message.

- * </table>

- */

-public class MessageDoesntExistException extends Exception

-{

-    /**

-     * Constructs a new MessageDoesntExistException with the specified detail message.

-     *

-     * @param message the detail message.

-     */

-    public MessageDoesntExistException(String message)

-    {

-        super(message);

-    }

-

-    /**

-     * Constructs a new MessageDoesntExistException with the specified detail message and

-     * cause.

-     *

-     * @param message the detail message .

-     * @param cause   the cause.

-     *

-     * @deprected

-     */

-    public MessageDoesntExistException(String message, Throwable cause)

-    {

-        super(message, cause);

-    }

-

-    /**

-     * Constructs a new MessageDoesntExistException with the specified cause.

-     *

-     * @param cause the cause

-     *

-     * @deprected

-     */

-    public MessageDoesntExistException(Throwable cause)

-    {

-        super(cause);

-    }

-}

diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/exception/NotPreparedException.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exception/NotPreparedException.java
deleted file mode 100644
index ab288748f5..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/exception/NotPreparedException.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- *

- *   http://www.apache.org/licenses/LICENSE-2.0

- *

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- */

-package org.apache.qpid.server.exception;

-

-/**

- * NotPreparedException indicates a failure to commit a transaction that has not been prepared.

- *

- * <p/><table id="crc"><caption>CRC Card</caption>

- * <tr><th> Responsibilities <th> Collaborations

- * <tr><td> Represents failure to commit an unprepared transaction.

- * </table>

- *

- * @todo There is already a CommandInvalidException which would seem to cover this too. Use it instead?

- */

-public class NotPreparedException extends Exception

-{

-    /**

-     * Constructs a new NotPreparedException with the specified detail message.

-     *

-     * @param message the detail message.

-     */

-    public NotPreparedException(String message)

-    {

-        super(message);

-    }

-

-    /**

-     * Constructs a new NotPreparedException with the specified detail message and

-     * cause.

-     *

-     * @param message the detail message .

-     * @param cause   the cause.

-     *

-     * @deprecated

-     */

-    public NotPreparedException(String message, Throwable cause)

-    {

-        super(message, cause);

-    }

-

-    /**

-     * Constructs a new NotPreparedException with the specified cause.

-     *

-     * @param cause the cause

-     *

-     * @deprected

-     */

-    public NotPreparedException(Throwable cause)

-    {

-        super(cause);

-    }

-}

diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/exception/QueueAlreadyExistsException.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exception/QueueAlreadyExistsException.java
deleted file mode 100644
index 3635d2c19d..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/exception/QueueAlreadyExistsException.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- *

- *   http://www.apache.org/licenses/LICENSE-2.0

- *

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- */

-package org.apache.qpid.server.exception;

-

-/**

- * QueueAlreadyExistsException inidicates failure of a message store to create a queue that already exists.

- *

- * <p/><table id="crc"><caption>CRC Card</caption>

- * <tr><th> Responsibilities <th> Collaborations

- * <tr><td> Represents failure to create a queue that already exists.

- * </table>

- */

-public class QueueAlreadyExistsException extends Exception

-{

-    /**

-     * Constructs a new QueueAlreadyExistsException with the specified detail message.

-     *

-     * @param message the detail message.

-     */

-    public QueueAlreadyExistsException(String message)

-    {

-        super(message);

-    }

-

-    /**

-     * Constructs a new QueueAlreadyExistsException with the specified detail message and

-     * cause.

-     *

-     * @param message the detail message .

-     * @param cause   the cause.

-     *

-     * @deprecated

-     */

-    public QueueAlreadyExistsException(String message, Throwable cause)

-    {

-        super(message, cause);

-    }

-

-    /**

-     * Constructs a new QueueDoesntExistException with the specified cause.

-     *

-     * @param cause the cause

-     *

-     * @deprecated

-     */

-    public QueueAlreadyExistsException(Throwable cause)

-    {

-        super(cause);

-    }

-}

diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/exception/QueueDoesntExistException.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exception/QueueDoesntExistException.java
deleted file mode 100644
index d05c152228..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/exception/QueueDoesntExistException.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- *

- *   http://www.apache.org/licenses/LICENSE-2.0

- *

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- */

-package org.apache.qpid.server.exception;

-

-/**

- * MessageDoesntExistException indicates that a message store cannot find a queue.

- *

- * <p/><table id="crc"><caption>CRC Card</caption>

- * <tr><th> Responsibilities <th> Collaborations

- * <tr><td> Represents failure to find a queue on a message store.

- * </table>

- */

-public class QueueDoesntExistException extends Exception

-{

-    /**

-     * Constructs a new QueueDoesntExistException with the specified detail message.

-     *

-     * @param message the detail message.

-     */

-    public QueueDoesntExistException(String message)

-    {

-        super(message);

-    }

-

-    /**

-     * Constructs a new QueueDoesntExistException with the specified detail message and

-     * cause.

-     *

-     * @param message the detail message .

-     * @param cause   the cause.

-     *

-     * @deprecated

-     */

-    public QueueDoesntExistException(String message, Throwable cause)

-    {

-        super(message, cause);

-    }

-

-    /**

-     * Constructs a new QueueDoesntExistException with the specified cause.

-     *

-     * @param cause the cause

-     *

-     * @deprecated

-     */

-    public QueueDoesntExistException(Throwable cause)

-    {

-        super(cause);

-    }

-}

diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/exception/UnknownXidException.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exception/UnknownXidException.java
deleted file mode 100644
index e4a5de8ecb..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/exception/UnknownXidException.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- *

- *   http://www.apache.org/licenses/LICENSE-2.0

- *

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- */

-package org.apache.qpid.server.exception;

-

-import javax.transaction.xa.Xid;

-

-/**

- * UnknownXidException indicates that an Xid under which a transactional operation is to be run is not known.

- *

- * <p/><table id="crc"><caption>CRC Card</caption>

- * <tr><th> Responsibilities <th> Collaborations

- * <tr><td> Represents failure of a transaction manager to recognize an Xid.

- * </table>

- *

- * @todo Already have an InvalidXidException, this might be splitting things too far? There are cases where invalid is

- *       caught and rethrown as unknown. What is unknown specifically used for that invalid is not? For example, when

- *       recovering, is it important to distinguish between invalid and unknown?

- */

-public class UnknownXidException extends Exception

-{

-    /**

-     * Constructs a newr UnknownXidException with a standard message

-     *

-     * @param xid The unknown xid.

-     *

-     * @deprecated

-     */

-    public UnknownXidException(Xid xid)

-    {

-        super("The Xid: " + xid + " is unknown");

-    }

-

-    /**

-     * Constructs a newr UnknownXidException with a cause

-     *

-     * @param xid   The unknown xid.

-     * @param cause The casue for the xid to be unknown

-     */

-    public UnknownXidException(Xid xid, Throwable cause)

-    {

-        super("The Xid: " + xid + " is unknown", cause);

-    }

-

-    /**

-     * Constructs a newr UnknownXidException with a reason message

-     *

-     * @param reason The reason why the xid is unknown

-     * @param xid    The unknown xid.

-     *

-     * @deprecated

-     */

-    /*public UnknownXidException(Xid xid, String reason)

-    {

-        super("The Xid: " + xid + " is unknown, The reason is: " + reason);

-    }*/

-

-    /**

-     * Constructs a newr UnknownXidException with a reason message and cause

-     *

-     * @param reason The reason why the xid is unknown

-     * @param xid    The unknown xid.

-     * @param cause  The casue for the xid to be unknown

-     *

-     * @deprected

-     */

-    public UnknownXidException(Xid xid, String reason, Throwable cause)

-    {

-        super("The Xid: " + xid + " is unknown, The reason is: " + reason, cause);

-    }

-}

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
deleted file mode 100644
index 0558906fb6..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
+++ /dev/null
@@ -1,203 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.exchange;
-
-import javax.management.MalformedObjectNameException;
-import javax.management.NotCompliantMBeanException;
-import javax.management.ObjectName;
-import javax.management.openmbean.OpenType;
-import javax.management.openmbean.CompositeType;
-import javax.management.openmbean.TabularType;
-import javax.management.openmbean.TabularDataSupport;
-import javax.management.openmbean.OpenDataException;
-import javax.management.openmbean.SimpleType;
-import javax.management.openmbean.ArrayType;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.server.management.AMQManagedObject;
-import org.apache.qpid.server.management.Managable;
-import org.apache.qpid.server.management.ManagedObject;
-import org.apache.qpid.server.management.ManagedObjectRegistry;
-import org.apache.qpid.server.queue.QueueRegistry;
-import org.apache.qpid.server.queue.AMQQueue;
-import org.apache.qpid.server.registry.ApplicationRegistry;
-import org.apache.qpid.server.virtualhost.VirtualHost;
-
-import java.util.List;
-import java.util.Map;
-
-public abstract class AbstractExchange implements Exchange, Managable
-{
-    private AMQShortString _name;
-
-    protected boolean _durable;
-    protected String _exchangeType;
-
-    private VirtualHost _virtualHost;
-
-    protected ExchangeMBean _exchangeMbean;
-
-    /**
-     * Whether the exchange is automatically deleted once all queues have detached from it
-     */
-    protected boolean _autoDelete;
-
-    /**
-     * Abstract MBean class. This has some of the methods implemented from
-     * management intrerface for exchanges. Any implementaion of an
-     * Exchange MBean should extend this class.
-     */
-    protected abstract class ExchangeMBean extends AMQManagedObject implements ManagedExchange
-    {
-        // open mbean data types for representing exchange bindings
-        protected String[] _bindingItemNames;
-        protected String[] _bindingItemIndexNames;
-        protected OpenType[] _bindingItemTypes;
-        protected CompositeType _bindingDataType;
-        protected TabularType _bindinglistDataType;
-        protected TabularDataSupport _bindingList;
-        
-        public ExchangeMBean() throws NotCompliantMBeanException
-        {
-            super(ManagedExchange.class, ManagedExchange.TYPE);
-        }
-
-        protected void init() throws OpenDataException
-        {
-            _bindingItemNames = new String[]{"Binding Key", "Queue Names"};
-            _bindingItemIndexNames = new String[]{_bindingItemNames[0]};
-            
-            _bindingItemTypes = new OpenType[2];
-            _bindingItemTypes[0] = SimpleType.STRING;
-            _bindingItemTypes[1] = new ArrayType(1, SimpleType.STRING);
-            _bindingDataType = new CompositeType("Exchange Binding", "Binding key and Queue names",
-                                                 _bindingItemNames, _bindingItemNames, _bindingItemTypes);
-            _bindinglistDataType = new TabularType("Exchange Bindings", "Exchange Bindings for " + getName(),
-                                                   _bindingDataType, _bindingItemIndexNames);
-        }
-
-        public ManagedObject getParentObject()
-        {
-            return _virtualHost.getManagedObject();
-        }
-
-        public String getObjectInstanceName()
-        {
-            return _name.toString();
-        }
-
-        public String getName()
-        {
-            return _name.toString();
-        }
-
-        public String getExchangeType()
-        {
-            return _exchangeType;
-        }
-
-        public boolean isDurable()
-        {
-            return _durable;
-        }
-
-        public boolean isAutoDelete()
-        {
-            return _autoDelete;
-        }
-
-        // Added exchangetype in the object name lets maangement apps to do any customization required
-        public ObjectName getObjectName() throws MalformedObjectNameException
-        {
-            String objNameString = super.getObjectName().toString();
-            objNameString = objNameString + ",ExchangeType=" + _exchangeType;
-            return new ObjectName(objNameString);
-        }
-
-        protected ManagedObjectRegistry getManagedObjectRegistry()
-        {
-            return ApplicationRegistry.getInstance().getManagedObjectRegistry();
-        }
-    } // End of MBean class
-
-    public AMQShortString getName()
-    {
-        return _name;
-    }
-
-    /**
-     * Concrete exchanges must implement this method in order to create the managed representation. This is
-     * called during initialisation (template method pattern).
-     * @return the MBean
-     */
-    protected abstract ExchangeMBean createMBean() throws AMQException;
-
-    public void initialise(VirtualHost host, AMQShortString name, boolean durable, boolean autoDelete) throws AMQException
-    {
-        _virtualHost = host;
-        _name = name;
-        _durable = durable;
-        _autoDelete = autoDelete;
-        _exchangeMbean = createMBean();
-        _exchangeMbean.register();
-    }
-
-    public boolean isDurable()
-    {
-        return _durable;
-    }
-
-    public boolean isAutoDelete()
-    {
-        return _autoDelete;
-    }
-
-    public void close() throws AMQException
-    {
-        if (_exchangeMbean != null)
-        {
-            _exchangeMbean.unregister();
-        }
-    }
-
-    abstract public Map<AMQShortString, List<AMQQueue>> getBindings();
-
-    public String toString()
-    {
-        return getClass().getName() + "[" + getName() +"]";
-    }
-
-    public ManagedObject getManagedObject()
-    {
-        return _exchangeMbean;
-    }
-
-    public VirtualHost getVirtualHost()
-    {
-        return _virtualHost;
-    }
-
-    public QueueRegistry getQueueRegistry()
-    {
-        return getVirtualHost().getQueueRegistry();
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeFactory.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeFactory.java
deleted file mode 100644
index e3b715d45f..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeFactory.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.exchange;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.log4j.Logger;
-import org.apache.commons.configuration.Configuration;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.AMQUnknownExchangeType;
-import org.apache.qpid.exchange.ExchangeDefaults;
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.server.virtualhost.VirtualHost;
-
-public class DefaultExchangeFactory implements ExchangeFactory
-{
-    private static final Logger _logger = Logger.getLogger(DefaultExchangeFactory.class);
-
-    private Map<AMQShortString, ExchangeType<? extends Exchange>> _exchangeClassMap = new HashMap<AMQShortString, ExchangeType<? extends Exchange>>();
-    private final VirtualHost _host;
-
-    public DefaultExchangeFactory(VirtualHost host)
-    {
-        _host = host;
-        registerExchangeType(DestNameExchange.TYPE);
-        registerExchangeType(DestWildExchange.TYPE);
-        registerExchangeType(HeadersExchange.TYPE);
-        registerExchangeType(FanoutExchange.TYPE);
-
-    }
-
-    public void registerExchangeType(ExchangeType<? extends Exchange> type)
-    {
-        _exchangeClassMap.put(type.getName(), type);
-    }
-
-    public Exchange createExchange(AMQShortString exchange, AMQShortString type, boolean durable, boolean autoDelete,
-                                   int ticket)
-            throws AMQException
-    {
-        ExchangeType<? extends Exchange> exchType = _exchangeClassMap.get(type);
-        if (exchType == null)
-        {
-
-            throw new AMQUnknownExchangeType("Unknown exchange type: " + type, null);
-        }
-        Exchange e = exchType.newInstance(_host, exchange, durable, autoDelete);
-        return e;
-    }
-
-    public void initialise(Configuration hostConfig)
-    {
-        for(Object className : hostConfig.getList("custom-exchanges.class-name"))
-        {
-            try
-            {
-                Class<? extends ExchangeType> exchangeTypeClass = (Class<? extends ExchangeType>) Class.forName(String.valueOf(className));
-                ExchangeType type = exchangeTypeClass.newInstance();
-                registerExchangeType(type);
-
-            }
-            catch (ClassNotFoundException e)
-            {
-                _logger.error("No such custom exchange class found: \""+String.valueOf(className)+"\"");
-            }
-            catch (ClassCastException classCastEx)
-            {
-                _logger.error("No custom exchange class: \""+String.valueOf(className)+"\" cannot be registered as it does not extend class \""+ExchangeType.class+"\"");
-            }
-            catch (IllegalAccessException e)
-            {
-                _logger.error("Cannot create custom exchange class: \""+String.valueOf(className)+"\"",e);
-            }
-            catch (InstantiationException e)
-            {
-                _logger.error("Cannot create custom exchange class: \""+String.valueOf(className)+"\"",e);
-            }
-        }
-
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeRegistry.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeRegistry.java
deleted file mode 100644
index 23a4bec6bd..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeRegistry.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.exchange;
-
-import org.apache.log4j.Logger;
-import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.server.exception.InternalErrorException;
-import org.apache.qpid.server.store.MessageStore;
-import org.apache.qpid.server.protocol.ExchangeInitialiser;
-import org.apache.qpid.server.queue.AMQMessage;
-import org.apache.qpid.server.virtualhost.VirtualHost;
-
-import java.util.Collection;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-
-public class DefaultExchangeRegistry implements ExchangeRegistry
-{
-    private static final Logger _log = Logger.getLogger(DefaultExchangeRegistry.class);
-
-    /**
-     * Maps from exchange name to exchange instance
-     */
-    private ConcurrentMap<AMQShortString, Exchange> _exchangeMap = new ConcurrentHashMap<AMQShortString, Exchange>();
-
-    private Exchange _defaultExchange;
-    private VirtualHost _host;
-
-    public DefaultExchangeRegistry(VirtualHost host)
-    {
-        //create 'standard' exchanges:
-        _host = host;
-
-    }
-
-    public void initialise() throws AMQException
-    {
-        new ExchangeInitialiser().initialise(_host.getExchangeFactory(), this);
-    }
-
-    public MessageStore getMessageStore()
-    {
-        return _host.getMessageStore();
-    }
-
-    public void registerExchange(Exchange exchange) throws AMQException
-    {
-        _exchangeMap.put(exchange.getName(), exchange);
-        if(exchange.isDurable())
-        {
-                getMessageStore().createExchange(exchange);
-            //DTX MessageStore
-//            try
-//            {
-//                getMessageStore().createExchange(exchange);
-//            } catch (InternalErrorException e)
-//            {
-//                throw new AMQException(null, "problem registering excahgne " + exchange, e);
-//            }
-        }
-    }
-
-    public void setDefaultExchange(Exchange exchange)
-    {
-        _defaultExchange = exchange;
-    }
-
-    public Exchange getDefaultExchange()
-    {
-        return _defaultExchange;
-    }
-
-    public Collection<AMQShortString> getExchangeNames()
-    {
-        return _exchangeMap.keySet();
-    }
-
-    public void unregisterExchange(AMQShortString name, boolean inUse) throws AMQException
-    {
-        // TODO: check inUse argument
-        Exchange e = _exchangeMap.remove(name);
-        if (e != null)
-        {
-            if (e.isDurable())
-            {
-                getMessageStore().removeExchange(e);
-                //DTX MessageStore
-//                try
-//                {
-//                    getMessageStore().removeExchange(e);
-//                } catch (InternalErrorException e1)
-//                {
-//                    throw new AMQException(null, "Problem unregistering Exchange " + name, e1);
-//                }
-            }
-            e.close();
-        }
-        else
-        {
-            throw new AMQException(null, "Unknown exchange " + name, null);
-        }
-    }
-
-    public Exchange getExchange(AMQShortString name)
-    {
-        if((name == null) || name.length() == 0)
-        {
-            return getDefaultExchange();
-        }
-        else
-        {
-            return _exchangeMap.get(name);
-        }
-
-    }
-
-    /**
-     * Routes content through exchanges, delivering it to 1 or more queues.
-     * @param payload
-     * @throws AMQException if something goes wrong delivering data
-     */
-    public void routeContent(AMQMessage payload) throws AMQException
-    {
-        final AMQShortString exchange = payload.getMessagePublishInfo().getExchange();
-        final Exchange exch = getExchange(exchange);
-        // there is a small window of opportunity for the exchange to be deleted in between
-        // the BasicPublish being received (where the exchange is validated) and the final
-        // content body being received (which triggers this method)
-        // TODO: check where the exchange is validated
-        if (exch == null)
-        {
-            throw new AMQException(null, "Exchange '" + exchange + "' does not exist", null);
-        }
-        exch.route(payload);
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/DestNameExchange.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/DestNameExchange.java
deleted file mode 100644
index d1cc9b892f..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/DestNameExchange.java
+++ /dev/null
@@ -1,253 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.exchange;
-
-import org.apache.log4j.Logger;
-import org.apache.qpid.AMQException;
-import org.apache.qpid.exchange.ExchangeDefaults;
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.framing.FieldTable;
-import org.apache.qpid.framing.abstraction.MessagePublishInfo;
-import org.apache.qpid.server.management.MBeanConstructor;
-import org.apache.qpid.server.management.MBeanDescription;
-import org.apache.qpid.server.queue.AMQMessage;
-import org.apache.qpid.server.queue.AMQQueue;
-import org.apache.qpid.server.virtualhost.VirtualHost;
-
-import javax.management.JMException;
-import javax.management.MBeanException;
-import javax.management.openmbean.CompositeData;
-import javax.management.openmbean.CompositeDataSupport;
-import javax.management.openmbean.OpenDataException;
-import javax.management.openmbean.TabularData;
-import javax.management.openmbean.TabularDataSupport;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-public class DestNameExchange extends AbstractExchange
-{
-    private static final Logger _logger = Logger.getLogger(DestNameExchange.class);
-
-    /**
-     * Maps from queue name to queue instances
-     */
-    private final Index _index = new Index();
-
-    public static final ExchangeType<DestNameExchange> TYPE = new ExchangeType<DestNameExchange>()
-    {
-
-        public AMQShortString getName()
-        {
-            return ExchangeDefaults.DIRECT_EXCHANGE_CLASS;
-        }
-
-        public Class<DestNameExchange> getExchangeClass()
-        {
-            return DestNameExchange.class;
-        }
-
-        public DestNameExchange newInstance(VirtualHost host,
-                                            AMQShortString name,
-                                            boolean durable,
-                                            boolean autoDelete) throws AMQException
-        {
-            DestNameExchange exch = new DestNameExchange();
-            exch.initialise(host, name, durable, autoDelete);
-            return exch;
-        }
-    };
-
-    /**
-     * MBean class implementing the management interfaces.
-     */
-    @MBeanDescription("Management Bean for Direct Exchange")
-    private final class DestNameExchangeMBean extends ExchangeMBean
-    {
-        @MBeanConstructor("Creates an MBean for AMQ direct exchange")
-        public DestNameExchangeMBean() throws JMException
-        {
-            super();
-            _exchangeType = "direct";
-            init();
-        }
-
-        public TabularData bindings() throws OpenDataException
-        {
-            Map<AMQShortString, List<AMQQueue>> bindings = _index.getBindingsMap();
-            _bindingList = new TabularDataSupport(_bindinglistDataType);
-
-            for (Map.Entry<AMQShortString, List<AMQQueue>> entry : bindings.entrySet())
-            {
-                AMQShortString key = entry.getKey();
-                List<String> queueList = new ArrayList<String>();
-
-                List<AMQQueue> queues = entry.getValue();
-                for (AMQQueue q : queues)
-                {
-                    queueList.add(q.getName().toString());
-                }
-
-                Object[] bindingItemValues = {key.toString(), queueList.toArray(new String[0])};
-                CompositeData bindingData = new CompositeDataSupport(_bindingDataType, _bindingItemNames, bindingItemValues);
-                _bindingList.put(bindingData);
-            }
-
-            return _bindingList;
-        }
-
-        public void createNewBinding(String queueName, String binding) throws JMException
-        {
-            AMQQueue queue = getQueueRegistry().getQueue(new AMQShortString(queueName));
-            if (queue == null)
-            {
-                throw new JMException("Queue \"" + queueName + "\" is not registered with the exchange.");
-            }
-
-            try
-            {
-                queue.bind(new AMQShortString(binding), null, DestNameExchange.this);
-            }
-            catch (AMQException ex)
-            {
-                throw new MBeanException(ex);
-            }
-        }
-
-    }// End of MBean class
-
-
-    protected ExchangeMBean createMBean() throws AMQException
-    {
-        try
-        {
-            return new DestNameExchangeMBean();
-        }
-        catch (JMException ex)
-        {
-            _logger.error("Exception occured in creating the direct exchange mbean", ex);
-            throw new AMQException(null, "Exception occured in creating the direct exchange mbean", ex);
-        }
-    }
-
-    public AMQShortString getType()
-    {
-        return ExchangeDefaults.DIRECT_EXCHANGE_CLASS;
-    }
-
-    public void registerQueue(AMQShortString routingKey, AMQQueue queue, FieldTable args) throws AMQException
-    {
-        assert queue != null;
-        assert routingKey != null;
-        if (!_index.add(routingKey, queue))
-        {
-            _logger.debug("Queue " + queue + " is already registered with routing key " + routingKey);
-        }
-        else
-        {
-            _logger.debug("Binding queue " + queue + " with routing key " + routingKey + " to exchange " + this);
-        }
-    }
-
-    public void deregisterQueue(AMQShortString routingKey, AMQQueue queue, FieldTable args) throws AMQException
-    {
-        assert queue != null;
-        assert routingKey != null;
-
-        if (!_index.remove(routingKey, queue))
-        {
-            throw new AMQException(null, "Queue " + queue + " was not registered with exchange " + this.getName() +
-                                   " with routing key " + routingKey + ". No queue was registered with that routing key", null);
-        }
-    }
-
-    public void route(AMQMessage payload) throws AMQException
-    {
-        final MessagePublishInfo info = payload.getMessagePublishInfo();
-        final AMQShortString routingKey = info.getRoutingKey();
-        final List<AMQQueue> queues = (routingKey == null) ? null : _index.get(routingKey);
-        if (queues == null || queues.isEmpty())
-        {
-            String msg = "Routing key " + routingKey + " is not known to " + this;
-            if (info.isMandatory() || info.isImmediate())
-            {
-                throw new NoRouteException(msg, payload, null);
-            }
-            else
-            {
-                _logger.error("MESSAGE LOSS: Message should be sent on a Dead Letter Queue");
-                _logger.warn(msg);
-            }
-        }
-        else
-        {
-            if (_logger.isDebugEnabled())
-            {
-                _logger.debug("Publishing message to queue " + queues);
-            }
-
-            for (AMQQueue q : queues)
-            {
-                payload.enqueue(q);
-            }
-        }
-    }
-
-    public boolean isBound(AMQShortString routingKey, FieldTable arguments, AMQQueue queue)
-    {
-        return isBound(routingKey, queue);
-    }
-
-    public boolean isBound(AMQShortString routingKey, AMQQueue queue)
-    {
-        final List<AMQQueue> queues = _index.get(routingKey);
-        return queues != null && queues.contains(queue);
-    }
-
-    public boolean isBound(AMQShortString routingKey)
-    {
-        final List<AMQQueue> queues = _index.get(routingKey);
-        return queues != null && !queues.isEmpty();
-    }
-
-    public boolean isBound(AMQQueue queue)
-    {
-        Map<AMQShortString, List<AMQQueue>> bindings = _index.getBindingsMap();
-        for (List<AMQQueue> queues : bindings.values())
-        {
-            if (queues.contains(queue))
-            {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    public boolean hasBindings()
-    {
-        return !_index.getBindingsMap().isEmpty();
-    }
-
-    public Map<AMQShortString, List<AMQQueue>> getBindings()
-    {
-        return _index.getBindingsMap();
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/DestWildExchange.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/DestWildExchange.java
deleted file mode 100644
index 25dc32fd41..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/DestWildExchange.java
+++ /dev/null
@@ -1,453 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.exchange;
-
-import org.apache.log4j.Logger;
-import org.apache.qpid.AMQException;
-import org.apache.qpid.exchange.ExchangeDefaults;
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.framing.FieldTable;
-import org.apache.qpid.framing.abstraction.MessagePublishInfo;
-import org.apache.qpid.server.management.MBeanConstructor;
-import org.apache.qpid.server.management.MBeanDescription;
-import org.apache.qpid.server.queue.AMQMessage;
-import org.apache.qpid.server.queue.AMQQueue;
-import org.apache.qpid.server.virtualhost.VirtualHost;
-
-import javax.management.JMException;
-import javax.management.MBeanException;
-import javax.management.openmbean.CompositeData;
-import javax.management.openmbean.CompositeDataSupport;
-import javax.management.openmbean.OpenDataException;
-import javax.management.openmbean.TabularData;
-import javax.management.openmbean.TabularDataSupport;
-import java.util.ArrayList;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.StringTokenizer;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.CopyOnWriteArrayList;
-
-public class DestWildExchange extends AbstractExchange
-{
-
-    public static final ExchangeType<DestWildExchange> TYPE = new ExchangeType<DestWildExchange>()
-    {
-
-        public AMQShortString getName()
-        {
-            return ExchangeDefaults.TOPIC_EXCHANGE_CLASS;
-        }
-
-        public Class<DestWildExchange> getExchangeClass()
-        {
-            return DestWildExchange.class;
-        }
-
-        public DestWildExchange newInstance(VirtualHost host,
-                                            AMQShortString name,
-                                            boolean durable,
-                                            boolean autoDelete) throws AMQException
-        {
-            DestWildExchange exch = new DestWildExchange();
-            exch.initialise(host, name, durable, autoDelete);
-            return exch;
-        }
-    };
-
-
-    private static final Logger _logger = Logger.getLogger(DestWildExchange.class);
-
-    private ConcurrentHashMap<AMQShortString, List<AMQQueue>> _routingKey2queues =
-            new ConcurrentHashMap<AMQShortString, List<AMQQueue>>();
-    // private ConcurrentHashMap<AMQShortString, AMQQueue> _routingKey2queue = new ConcurrentHashMap<AMQShortString, AMQQueue>();
-    private static final String TOPIC_SEPARATOR = ".";
-    private static final String AMQP_STAR = "*";
-    private static final String AMQP_HASH = "#";
-
-    /** DestWildExchangeMBean class implements the management interface for the Topic exchanges. */
-    @MBeanDescription("Management Bean for Topic Exchange")
-    private final class DestWildExchangeMBean extends ExchangeMBean
-    {
-        @MBeanConstructor("Creates an MBean for AMQ topic exchange")
-        public DestWildExchangeMBean() throws JMException
-        {
-            super();
-            _exchangeType = "topic";
-            init();
-        }
-
-        /** returns exchange bindings in tabular form */
-        public TabularData bindings() throws OpenDataException
-        {
-            _bindingList = new TabularDataSupport(_bindinglistDataType);
-            for (Map.Entry<AMQShortString, List<AMQQueue>> entry : _routingKey2queues.entrySet())
-            {
-                AMQShortString key = entry.getKey();
-                List<String> queueList = new ArrayList<String>();
-
-                List<AMQQueue> queues = getMatchedQueues(key);
-                for (AMQQueue q : queues)
-                {
-                    queueList.add(q.getName().toString());
-                }
-
-                Object[] bindingItemValues = {key.toString(), queueList.toArray(new String[0])};
-                CompositeData bindingData = new CompositeDataSupport(_bindingDataType, _bindingItemNames, bindingItemValues);
-                _bindingList.put(bindingData);
-            }
-
-            return _bindingList;
-        }
-
-        public void createNewBinding(String queueName, String binding) throws JMException
-        {
-            AMQQueue queue = getQueueRegistry().getQueue(new AMQShortString(queueName));
-            if (queue == null)
-            {
-                throw new JMException("Queue \"" + queueName + "\" is not registered with the exchange.");
-            }
-
-            try
-            {
-                queue.bind(new AMQShortString(binding), null, DestWildExchange.this);
-            }
-            catch (AMQException ex)
-            {
-                throw new MBeanException(ex);
-            }
-        }
-
-    } // End of MBean class
-
-    public AMQShortString getType()
-    {
-        return ExchangeDefaults.TOPIC_EXCHANGE_CLASS;
-    }
-
-    public synchronized void registerQueue(AMQShortString rKey, AMQQueue queue, FieldTable args) throws AMQException
-    {
-        assert queue != null;
-        assert rKey != null;
-
-        AMQShortString routingKey = normalize(rKey);
-
-        _logger.debug("Registering queue " + queue.getName() + " with routing key " + routingKey);
-        // we need to use putIfAbsent, which is an atomic operation, to avoid a race condition
-        List<AMQQueue> queueList = _routingKey2queues.putIfAbsent(routingKey, new CopyOnWriteArrayList<AMQQueue>());
-        // if we got null back, no previous value was associated with the specified routing key hence
-        // we need to read back the new value just put into the map
-        if (queueList == null)
-        {
-            queueList = _routingKey2queues.get(routingKey);
-        }
-
-        if (!queueList.contains(queue))
-        {
-            queueList.add(queue);
-        }
-        else if (_logger.isDebugEnabled())
-        {
-            _logger.debug("Queue " + queue + " is already registered with routing key " + routingKey);
-        }
-
-    }
-
-    private AMQShortString normalize(AMQShortString routingKey)
-    {
-        StringTokenizer routingTokens = new StringTokenizer(routingKey.toString(), TOPIC_SEPARATOR);
-        List<String> _subscription = new ArrayList<String>();
-
-        while (routingTokens.hasMoreTokens())
-        {
-            _subscription.add(routingTokens.nextToken());
-        }
-
-        int size = _subscription.size();
-
-        for (int index = 0; index < size; index++)
-        {
-            // if there are more levels
-            if ((index + 1) < size)
-            {
-                if (_subscription.get(index).equals(AMQP_HASH))
-                {
-                    if (_subscription.get(index + 1).equals(AMQP_HASH))
-                    {
-                        // we don't need #.# delete this one
-                        _subscription.remove(index);
-                        size--;
-                        // redo this normalisation
-                        index--;
-                    }
-
-                    if (_subscription.get(index + 1).equals(AMQP_STAR))
-                    {
-                        // we don't want #.* swap to *.#
-                        // remove it and put it in at index + 1
-                        _subscription.add(index + 1, _subscription.remove(index));
-                    }
-                }
-            } // if we have more levels
-        }
-
-        StringBuilder sb = new StringBuilder();
-
-        for (String s : _subscription)
-        {
-            sb.append(s);
-            sb.append(TOPIC_SEPARATOR);
-        }
-
-        sb.deleteCharAt(sb.length() - 1);
-
-        return new AMQShortString(sb.toString());
-    }
-
-    public void route(AMQMessage payload) throws AMQException
-    {
-        MessagePublishInfo info = payload.getMessagePublishInfo();
-
-        final AMQShortString routingKey = normalize(info.getRoutingKey());
-
-        List<AMQQueue> queues = getMatchedQueues(routingKey);
-        // if we have no registered queues we have nothing to do
-        // TODO: add support for the immediate flag
-        if ((queues == null) || queues.isEmpty())
-        {
-            if (info.isMandatory() || info.isImmediate())
-            {
-                String msg = "Topic " + routingKey + " is not known to " + this;
-                throw new NoRouteException(msg, payload, null);
-            }
-            else
-            {
-                _logger.warn("No queues found for routing key " + routingKey);
-                _logger.warn("Routing map contains: " + _routingKey2queues);
-
-                return;
-            }
-        }
-
-        for (AMQQueue q : queues)
-        {
-            // TODO: modify code generator to add clone() method then clone the deliver body
-            // without this addition we have a race condition - we will be modifying the body
-            // before the encoder has encoded the body for delivery
-            payload.enqueue(q);
-        }
-    }
-
-    public boolean isBound(AMQShortString routingKey, FieldTable arguments, AMQQueue queue)
-    {
-        return isBound(routingKey, queue);
-    }
-
-    public boolean isBound(AMQShortString routingKey, AMQQueue queue)
-    {
-        List<AMQQueue> queues = _routingKey2queues.get(normalize(routingKey));
-
-        return (queues != null) && queues.contains(queue);
-    }
-
-    public boolean isBound(AMQShortString routingKey)
-    {
-        List<AMQQueue> queues = _routingKey2queues.get(normalize(routingKey));
-
-        return (queues != null) && !queues.isEmpty();
-    }
-
-    public boolean isBound(AMQQueue queue)
-    {
-        for (List<AMQQueue> queues : _routingKey2queues.values())
-        {
-            if (queues.contains(queue))
-            {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    public boolean hasBindings()
-    {
-        return !_routingKey2queues.isEmpty();
-    }
-
-    public synchronized void deregisterQueue(AMQShortString rKey, AMQQueue queue, FieldTable args) throws AMQException
-    {
-        assert queue != null;
-        assert rKey != null;
-
-        AMQShortString routingKey = normalize(rKey);
-
-        List<AMQQueue> queues = _routingKey2queues.get(routingKey);
-        if (queues == null)
-        {
-            throw new AMQException(null, "Queue " + queue + " was not registered with exchange " + this.getName() +
-                                   " with routing key " + routingKey + ". No queue was registered with that routing key", null);
-
-        }
-
-        boolean removedQ = queues.remove(queue);
-        if (!removedQ)
-        {
-            throw new AMQException(null, "Queue " + queue + " was not registered with exchange " + this.getName() +
-                                   " with routing key " + routingKey, null);
-        }
-
-        if (queues.isEmpty())
-        {
-            _routingKey2queues.remove(routingKey);
-        }
-    }
-
-    protected ExchangeMBean createMBean() throws AMQException
-    {
-        try
-        {
-            return new DestWildExchangeMBean();
-        }
-        catch (JMException ex)
-        {
-            _logger.error("Exception occured in creating the topic exchenge mbean", ex);
-            throw new AMQException(null, "Exception occured in creating the topic exchenge mbean", ex);
-        }
-    }
-
-    public Map<AMQShortString, List<AMQQueue>> getBindings()
-    {
-        return _routingKey2queues;
-    }
-
-    private List<AMQQueue> getMatchedQueues(AMQShortString routingKey)
-    {
-        List<AMQQueue> list = new LinkedList<AMQQueue>();
-        StringTokenizer routingTokens = new StringTokenizer(routingKey.toString(), TOPIC_SEPARATOR);
-
-        ArrayList<String> routingkeyList = new ArrayList<String>();
-
-        while (routingTokens.hasMoreTokens())
-        {
-            String next = routingTokens.nextToken();
-            if (next.equals(AMQP_HASH) && routingkeyList.get(routingkeyList.size() - 1).equals(AMQP_HASH))
-            {
-                continue;
-            }
-
-            routingkeyList.add(next);
-        }
-
-        for (AMQShortString queue : _routingKey2queues.keySet())
-        {
-            StringTokenizer queTok = new StringTokenizer(queue.toString(), TOPIC_SEPARATOR);
-
-            ArrayList<String> queueList = new ArrayList<String>();
-
-            while (queTok.hasMoreTokens())
-            {
-                queueList.add(queTok.nextToken());
-            }
-
-            int depth = 0;
-            boolean matching = true;
-            boolean done = false;
-            int routingskip = 0;
-            int queueskip = 0;
-
-            while (matching && !done)
-            {
-                if ((queueList.size() == (depth + queueskip)) || (routingkeyList.size() == (depth + routingskip)))
-                {
-                    done = true;
-
-                    // if it was the routing key that ran out of digits
-                    if (routingkeyList.size() == (depth + routingskip))
-                    {
-                        if (queueList.size() > (depth + queueskip))
-                        { // a hash and it is the last entry
-                            matching =
-                                    queueList.get(depth + queueskip).equals(AMQP_HASH)
-                                    && (queueList.size() == (depth + queueskip + 1));
-                        }
-                    }
-                    else if (routingkeyList.size() > (depth + routingskip))
-                    {
-                        // There is still more routing key to check
-                        matching = false;
-                    }
-
-                    continue;
-                }
-
-                // if the values on the two topics don't match
-                if (!queueList.get(depth + queueskip).equals(routingkeyList.get(depth + routingskip)))
-                {
-                    if (queueList.get(depth + queueskip).equals(AMQP_STAR))
-                    {
-                        depth++;
-
-                        continue;
-                    }
-                    else if (queueList.get(depth + queueskip).equals(AMQP_HASH))
-                    {
-                        // Is this a # at the end
-                        if (queueList.size() == (depth + queueskip + 1))
-                        {
-                            done = true;
-
-                            continue;
-                        }
-
-                        // otherwise # in the middle
-                        while (routingkeyList.size() > (depth + routingskip))
-                        {
-                            if (routingkeyList.get(depth + routingskip).equals(queueList.get(depth + queueskip + 1)))
-                            {
-                                queueskip++;
-                                depth++;
-
-                                break;
-                            }
-
-                            routingskip++;
-                        }
-
-                        continue;
-                    }
-
-                    matching = false;
-                }
-
-                depth++;
-            }
-
-            if (matching)
-            {
-                list.addAll(_routingKey2queues.get(queue));
-            }
-        }
-
-        return list;
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/Exchange.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/Exchange.java
deleted file mode 100644
index 78749de612..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/Exchange.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.exchange;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.framing.FieldTable;
-import org.apache.qpid.server.queue.AMQMessage;
-import org.apache.qpid.server.queue.AMQQueue;
-import org.apache.qpid.server.virtualhost.VirtualHost;
-
-import java.util.List;
-import java.util.Map;
-
-public interface Exchange
-{
-    AMQShortString getName();
-    AMQShortString getType();
-
-    void initialise(VirtualHost host, AMQShortString name, boolean durable, boolean autoDelete) throws AMQException;
-
-    boolean isDurable();
-
-    /**
-     * @return true if the exchange will be deleted after all queues have been detached
-     */
-    boolean isAutoDelete();
-
-    void close() throws AMQException;
-
-    void registerQueue(AMQShortString routingKey, AMQQueue queue, FieldTable args) throws AMQException;
-
-    void deregisterQueue(AMQShortString routingKey, AMQQueue queue, FieldTable args) throws AMQException;
-
-    void route(AMQMessage message) throws AMQException;
-
-
-    /**
-     * Determines whether a message would be isBound to a particular queue using a specific routing key and arguments
-     * @param routingKey
-     * @param arguments
-     * @param queue
-     * @return
-     * @throws AMQException
-     */
-    boolean isBound(AMQShortString routingKey, FieldTable arguments, AMQQueue queue);
-
-    /**
-     * Determines whether a message would be isBound to a particular queue using a specific routing key
-     * @param routingKey
-     * @param queue
-     * @return
-     * @throws AMQException
-     */
-    boolean isBound(AMQShortString routingKey, AMQQueue queue);
-
-    /**
-     * Determines whether a message is routing to any queue using a specific routing key
-     * @param routingKey
-     * @return
-     * @throws AMQException
-     */
-    boolean isBound(AMQShortString routingKey);
-
-    boolean isBound(AMQQueue queue);
-
-    /**
-     * Returns true if this exchange has at least one binding associated with it.
-     * @return
-     * @throws AMQException
-     */
-    boolean hasBindings();
-
-    Map<AMQShortString, List<AMQQueue>> getBindings();
-
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/ExchangeFactory.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/ExchangeFactory.java
deleted file mode 100644
index b7b88b9157..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/ExchangeFactory.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.exchange;
-
-import org.apache.commons.configuration.Configuration;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.AMQShortString;
-
-
-public interface ExchangeFactory
-{
-    Exchange createExchange(AMQShortString exchange, AMQShortString type, boolean durable, boolean autoDelete,
-                            int ticket)
-            throws AMQException;
-
-    void initialise(Configuration hostConfig);
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/ExchangeInUseException.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/ExchangeInUseException.java
deleted file mode 100644
index 07550dd808..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/ExchangeInUseException.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.exchange;
-
-import org.apache.qpid.AMQException;
-
-/**
- * ExchangeInUseRegistry indicates that an exchange cannot be unregistered because it is currently being used.
- *
- * <p/><table id="crc"><caption>CRC Card</caption>
- * <tr><th> Responsibilities <th> Collaborations
- * <tr><td> Represents failure to unregister exchange that is in use.
- * </table>
- *
- * @todo Not an AMQP exception as no status code.
- *
- * @todo This exception is not used. However, it is part of the ExchangeRegistry interface, and looks like code is
- *       going to need to be added to throw/deal with this. Alternatively ExchangeResitries may be able to handle the
- *       issue internally.
- */
-public class ExchangeInUseException extends AMQException
-{
-    public ExchangeInUseException(String exchangeName, Throwable cause)
-    {
-        super(null, "Exchange " + exchangeName + " is currently in use", cause);
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/ExchangeRegistry.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/ExchangeRegistry.java
deleted file mode 100644
index 2e101beb84..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/ExchangeRegistry.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.exchange;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.AMQShortString;
-
-import java.util.Collection;
-
-public interface ExchangeRegistry extends MessageRouter
-{
-    void registerExchange(Exchange exchange) throws AMQException;
-
-    /**
-     * Unregister an exchange
-     * @param name name of the exchange to delete
-     * @param inUse if true, do NOT delete the exchange if it is in use (has queues bound to it)
-     * @throws ExchangeInUseException when the exchange cannot be deleted because it is in use
-     * @throws AMQException
-     */
-    void unregisterExchange(AMQShortString name, boolean inUse) throws ExchangeInUseException, AMQException;
-
-    Exchange getExchange(AMQShortString name);
-
-    void setDefaultExchange(Exchange exchange);
-
-    Exchange getDefaultExchange();
-
-    Collection<AMQShortString> getExchangeNames();
-
-    void initialise() throws AMQException;
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/ExchangeType.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/ExchangeType.java
deleted file mode 100644
index 472de2da5c..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/ExchangeType.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*

- *

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- *

- *   http://www.apache.org/licenses/LICENSE-2.0

- *

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- *

- */

-package org.apache.qpid.server.exchange;

-

-import org.apache.qpid.framing.AMQShortString;

-import org.apache.qpid.AMQException;

-import org.apache.qpid.server.virtualhost.VirtualHost;

-

-

-public interface ExchangeType<T extends Exchange>

-{

-    public AMQShortString getName();

-    public Class<T> getExchangeClass();

-    public T newInstance(VirtualHost host, AMQShortString name,

-                         boolean durable, boolean autoDelete) throws AMQException;

-}

diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/FanoutExchange.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/FanoutExchange.java
deleted file mode 100644
index 77590ea54d..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/FanoutExchange.java
+++ /dev/null
@@ -1,239 +0,0 @@
-/*

- *

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- *

- *   http://www.apache.org/licenses/LICENSE-2.0

- *

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- *

- */

-package org.apache.qpid.server.exchange;

-

-import org.apache.log4j.Logger;

-import org.apache.qpid.AMQException;

-import org.apache.qpid.exchange.ExchangeDefaults;

-import org.apache.qpid.framing.AMQShortString;

-import org.apache.qpid.framing.FieldTable;

-import org.apache.qpid.framing.abstraction.MessagePublishInfo;

-import org.apache.qpid.server.management.MBeanConstructor;

-import org.apache.qpid.server.management.MBeanDescription;

-import org.apache.qpid.server.queue.AMQMessage;

-import org.apache.qpid.server.queue.AMQQueue;

-import org.apache.qpid.server.virtualhost.VirtualHost;

-

-import javax.management.JMException;

-import javax.management.MBeanException;

-import javax.management.openmbean.CompositeData;

-import javax.management.openmbean.CompositeDataSupport;

-import javax.management.openmbean.OpenDataException;

-import javax.management.openmbean.TabularData;

-import javax.management.openmbean.TabularDataSupport;

-import java.util.List;

-import java.util.Map;

-import java.util.concurrent.CopyOnWriteArraySet;

-

-public class FanoutExchange extends AbstractExchange

-{

-

-

-    private static final Logger _logger = Logger.getLogger(FanoutExchange.class);

-

-

-    public static final ExchangeType<FanoutExchange> TYPE = new ExchangeType<FanoutExchange>()

-    {

-

-        public AMQShortString getName()

-        {

-            return ExchangeDefaults.FANOUT_EXCHANGE_CLASS;

-        }

-

-        public Class<FanoutExchange> getExchangeClass()

-        {

-            return FanoutExchange.class;

-        }

-

-        public FanoutExchange newInstance(VirtualHost host,

-                                          AMQShortString name,

-                                          boolean durable,

-                                          boolean autoDelete) throws AMQException

-        {

-            FanoutExchange exch = new FanoutExchange();

-            exch.initialise(host, name, durable, autoDelete);

-            return exch;

-        }

-    };

-

-

-    /**

-     * Maps from queue name to queue instances

-     */

-    private final CopyOnWriteArraySet<AMQQueue> _queues = new CopyOnWriteArraySet<AMQQueue>();

-

-    /**

-     * MBean class implementing the management interfaces.

-     */

-    @MBeanDescription("Management Bean for Fanout Exchange")

-    private final class FanoutExchangeMBean extends ExchangeMBean

-    {

-        @MBeanConstructor("Creates an MBean for AMQ fanout exchange")

-        public FanoutExchangeMBean() throws JMException

-        {

-            super();

-            _exchangeType = "fanout";

-            init();

-        }

-

-        public TabularData bindings() throws OpenDataException

-        {

-

-            _bindingList = new TabularDataSupport(_bindinglistDataType);

-

-            for (AMQQueue queue : _queues)

-            {

-                String queueName = queue.getName().toString();

-

-                Object[] bindingItemValues = {queueName, new String[]{queueName}};

-                CompositeData bindingData = new CompositeDataSupport(_bindingDataType, _bindingItemNames, bindingItemValues);

-                _bindingList.put(bindingData);

-            }

-

-            return _bindingList;

-        }

-

-        public void createNewBinding(String queueName, String binding) throws JMException

-        {

-            AMQQueue queue = getQueueRegistry().getQueue(new AMQShortString(queueName));

-            if (queue == null)

-            {

-                throw new JMException("Queue \"" + queueName + "\" is not registered with the exchange.");

-            }

-

-            try

-            {

-                queue.bind(new AMQShortString(binding), null, FanoutExchange.this);

-            }

-            catch (AMQException ex)

-            {

-                throw new MBeanException(ex);

-            }

-        }

-

-    } // End of MBean class

-

-    protected ExchangeMBean createMBean() throws AMQException

-    {

-        try

-        {

-            return new FanoutExchange.FanoutExchangeMBean();

-        }

-        catch (JMException ex)

-        {

-            _logger.error("Exception occured in creating the direct exchange mbean", ex);

-            throw new AMQException(null, "Exception occured in creating the direct exchange mbean", ex);

-        }

-    }

-

-    public Map<AMQShortString, List<AMQQueue>> getBindings()

-    {

-        return null;

-    }

-

-    public AMQShortString getType()

-    {

-        return ExchangeDefaults.FANOUT_EXCHANGE_CLASS;

-    }

-

-    public void registerQueue(AMQShortString routingKey, AMQQueue queue, FieldTable args) throws AMQException

-    {

-        assert queue != null;

-

-        if (_queues.contains(queue))

-        {

-            _logger.debug("Queue " + queue + " is already registered");

-        }

-        else

-        {

-            _queues.add(queue);

-            _logger.debug("Binding queue " + queue + " with routing key " + routingKey + " to exchange " + this);

-        }

-    }

-

-    public void deregisterQueue(AMQShortString routingKey, AMQQueue queue, FieldTable args) throws AMQException

-    {

-        assert queue != null;

-

-        if (!_queues.remove(queue))

-        {

-            throw new AMQException(null, "Queue " + queue + " was not registered with exchange " + this.getName() +

-                                   ". ", null);

-        }

-    }

-

-    public void route(AMQMessage payload) throws AMQException

-    {

-        final MessagePublishInfo publishInfo = payload.getMessagePublishInfo();

-        final AMQShortString routingKey = publishInfo.getRoutingKey();

-        if ((_queues == null) || _queues.isEmpty())

-        {

-            String msg = "No queues bound to " + this;

-            if (publishInfo.isMandatory() || publishInfo.isImmediate())

-            {

-                throw new NoRouteException(msg, payload, null);

-            }

-            else

-            {

-                _logger.warn(msg);

-            }

-        }

-        else

-        {

-            if (_logger.isDebugEnabled())

-            {

-                _logger.debug("Publishing message to queue " + _queues);

-            }

-

-            for (AMQQueue q : _queues)

-            {

-                payload.enqueue(q);

-            }

-        }

-    }

-

-    public boolean isBound(AMQShortString routingKey, FieldTable fieldtable, AMQQueue queue)

-    {

-        return isBound(routingKey, queue);

-    }

-

-    public boolean isBound(AMQShortString routingKey, AMQQueue queue)

-    {

-        return _queues.contains(queue);

-    }

-

-    public boolean isBound(AMQShortString routingKey)

-    {

-

-        return (_queues != null) && !_queues.isEmpty();

-    }

-

-    public boolean isBound(AMQQueue queue)

-    {

-

-        return _queues.contains(queue);

-    }

-

-    public boolean hasBindings()

-    {

-        return !_queues.isEmpty();

-    }

-}

diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersBinding.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersBinding.java
deleted file mode 100644
index 2b7df4361a..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersBinding.java
+++ /dev/null
@@ -1,219 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.exchange;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.log4j.Logger;
-import org.apache.qpid.framing.AMQTypedValue;
-import org.apache.qpid.framing.FieldTable;
-
-/**
- * Defines binding and matching based on a set of headers.
- */
-class HeadersBinding
-{
-    private static final Logger _logger = Logger.getLogger(HeadersBinding.class);
-
-    private final FieldTable _mappings;
-    private final Set<String> required = new HashSet<String>();
-    private final Map<String,Object> matches = new HashMap<String,Object>();
-    private boolean matchAny;
-
-    private final class MatchesOrProcessor implements FieldTable.FieldTableElementProcessor
-    {
-        private Boolean _result = Boolean.FALSE;
-
-        public boolean processElement(String propertyName, AMQTypedValue value)
-        {
-            if((value != null) && (value.getValue() != null) && value.getValue().equals(matches.get(propertyName)))
-            {
-                _result = Boolean.TRUE;
-                return false;
-            }
-            return true;
-        }
-
-        public Object getResult()
-        {
-            return _result;
-        }
-    }
-
-    private final class RequiredOrProcessor implements FieldTable.FieldTableElementProcessor
-    {
-        Boolean _result = Boolean.FALSE;
-
-        public boolean processElement(String propertyName, AMQTypedValue value)
-        {
-            if(required.contains(propertyName))
-            {
-                _result = Boolean.TRUE;
-                return false;
-            }
-            return true;
-        }
-
-        public Object getResult()
-        {
-            return _result;
-        }
-    }
-
-
-
-    /**
-     * Creates a binding for a set of mappings. Those mappings whose value is
-     * null or the empty string are assumed only to be required headers, with
-     * no constraint on the value. Those with a non-null value are assumed to
-     * define a required match of value. 
-     * @param mappings the defined mappings this binding should use
-     */
-
-    HeadersBinding(FieldTable mappings)
-    {
-        _mappings = mappings;
-        initMappings();
-    }
-
-    private void initMappings()
-    {
-
-        _mappings.processOverElements(new FieldTable.FieldTableElementProcessor()
-        {
-
-            public boolean processElement(String propertyName, AMQTypedValue value)
-            {
-                if (isSpecial(propertyName))
-                {
-                    processSpecial(propertyName, value.getValue());
-                }
-                else if (value.getValue() == null || value.getValue().equals(""))
-                {
-                    required.add(propertyName);
-                }
-                else
-                {
-                    matches.put(propertyName,value.getValue());
-                }
-
-                return true;
-            }
-
-            public Object getResult()
-            {
-                return null;
-            }
-        });
-    }
-
-    protected FieldTable getMappings()
-    {
-        return _mappings;
-    }
-
-    /**
-     * Checks whether the supplied headers match the requirements of this binding
-     * @param headers the headers to check
-     * @return true if the headers define any required keys and match any required
-     * values
-     */
-    public boolean matches(FieldTable headers)
-    {
-        if(headers == null)
-        {
-            return required.isEmpty() && matches.isEmpty();
-        }
-        else
-        {
-            return matchAny ? or(headers) : and(headers);
-        }
-    }
-
-    private boolean and(FieldTable headers)
-    {
-        if(headers.keys().containsAll(required))
-        {
-            for(Map.Entry<String, Object> e : matches.entrySet())
-            {
-                if(!e.getValue().equals(headers.getObject(e.getKey())))
-                {
-                    return false;
-                }
-            }
-            return true;
-        }
-        else
-        {
-            return false;
-        }
-    }
-
-
-    private boolean or(final FieldTable headers)
-    {
-        if(required.isEmpty() || !(Boolean) headers.processOverElements(new RequiredOrProcessor()))
-        {
-            return ((!matches.isEmpty()) && (Boolean) headers.processOverElements(new MatchesOrProcessor()))
-                    || (required.isEmpty() && matches.isEmpty());
-        }
-        else
-        {
-            return true;
-        }
-    }
-
-    private void processSpecial(String key, Object value)
-    {
-        if("X-match".equalsIgnoreCase(key))
-        {
-            matchAny = isAny(value);
-        }
-        else
-        {
-            _logger.warn("Ignoring special header: " + key);
-        }
-    }
-
-    private boolean isAny(Object value)
-    {
-        if(value instanceof String)
-        {
-            if("any".equalsIgnoreCase((String) value)) return true;
-            if("all".equalsIgnoreCase((String) value)) return false;
-        }
-        _logger.warn("Ignoring unrecognised match type: " + value);
-        return false;//default to all
-    }
-
-    static boolean isSpecial(Object key)
-    {
-        return key instanceof String && isSpecial((String) key);
-    }
-
-    static boolean isSpecial(String key)
-    {
-        return key.startsWith("X-") || key.startsWith("x-");
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java
deleted file mode 100644
index 426cd090c1..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java
+++ /dev/null
@@ -1,350 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.exchange;
-
-import org.apache.log4j.Logger;
-import org.apache.qpid.AMQException;
-import org.apache.qpid.exchange.ExchangeDefaults;
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.framing.AMQTypedValue;
-import org.apache.qpid.framing.BasicContentHeaderProperties;
-import org.apache.qpid.framing.ContentHeaderBody;
-import org.apache.qpid.framing.FieldTable;
-import org.apache.qpid.server.management.MBeanConstructor;
-import org.apache.qpid.server.management.MBeanDescription;
-import org.apache.qpid.server.queue.AMQMessage;
-import org.apache.qpid.server.queue.AMQQueue;
-import org.apache.qpid.server.virtualhost.VirtualHost;
-
-import javax.management.JMException;
-import javax.management.openmbean.ArrayType;
-import javax.management.openmbean.CompositeData;
-import javax.management.openmbean.CompositeDataSupport;
-import javax.management.openmbean.CompositeType;
-import javax.management.openmbean.OpenDataException;
-import javax.management.openmbean.OpenType;
-import javax.management.openmbean.SimpleType;
-import javax.management.openmbean.TabularData;
-import javax.management.openmbean.TabularDataSupport;
-import javax.management.openmbean.TabularType;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.CopyOnWriteArrayList;
-
-/**
- * An exchange that binds queues based on a set of required headers and header values
- * and routes messages to these queues by matching the headers of the message against
- * those with which the queues were bound.
- * <p/>
- * <pre>
- * The Headers Exchange
- *
- *  Routes messages according to the value/presence of fields in the message header table.
- *  (Basic and JMS content has a content header field called "headers" that is a table of
- *   message header fields).
- *
- *  class = "headers"
- *  routing key is not used
- *
- *  Has the following binding arguments:
- *
- *  the X-match field - if "all", does an AND match (used for GRM), if "any", does an OR match.
- *  other fields prefixed with "X-" are ignored (and generate a console warning message).
- *  a field with no value or empty value indicates a match on presence only.
- *  a field with a value indicates match on field presence and specific value.
- *
- *  Standard instances:
- *
- *  amq.match - pub/sub on field content/value
- *  </pre>
- */
-public class HeadersExchange extends AbstractExchange
-{
-    private static final Logger _logger = Logger.getLogger(HeadersExchange.class);
-
-
-    public static final ExchangeType<HeadersExchange> TYPE = new ExchangeType<HeadersExchange>()
-    {
-
-        public AMQShortString getName()
-        {
-            return ExchangeDefaults.HEADERS_EXCHANGE_CLASS;
-        }
-
-        public Class<HeadersExchange> getExchangeClass()
-        {
-            return HeadersExchange.class;
-        }
-
-        public HeadersExchange newInstance(VirtualHost host,
-                                           AMQShortString name,
-                                           boolean durable,
-                                           boolean autoDelete) throws AMQException
-        {
-            HeadersExchange exch = new HeadersExchange();
-            exch.initialise(host, name, durable, autoDelete);
-            return exch;
-        }
-    };
-
-
-    private final List<Registration> _bindings = new CopyOnWriteArrayList<Registration>();
-
-    /**
-     * HeadersExchangeMBean class implements the management interface for the
-     * Header Exchanges.
-     */
-    @MBeanDescription("Management Bean for Headers Exchange")
-    private final class HeadersExchangeMBean extends ExchangeMBean
-    {
-        @MBeanConstructor("Creates an MBean for AMQ Headers exchange")
-        public HeadersExchangeMBean() throws JMException
-        {
-            super();
-            _exchangeType = "headers";
-            init();
-        }
-
-        /**
-         * initialises the OpenType objects.
-         */
-        protected void init() throws OpenDataException
-        {
-            _bindingItemNames = new String[]{"Binding No", "Queue  Name", "Queue Bindings"};
-            _bindingItemIndexNames = new String[]{_bindingItemNames[0]};
-
-            _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",
-                                                 _bindingItemNames, _bindingItemNames, _bindingItemTypes);
-            _bindinglistDataType = new TabularType("Exchange Bindings", "List of exchange bindings for " + getName(),
-                                                   _bindingDataType, _bindingItemIndexNames);
-        }
-
-        public TabularData bindings() throws OpenDataException
-        {
-            _bindingList = new TabularDataSupport(_bindinglistDataType);
-            int count = 1;
-            for (Iterator<Registration> itr = _bindings.iterator(); itr.hasNext();)
-            {
-                Registration registration = itr.next();
-                String queueName = registration.queue.getName().toString();
-
-                HeadersBinding headers = registration.binding;
-                FieldTable headerMappings = headers.getMappings();
-                final List<String> mappingList = new ArrayList<String>();
-
-                headerMappings.processOverElements(new FieldTable.FieldTableElementProcessor()
-                {
-
-                    public boolean processElement(String propertyName, AMQTypedValue value)
-                    {
-                        mappingList.add(propertyName + "=" + value.getValue());
-                        return true;
-                    }
-
-                    public Object getResult()
-                    {
-                        return mappingList;
-                    }
-                });
-
-
-                Object[] bindingItemValues = {count++, queueName, mappingList.toArray(new String[0])};
-                CompositeData bindingData = new CompositeDataSupport(_bindingDataType, _bindingItemNames, bindingItemValues);
-                _bindingList.put(bindingData);
-            }
-
-            return _bindingList;
-        }
-
-        /**
-         * Creates bindings. Binding pattern is as follows-
-         * <attributename>=<value>,<attributename>=<value>,...
-         * @param queueName
-         * @param binding
-         * @throws javax.management.JMException
-         */
-        public void createNewBinding(String queueName, String binding) throws JMException
-        {
-            AMQQueue queue = getQueueRegistry().getQueue(new AMQShortString(queueName));
-
-            if (queue == null)
-            {
-                throw new JMException("Queue \"" + queueName + "\" is not registered with the exchange.");
-            }
-
-            String[] bindings = binding.split(",");
-            FieldTable bindingMap = new FieldTable();
-            for (int i = 0; i < bindings.length; i++)
-            {
-                String[] keyAndValue = bindings[i].split("=");
-                if (keyAndValue == null || keyAndValue.length < 2)
-                {
-                    throw new JMException("Format for headers binding should be \"<attribute1>=<value1>,<attribute2>=<value2>\" ");
-                }
-                bindingMap.setString(keyAndValue[0], keyAndValue[1]);
-            }
-
-            _bindings.add(new Registration(new HeadersBinding(bindingMap), queue));
-        }
-
-    } // End of MBean class
-
-    public AMQShortString getType()
-    {
-        return ExchangeDefaults.HEADERS_EXCHANGE_CLASS;
-    }
-
-    public void registerQueue(AMQShortString routingKey, AMQQueue queue, FieldTable args) throws AMQException
-    {
-        _logger.debug("Exchange " + getName() + ": Binding " + queue.getName() + " with " + args);
-        _bindings.add(new Registration(new HeadersBinding(args), queue));
-    }
-
-    public void deregisterQueue(AMQShortString routingKey, AMQQueue queue, FieldTable args) throws AMQException
-    {
-        _logger.debug("Exchange " + getName() + ": Unbinding " + queue.getName());
-        _bindings.remove(new Registration(new HeadersBinding(args), queue));
-    }
-
-    public void route(AMQMessage payload) throws AMQException
-    {
-        FieldTable headers = getHeaders(payload.getContentHeaderBody());
-        if (_logger.isDebugEnabled())
-        {
-            _logger.debug("Exchange " + getName() + ": routing message with headers " + headers);
-        }
-        boolean routed = false;
-        for (Registration e : _bindings)
-        {
-            if (e.binding.matches(headers))
-            {
-                if (_logger.isDebugEnabled())
-                {
-                    _logger.debug("Exchange " + getName() + ": delivering message with headers " +
-                                  headers + " to " + e.queue.getName());
-                }
-                payload.enqueue(e.queue);
-                routed = true;
-            }
-        }
-        if (!routed)
-        {
-
-            String msg = "Exchange " + getName() + ": message not routable.";
-
-            if (payload.getMessagePublishInfo().isMandatory() || payload.getMessagePublishInfo().isImmediate())
-            {
-                throw new NoRouteException(msg, payload, null);
-            }
-            else
-            {
-                _logger.warn(msg);
-            }
-
-        }
-    }
-
-    public boolean isBound(AMQShortString routingKey, FieldTable arguments, AMQQueue queue)
-    {
-        //fixme isBound here should take the arguements in to consideration.
-        return isBound(routingKey, queue);
-    }
-
-    public boolean isBound(AMQShortString routingKey, AMQQueue queue)
-    {
-        return isBound(queue);
-    }
-
-    public boolean isBound(AMQShortString routingKey)
-    {
-        return hasBindings();
-    }
-
-    public boolean isBound(AMQQueue queue)
-    {
-        for (Registration r : _bindings)
-        {
-            if (r.queue.equals(queue))
-            {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    public boolean hasBindings()
-    {
-        return !_bindings.isEmpty();
-    }
-
-    protected FieldTable getHeaders(ContentHeaderBody contentHeaderFrame)
-    {
-        //what if the content type is not 'basic'? 'file' and 'stream' content classes also define headers,
-        //but these are not yet implemented.
-        return ((BasicContentHeaderProperties) contentHeaderFrame.properties).getHeaders();
-    }
-
-    protected ExchangeMBean createMBean() throws AMQException
-    {
-        try
-        {
-            return new HeadersExchangeMBean();
-        }
-        catch (JMException ex)
-        {
-            _logger.error("Exception occured in creating the HeadersExchangeMBean", ex);
-            throw new AMQException(null, "Exception occured in creating the HeadersExchangeMBean", ex);
-        }
-    }
-
-    public Map<AMQShortString, List<AMQQueue>> getBindings()
-    {
-        return null;
-    }
-
-    private static class Registration
-    {
-        private final HeadersBinding binding;
-        private final AMQQueue queue;
-
-        Registration(HeadersBinding binding, AMQQueue queue)
-        {
-            this.binding = binding;
-            this.queue = queue;
-        }
-
-        public int hashCode()
-        {
-            return queue.hashCode();
-        }
-
-        public boolean equals(Object o)
-        {
-            return o instanceof Registration && ((Registration) o).queue.equals(queue);
-        }
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/Index.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/Index.java
deleted file mode 100644
index eacdad8a8e..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/Index.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.exchange;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.CopyOnWriteArrayList;
-
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.server.queue.AMQQueue;
-
-/**
- * An index of queues against routing key. Allows multiple queues to be stored
- * against the same key. Used in the DestNameExchange.
- */
-class Index
-{
-    private ConcurrentMap<AMQShortString, List<AMQQueue>> _index
-            = new ConcurrentHashMap<AMQShortString, List<AMQQueue>>();
-
-    synchronized boolean add(AMQShortString key, AMQQueue queue)
-    {
-        List<AMQQueue> queues = _index.get(key);
-        if(queues == null)
-        {
-            queues = new CopyOnWriteArrayList<AMQQueue>();
-            //next call is atomic, so there is no race to create the list
-            List<AMQQueue> active = _index.putIfAbsent(key, queues);
-            if(active != null)
-            {
-                //someone added the new one in faster than we did, so use theirs
-                queues = active;
-            }
-        }
-        if(queues.contains(queue))
-        {
-            return false;
-        }
-        else
-        {
-            return queues.add(queue);
-        }
-    }
-
-    synchronized boolean remove(AMQShortString key, AMQQueue queue)
-    {
-        List<AMQQueue> queues = _index.get(key);
-        if (queues != null)
-        {
-            boolean removed = queues.remove(queue);
-            if (queues.size() == 0)
-            {
-                _index.remove(key);
-            }
-            return removed;
-        }
-        return false;
-    }
-
-    List<AMQQueue> get(AMQShortString key)
-    {
-        return _index.get(key);
-    }
-
-    Map<AMQShortString, List<AMQQueue>> getBindingsMap()
-    {
-        return new HashMap<AMQShortString, List<AMQQueue>>(_index);
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/ManagedExchange.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/ManagedExchange.java
deleted file mode 100644
index bb33341aef..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/ManagedExchange.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.exchange;
-
-import java.io.IOException;
-
-import javax.management.JMException;
-import javax.management.MBeanOperationInfo;
-import javax.management.openmbean.TabularData;
-
-import org.apache.qpid.server.management.MBeanAttribute;
-import org.apache.qpid.server.management.MBeanOperation;
-import org.apache.qpid.server.management.MBeanOperationParameter;
-import org.apache.qpid.server.queue.ManagedQueue;
-
-/**
- * The management interface exposed to allow management of an Exchange.
- * @author  Robert J. Greig
- * @author  Bhupendra Bhardwaj
- * @version 0.1
- */
-public interface ManagedExchange
-{
-    static final String TYPE = "Exchange";
-
-    /**
-     * Returns the name of the managed exchange.
-     * @return the name of the exchange.
-     * @throws IOException
-     */
-    @MBeanAttribute(name="Name", description=TYPE + " Name")
-    String getName() throws IOException;
-
-    @MBeanAttribute(name="ExchangeType", description="Exchange Type")
-    String getExchangeType() throws IOException;
-
-    /**
-     * Tells if the exchange is durable or not.
-     * @return true if the exchange is durable.
-     * @throws IOException
-     */
-    @MBeanAttribute(name="Durable", description="true if Exchange is durable")
-    boolean isDurable() throws IOException;
-
-    /**
-     * Tells if the exchange is set for autodelete or not.
-     * @return true if the exchange is set as autodelete.
-     * @throws IOException
-     */
-    @MBeanAttribute(name="AutoDelete", description="true if Exchange is AutoDelete")
-    boolean isAutoDelete() throws IOException;
-
-    // Operations
-
-    /**
-     * Returns all the bindings this exchange has with the queues.
-     * @return  the bindings with the exchange.
-     * @throws IOException
-     * @throws JMException
-     */
-    @MBeanOperation(name="bindings", description="view the queue bindings for this exchange")
-    TabularData bindings() throws IOException, JMException;
-
-    /**
-     * Creates new binding with the given queue and binding.
-     * @param queueName
-     * @param binding
-     * @throws JMException
-     */
-    @MBeanOperation(name="createNewBinding",
-                    description="create a new binding with this exchange",
-                    impact= MBeanOperationInfo.ACTION)
-    void createNewBinding(@MBeanOperationParameter(name= ManagedQueue.TYPE, description="Queue name") String queueName,
-                          @MBeanOperationParameter(name="Binding", description="New binding")String binding)
-        throws JMException;
-
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/MessageRouter.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/MessageRouter.java
deleted file mode 100644
index 7508e80f7f..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/MessageRouter.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.exchange;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.server.queue.AMQMessage;
-
-/**
- * Separated out from the ExchangeRegistry interface to allow components
- * that use only this part to have a dependency with a reduced footprint.
- *
- */
-public interface MessageRouter
-{
-    /**
-     * Routes content through exchanges, delivering it to 1 or more queues.
-     * @param message the message to be routed
-     *
-     * @throws org.apache.qpid.AMQException if something goes wrong delivering data
-     */
-    void routeContent(AMQMessage message) throws AMQException;
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/NoRouteException.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/NoRouteException.java
deleted file mode 100644
index c787103c00..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/NoRouteException.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.exchange;
-
-import org.apache.qpid.protocol.AMQConstant;
-import org.apache.qpid.server.RequiredDeliveryException;
-import org.apache.qpid.server.queue.AMQMessage;
-
-/**
- * NoRouteException is a {@link RequiredDeliveryException} that represents the failure case where a manadatory message
- * cannot be delivered because there is no route for the message. The AMQP status code, 312, is always used to report
- * this condition.
- *
- * <p/><table id="crc"><caption>CRC Card</caption>
- * <tr><th> Responsibilities <th> Collaborations
- * <tr><td> Represent failure to deliver a message that must be delivered.
- * </table>
- */
-public class NoRouteException extends RequiredDeliveryException
-{
-    public NoRouteException(String msg, AMQMessage message, Throwable cause)
-    {
-        super(msg, message, cause);
-    }
-
-    public AMQConstant getReplyCode()
-    {
-        return AMQConstant.NO_ROUTE;
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/ArithmeticExpression.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/ArithmeticExpression.java
deleted file mode 100644
index fb5220f4da..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/ArithmeticExpression.java
+++ /dev/null
@@ -1,275 +0,0 @@
-/**
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.qpid.server.filter;
-//
-// Based on like named file from r450141 of the Apache ActiveMQ project <http://www.activemq.org/site/home.html>
-//
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.server.queue.AMQMessage;
-
-/**
- * An expression which performs an operation on two expression values
- */
-public abstract class ArithmeticExpression extends BinaryExpression
-{
-
-    protected static final int INTEGER = 1;
-    protected static final int LONG = 2;
-    protected static final int DOUBLE = 3;
-
-    /**
-     * @param left
-     * @param right
-     */
-    public ArithmeticExpression(Expression left, Expression right)
-    {
-        super(left, right);
-    }
-
-    public static Expression createPlus(Expression left, Expression right)
-    {
-        return new ArithmeticExpression(left, right)
-            {
-                protected Object evaluate(Object lvalue, Object rvalue)
-                {
-                    if (lvalue instanceof String)
-                    {
-                        String text = (String) lvalue;
-                        String answer = text + rvalue;
-
-                        return answer;
-                    }
-                    else if (lvalue instanceof Number)
-                    {
-                        return plus((Number) lvalue, asNumber(rvalue));
-                    }
-
-                    throw new RuntimeException("Cannot call plus operation on: " + lvalue + " and: " + rvalue);
-                }
-
-                public String getExpressionSymbol()
-                {
-                    return "+";
-                }
-            };
-    }
-
-    public static Expression createMinus(Expression left, Expression right)
-    {
-        return new ArithmeticExpression(left, right)
-            {
-                protected Object evaluate(Object lvalue, Object rvalue)
-                {
-                    if (lvalue instanceof Number)
-                    {
-                        return minus((Number) lvalue, asNumber(rvalue));
-                    }
-
-                    throw new RuntimeException("Cannot call minus operation on: " + lvalue + " and: " + rvalue);
-                }
-
-                public String getExpressionSymbol()
-                {
-                    return "-";
-                }
-            };
-    }
-
-    public static Expression createMultiply(Expression left, Expression right)
-    {
-        return new ArithmeticExpression(left, right)
-            {
-
-                protected Object evaluate(Object lvalue, Object rvalue)
-                {
-                    if (lvalue instanceof Number)
-                    {
-                        return multiply((Number) lvalue, asNumber(rvalue));
-                    }
-
-                    throw new RuntimeException("Cannot call multiply operation on: " + lvalue + " and: " + rvalue);
-                }
-
-                public String getExpressionSymbol()
-                {
-                    return "*";
-                }
-            };
-    }
-
-    public static Expression createDivide(Expression left, Expression right)
-    {
-        return new ArithmeticExpression(left, right)
-            {
-
-                protected Object evaluate(Object lvalue, Object rvalue)
-                {
-                    if (lvalue instanceof Number)
-                    {
-                        return divide((Number) lvalue, asNumber(rvalue));
-                    }
-
-                    throw new RuntimeException("Cannot call divide operation on: " + lvalue + " and: " + rvalue);
-                }
-
-                public String getExpressionSymbol()
-                {
-                    return "/";
-                }
-            };
-    }
-
-    public static Expression createMod(Expression left, Expression right)
-    {
-        return new ArithmeticExpression(left, right)
-            {
-
-                protected Object evaluate(Object lvalue, Object rvalue)
-                {
-                    if (lvalue instanceof Number)
-                    {
-                        return mod((Number) lvalue, asNumber(rvalue));
-                    }
-
-                    throw new RuntimeException("Cannot call mod operation on: " + lvalue + " and: " + rvalue);
-                }
-
-                public String getExpressionSymbol()
-                {
-                    return "%";
-                }
-            };
-    }
-
-    protected Number plus(Number left, Number right)
-    {
-        switch (numberType(left, right))
-        {
-
-        case INTEGER:
-            return new Integer(left.intValue() + right.intValue());
-
-        case LONG:
-            return new Long(left.longValue() + right.longValue());
-
-        default:
-            return new Double(left.doubleValue() + right.doubleValue());
-        }
-    }
-
-    protected Number minus(Number left, Number right)
-    {
-        switch (numberType(left, right))
-        {
-
-        case INTEGER:
-            return new Integer(left.intValue() - right.intValue());
-
-        case LONG:
-            return new Long(left.longValue() - right.longValue());
-
-        default:
-            return new Double(left.doubleValue() - right.doubleValue());
-        }
-    }
-
-    protected Number multiply(Number left, Number right)
-    {
-        switch (numberType(left, right))
-        {
-
-        case INTEGER:
-            return new Integer(left.intValue() * right.intValue());
-
-        case LONG:
-            return new Long(left.longValue() * right.longValue());
-
-        default:
-            return new Double(left.doubleValue() * right.doubleValue());
-        }
-    }
-
-    protected Number divide(Number left, Number right)
-    {
-        return new Double(left.doubleValue() / right.doubleValue());
-    }
-
-    protected Number mod(Number left, Number right)
-    {
-        return new Double(left.doubleValue() % right.doubleValue());
-    }
-
-    private int numberType(Number left, Number right)
-    {
-        if (isDouble(left) || isDouble(right))
-        {
-            return DOUBLE;
-        }
-        else if ((left instanceof Long) || (right instanceof Long))
-        {
-            return LONG;
-        }
-        else
-        {
-            return INTEGER;
-        }
-    }
-
-    private boolean isDouble(Number n)
-    {
-        return (n instanceof Float) || (n instanceof Double);
-    }
-
-    protected Number asNumber(Object value)
-    {
-        if (value instanceof Number)
-        {
-            return (Number) value;
-        }
-        else
-        {
-            throw new RuntimeException("Cannot convert value: " + value + " into a number");
-        }
-    }
-
-    public Object evaluate(AMQMessage message) throws AMQException
-    {
-        Object lvalue = left.evaluate(message);
-        if (lvalue == null)
-        {
-            return null;
-        }
-
-        Object rvalue = right.evaluate(message);
-        if (rvalue == null)
-        {
-            return null;
-        }
-
-        return evaluate(lvalue, rvalue);
-    }
-
-    /**
-     * @param lvalue
-     * @param rvalue
-     * @return
-     */
-    protected abstract Object evaluate(Object lvalue, Object rvalue);
-
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/BinaryExpression.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/BinaryExpression.java
deleted file mode 100644
index 024257bea9..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/BinaryExpression.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/**
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.qpid.server.filter;
-//
-// Based on like named file from r450141 of the Apache ActiveMQ project <http://www.activemq.org/site/home.html>
-//
-
-/**
- * An expression which performs an operation on two expression values.
- */
-public abstract class BinaryExpression implements Expression
-{
-    protected Expression left;
-    protected Expression right;
-
-    public BinaryExpression(Expression left, Expression right)
-    {
-        this.left = left;
-        this.right = right;
-    }
-
-    public Expression getLeft()
-    {
-        return left;
-    }
-
-    public Expression getRight()
-    {
-        return right;
-    }
-
-    /**
-     * @see java.lang.Object#toString()
-     */
-    public String toString()
-    {
-        return "(" + left.toString() + " " + getExpressionSymbol() + " " + right.toString() + ")";
-    }
-
-    /**
-     * TODO: more efficient hashCode()
-     *
-     * @see java.lang.Object#hashCode()
-     */
-    public int hashCode()
-    {
-        return toString().hashCode();
-    }
-
-    /**
-     * TODO: more efficient hashCode()
-     *
-     * @see java.lang.Object#equals(java.lang.Object)
-     */
-    public boolean equals(Object o)
-    {
-
-        if ((o == null) || !this.getClass().equals(o.getClass()))
-        {
-            return false;
-        }
-
-        return toString().equals(o.toString());
-
-    }
-
-    /**
-     * Returns the symbol that represents this binary expression.  For example, addition is
-     * represented by "+"
-     *
-     * @return
-     */
-    public abstract String getExpressionSymbol();
-
-    /**
-     * @param expression
-     */
-    public void setRight(Expression expression)
-    {
-        right = expression;
-    }
-
-    /**
-     * @param expression
-     */
-    public void setLeft(Expression expression)
-    {
-        left = expression;
-    }
-
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/BooleanExpression.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/BooleanExpression.java
deleted file mode 100644
index e28ff79820..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/BooleanExpression.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.qpid.server.filter;
-//
-// Based on like named file from r450141 of the Apache ActiveMQ project <http://www.activemq.org/site/home.html>
-//
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.server.queue.AMQMessage;
-
-/**
- * A BooleanExpression is an expression that always
- * produces a Boolean result.
- */
-public interface BooleanExpression extends Expression
-{
-
-    /**
-     * @param message
-     * @return true if the expression evaluates to Boolean.TRUE.
-     * @throws AMQException
-     */
-    public boolean matches(AMQMessage message) throws AMQException;
-
-}
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
deleted file mode 100644
index 72a9ef7969..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/ComparisonExpression.java
+++ /dev/null
@@ -1,595 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.filter;
-//
-// Based on like named file from r450141 of the Apache ActiveMQ project <http://www.activemq.org/site/home.html>
-//
-
-import java.util.HashSet;
-import java.util.List;
-import java.util.regex.Pattern;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.server.queue.AMQMessage;
-
-/**
- * A filter performing a comparison of two objects
- */
-public abstract class ComparisonExpression extends BinaryExpression implements BooleanExpression
-{
-
-    public static BooleanExpression createBetween(Expression value, Expression left, Expression right)
-    {
-        return LogicExpression.createAND(createGreaterThanEqual(value, left), createLessThanEqual(value, right));
-    }
-
-    public static BooleanExpression createNotBetween(Expression value, Expression left, Expression right)
-    {
-        return LogicExpression.createOR(createLessThan(value, left), createGreaterThan(value, right));
-    }
-
-    private static final HashSet REGEXP_CONTROL_CHARS = new HashSet();
-
-    static
-    {
-        REGEXP_CONTROL_CHARS.add(new Character('.'));
-        REGEXP_CONTROL_CHARS.add(new Character('\\'));
-        REGEXP_CONTROL_CHARS.add(new Character('['));
-        REGEXP_CONTROL_CHARS.add(new Character(']'));
-        REGEXP_CONTROL_CHARS.add(new Character('^'));
-        REGEXP_CONTROL_CHARS.add(new Character('$'));
-        REGEXP_CONTROL_CHARS.add(new Character('?'));
-        REGEXP_CONTROL_CHARS.add(new Character('*'));
-        REGEXP_CONTROL_CHARS.add(new Character('+'));
-        REGEXP_CONTROL_CHARS.add(new Character('{'));
-        REGEXP_CONTROL_CHARS.add(new Character('}'));
-        REGEXP_CONTROL_CHARS.add(new Character('|'));
-        REGEXP_CONTROL_CHARS.add(new Character('('));
-        REGEXP_CONTROL_CHARS.add(new Character(')'));
-        REGEXP_CONTROL_CHARS.add(new Character(':'));
-        REGEXP_CONTROL_CHARS.add(new Character('&'));
-        REGEXP_CONTROL_CHARS.add(new Character('<'));
-        REGEXP_CONTROL_CHARS.add(new Character('>'));
-        REGEXP_CONTROL_CHARS.add(new Character('='));
-        REGEXP_CONTROL_CHARS.add(new Character('!'));
-    }
-
-    static class LikeExpression extends UnaryExpression implements BooleanExpression
-    {
-
-        Pattern likePattern;
-
-        /**
-         * @param right
-         */
-        public LikeExpression(Expression right, String like, int escape)
-        {
-            super(right);
-
-            StringBuffer regexp = new StringBuffer(like.length() * 2);
-            regexp.append("\\A"); // The beginning of the input
-            for (int i = 0; i < like.length(); i++)
-            {
-                char c = like.charAt(i);
-                if (escape == (0xFFFF & c))
-                {
-                    i++;
-                    if (i >= like.length())
-                    {
-                        // nothing left to escape...
-                        break;
-                    }
-
-                    char t = like.charAt(i);
-                    regexp.append("\\x");
-                    regexp.append(Integer.toHexString(0xFFFF & t));
-                }
-                else if (c == '%')
-                {
-                    regexp.append(".*?"); // Do a non-greedy match
-                }
-                else if (c == '_')
-                {
-                    regexp.append("."); // match one
-                }
-                else if (REGEXP_CONTROL_CHARS.contains(new Character(c)))
-                {
-                    regexp.append("\\x");
-                    regexp.append(Integer.toHexString(0xFFFF & c));
-                }
-                else
-                {
-                    regexp.append(c);
-                }
-            }
-
-            regexp.append("\\z"); // The end of the input
-
-            likePattern = Pattern.compile(regexp.toString(), Pattern.DOTALL);
-        }
-
-        /**
-         *  org.apache.activemq.filter.UnaryExpression#getExpressionSymbol()
-         */
-        public String getExpressionSymbol()
-        {
-            return "LIKE";
-        }
-
-        /**
-         *  org.apache.activemq.filter.Expression#evaluate(MessageEvaluationContext)
-         */
-        public Object evaluate(AMQMessage message) throws AMQException
-        {
-
-            Object rv = this.getRight().evaluate(message);
-
-            if (rv == null)
-            {
-                return null;
-            }
-
-            if (!(rv instanceof String))
-            {
-                return
-                    Boolean.FALSE;
-                    // throw new RuntimeException("LIKE can only operate on String identifiers.  LIKE attemped on: '" + rv.getClass());
-            }
-
-            return likePattern.matcher((String) rv).matches() ? Boolean.TRUE : Boolean.FALSE;
-        }
-
-        public boolean matches(AMQMessage message) throws AMQException
-        {
-            Object object = evaluate(message);
-
-            return (object != null) && (object == Boolean.TRUE);
-        }
-    }
-
-    public static BooleanExpression createLike(Expression left, String right, String escape)
-    {
-        if ((escape != null) && (escape.length() != 1))
-        {
-            throw new RuntimeException(
-                "The ESCAPE string litteral is invalid.  It can only be one character.  Litteral used: " + escape);
-        }
-
-        int c = -1;
-        if (escape != null)
-        {
-            c = 0xFFFF & escape.charAt(0);
-        }
-
-        return new LikeExpression(left, right, c);
-    }
-
-    public static BooleanExpression createNotLike(Expression left, String right, String escape)
-    {
-        return UnaryExpression.createNOT(createLike(left, right, escape));
-    }
-
-    public static BooleanExpression createInFilter(Expression left, List elements)
-    {
-
-        if (!(left instanceof PropertyExpression))
-        {
-            throw new RuntimeException("Expected a property for In expression, got: " + left);
-        }
-
-        return UnaryExpression.createInExpression((PropertyExpression) left, elements, false);
-
-    }
-
-    public static BooleanExpression createNotInFilter(Expression left, List elements)
-    {
-
-        if (!(left instanceof PropertyExpression))
-        {
-            throw new RuntimeException("Expected a property for In expression, got: " + left);
-        }
-
-        return UnaryExpression.createInExpression((PropertyExpression) left, elements, true);
-
-    }
-
-    public static BooleanExpression createIsNull(Expression left)
-    {
-        return doCreateEqual(left, ConstantExpression.NULL);
-    }
-
-    public static BooleanExpression createIsNotNull(Expression left)
-    {
-        return UnaryExpression.createNOT(doCreateEqual(left, ConstantExpression.NULL));
-    }
-
-    public static BooleanExpression createNotEqual(Expression left, Expression right)
-    {
-        return UnaryExpression.createNOT(createEqual(left, right));
-    }
-
-    public static BooleanExpression createEqual(Expression left, Expression right)
-    {
-        checkEqualOperand(left);
-        checkEqualOperand(right);
-        checkEqualOperandCompatability(left, right);
-
-        return doCreateEqual(left, right);
-    }
-
-    private static BooleanExpression doCreateEqual(Expression left, Expression right)
-    {
-        return new ComparisonExpression(left, right)
-            {
-
-                public Object evaluate(AMQMessage message) throws AMQException
-                {
-                    Object lv = left.evaluate(message);
-                    Object rv = right.evaluate(message);
-
-                    // Iff one of the values is null
-                    if ((lv == null) ^ (rv == null))
-                    {
-                        return Boolean.FALSE;
-                    }
-
-                    if ((lv == rv) || lv.equals(rv))
-                    {
-                        return Boolean.TRUE;
-                    }
-
-                    if ((lv instanceof Comparable) && (rv instanceof Comparable))
-                    {
-                        return compare((Comparable) lv, (Comparable) rv);
-                    }
-
-                    return Boolean.FALSE;
-                }
-
-                protected boolean asBoolean(int answer)
-                {
-                    return answer == 0;
-                }
-
-                public String getExpressionSymbol()
-                {
-                    return "=";
-                }
-            };
-    }
-
-    public static BooleanExpression createGreaterThan(final Expression left, final Expression right)
-    {
-        checkLessThanOperand(left);
-        checkLessThanOperand(right);
-
-        return new ComparisonExpression(left, right)
-            {
-                protected boolean asBoolean(int answer)
-                {
-                    return answer > 0;
-                }
-
-                public String getExpressionSymbol()
-                {
-                    return ">";
-                }
-            };
-    }
-
-    public static BooleanExpression createGreaterThanEqual(final Expression left, final Expression right)
-    {
-        checkLessThanOperand(left);
-        checkLessThanOperand(right);
-
-        return new ComparisonExpression(left, right)
-            {
-                protected boolean asBoolean(int answer)
-                {
-                    return answer >= 0;
-                }
-
-                public String getExpressionSymbol()
-                {
-                    return ">=";
-                }
-            };
-    }
-
-    public static BooleanExpression createLessThan(final Expression left, final Expression right)
-    {
-        checkLessThanOperand(left);
-        checkLessThanOperand(right);
-
-        return new ComparisonExpression(left, right)
-            {
-
-                protected boolean asBoolean(int answer)
-                {
-                    return answer < 0;
-                }
-
-                public String getExpressionSymbol()
-                {
-                    return "<";
-                }
-
-            };
-    }
-
-    public static BooleanExpression createLessThanEqual(final Expression left, final Expression right)
-    {
-        checkLessThanOperand(left);
-        checkLessThanOperand(right);
-
-        return new ComparisonExpression(left, right)
-            {
-
-                protected boolean asBoolean(int answer)
-                {
-                    return answer <= 0;
-                }
-
-                public String getExpressionSymbol()
-                {
-                    return "<=";
-                }
-            };
-    }
-
-    /**
-     * Only Numeric expressions can be used in >, >=, < or <= expressions.s
-     *
-     * @param expr
-     */
-    public static void checkLessThanOperand(Expression expr)
-    {
-        if (expr instanceof ConstantExpression)
-        {
-            Object value = ((ConstantExpression) expr).getValue();
-            if (value instanceof Number)
-            {
-                return;
-            }
-
-            // Else it's boolean or a String..
-            throw new RuntimeException("Value '" + expr + "' cannot be compared.");
-        }
-
-        if (expr instanceof BooleanExpression)
-        {
-            throw new RuntimeException("Value '" + expr + "' cannot be compared.");
-        }
-    }
-
-    /**
-     * Validates that the expression can be used in == or <> expression.
-     * Cannot not be NULL TRUE or FALSE litterals.
-     *
-     * @param expr
-     */
-    public static void checkEqualOperand(Expression expr)
-    {
-        if (expr instanceof ConstantExpression)
-        {
-            Object value = ((ConstantExpression) expr).getValue();
-            if (value == null)
-            {
-                throw new RuntimeException("'" + expr + "' cannot be compared.");
-            }
-        }
-    }
-
-    /**
-     *
-     * @param left
-     * @param right
-     */
-    private static void checkEqualOperandCompatability(Expression left, Expression right)
-    {
-        if ((left instanceof ConstantExpression) && (right instanceof ConstantExpression))
-        {
-            if ((left instanceof BooleanExpression) && !(right instanceof BooleanExpression))
-            {
-                throw new RuntimeException("'" + left + "' cannot be compared with '" + right + "'");
-            }
-        }
-    }
-
-    /**
-     * @param left
-     * @param right
-     */
-    public ComparisonExpression(Expression left, Expression right)
-    {
-        super(left, right);
-    }
-
-    public Object evaluate(AMQMessage message) throws AMQException
-    {
-        Comparable lv = (Comparable) left.evaluate(message);
-        if (lv == null)
-        {
-            return null;
-        }
-
-        Comparable rv = (Comparable) right.evaluate(message);
-        if (rv == null)
-        {
-            return null;
-        }
-
-        return compare(lv, rv);
-    }
-
-    protected Boolean compare(Comparable lv, Comparable rv)
-    {
-        Class lc = lv.getClass();
-        Class rc = rv.getClass();
-        // If the the objects are not of the same type,
-        // try to convert up to allow the comparison.
-        if (lc != rc)
-        {
-            if (lc == Byte.class)
-            {
-                if (rc == Short.class)
-                {
-                    lv = new Short(((Number) lv).shortValue());
-                }
-                else if (rc == Integer.class)
-                {
-                    lv = new Integer(((Number) lv).intValue());
-                }
-                else if (rc == Long.class)
-                {
-                    lv = new Long(((Number) lv).longValue());
-                }
-                else if (rc == Float.class)
-                {
-                    lv = new Float(((Number) lv).floatValue());
-                }
-                else if (rc == Double.class)
-                {
-                    lv = new Double(((Number) lv).doubleValue());
-                }
-                else
-                {
-                    return Boolean.FALSE;
-                }
-            }
-            else if (lc == Short.class)
-            {
-                if (rc == Integer.class)
-                {
-                    lv = new Integer(((Number) lv).intValue());
-                }
-                else if (rc == Long.class)
-                {
-                    lv = new Long(((Number) lv).longValue());
-                }
-                else if (rc == Float.class)
-                {
-                    lv = new Float(((Number) lv).floatValue());
-                }
-                else if (rc == Double.class)
-                {
-                    lv = new Double(((Number) lv).doubleValue());
-                }
-                else
-                {
-                    return Boolean.FALSE;
-                }
-            }
-            else if (lc == Integer.class)
-            {
-                if (rc == Long.class)
-                {
-                    lv = new Long(((Number) lv).longValue());
-                }
-                else if (rc == Float.class)
-                {
-                    lv = new Float(((Number) lv).floatValue());
-                }
-                else if (rc == Double.class)
-                {
-                    lv = new Double(((Number) lv).doubleValue());
-                }
-                else
-                {
-                    return Boolean.FALSE;
-                }
-            }
-            else if (lc == Long.class)
-            {
-                if (rc == Integer.class)
-                {
-                    rv = new Long(((Number) rv).longValue());
-                }
-                else if (rc == Float.class)
-                {
-                    lv = new Float(((Number) lv).floatValue());
-                }
-                else if (rc == Double.class)
-                {
-                    lv = new Double(((Number) lv).doubleValue());
-                }
-                else
-                {
-                    return Boolean.FALSE;
-                }
-            }
-            else if (lc == Float.class)
-            {
-                if (rc == Integer.class)
-                {
-                    rv = new Float(((Number) rv).floatValue());
-                }
-                else if (rc == Long.class)
-                {
-                    rv = new Float(((Number) rv).floatValue());
-                }
-                else if (rc == Double.class)
-                {
-                    lv = new Double(((Number) lv).doubleValue());
-                }
-                else
-                {
-                    return Boolean.FALSE;
-                }
-            }
-            else if (lc == Double.class)
-            {
-                if (rc == Integer.class)
-                {
-                    rv = new Double(((Number) rv).doubleValue());
-                }
-                else if (rc == Long.class)
-                {
-                    rv = new Double(((Number) rv).doubleValue());
-                }
-                else if (rc == Float.class)
-                {
-                    rv = new Float(((Number) rv).doubleValue());
-                }
-                else
-                {
-                    return Boolean.FALSE;
-                }
-            }
-            else
-            {
-                return Boolean.FALSE;
-            }
-        }
-
-        return asBoolean(lv.compareTo(rv)) ? Boolean.TRUE : Boolean.FALSE;
-    }
-
-    protected abstract boolean asBoolean(int answer);
-
-    public boolean matches(AMQMessage message) throws AMQException
-    {
-        Object object = evaluate(message);
-
-        return (object != null) && (object == Boolean.TRUE);
-    }
-
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/ConstantExpression.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/ConstantExpression.java
deleted file mode 100644
index 0e729cc521..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/ConstantExpression.java
+++ /dev/null
@@ -1,210 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.filter;
-//
-// Based on like named file from r450141 of the Apache ActiveMQ project <http://www.activemq.org/site/home.html>
-//
-
-import java.math.BigDecimal;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.server.queue.AMQMessage;
-
-/**
- * Represents a constant expression
- */
-public class ConstantExpression implements Expression
-{
-
-    static class BooleanConstantExpression extends ConstantExpression implements BooleanExpression
-    {
-        public BooleanConstantExpression(Object value)
-        {
-            super(value);
-        }
-
-        public boolean matches(AMQMessage message) throws AMQException
-        {
-            Object object = evaluate(message);
-
-            return (object != null) && (object == Boolean.TRUE);
-        }
-    }
-
-    public static final BooleanConstantExpression NULL = new BooleanConstantExpression(null);
-    public static final BooleanConstantExpression TRUE = new BooleanConstantExpression(Boolean.TRUE);
-    public static final BooleanConstantExpression FALSE = new BooleanConstantExpression(Boolean.FALSE);
-
-    private Object value;
-
-    public static ConstantExpression createFromDecimal(String text)
-    {
-
-        // Strip off the 'l' or 'L' if needed.
-        if (text.endsWith("l") || text.endsWith("L"))
-        {
-            text = text.substring(0, text.length() - 1);
-        }
-
-        Number value;
-        try
-        {
-            value = new Long(text);
-        }
-        catch (NumberFormatException e)
-        {
-            // The number may be too big to fit in a long.
-            value = new BigDecimal(text);
-        }
-
-        long l = value.longValue();
-        if ((Integer.MIN_VALUE <= l) && (l <= Integer.MAX_VALUE))
-        {
-            value = new Integer(value.intValue());
-        }
-
-        return new ConstantExpression(value);
-    }
-
-    public static ConstantExpression createFromHex(String text)
-    {
-        Number value = new Long(Long.parseLong(text.substring(2), 16));
-        long l = value.longValue();
-        if ((Integer.MIN_VALUE <= l) && (l <= Integer.MAX_VALUE))
-        {
-            value = new Integer(value.intValue());
-        }
-
-        return new ConstantExpression(value);
-    }
-
-    public static ConstantExpression createFromOctal(String text)
-    {
-        Number value = new Long(Long.parseLong(text, 8));
-        long l = value.longValue();
-        if ((Integer.MIN_VALUE <= l) && (l <= Integer.MAX_VALUE))
-        {
-            value = new Integer(value.intValue());
-        }
-
-        return new ConstantExpression(value);
-    }
-
-    public static ConstantExpression createFloat(String text)
-    {
-        Number value = new Double(text);
-
-        return new ConstantExpression(value);
-    }
-
-    public ConstantExpression(Object value)
-    {
-        this.value = value;
-    }
-
-    public Object evaluate(AMQMessage message) throws AMQException
-    {
-        return value;
-    }
-
-    public Object getValue()
-    {
-        return value;
-    }
-
-    /**
-     * @see java.lang.Object#toString()
-     */
-    public String toString()
-    {
-        if (value == null)
-        {
-            return "NULL";
-        }
-
-        if (value instanceof Boolean)
-        {
-            return ((Boolean) value).booleanValue() ? "TRUE" : "FALSE";
-        }
-
-        if (value instanceof String)
-        {
-            return encodeString((String) value);
-        }
-
-        return value.toString();
-    }
-
-    /**
-     * TODO: more efficient hashCode()
-     *
-     * @see java.lang.Object#hashCode()
-     */
-    public int hashCode()
-    {
-        return toString().hashCode();
-    }
-
-    /**
-     * TODO: more efficient hashCode()
-     *
-     * @see java.lang.Object#equals(java.lang.Object)
-     */
-    public boolean equals(Object o)
-    {
-
-        if ((o == null) || !this.getClass().equals(o.getClass()))
-        {
-            return false;
-        }
-
-        return toString().equals(o.toString());
-
-    }
-
-    /**
-     * Encodes the value of string so that it looks like it would look like
-     * when it was provided in a selector.
-     *
-     * @param s
-     * @return
-     */
-    public static String encodeString(String s)
-    {
-        StringBuffer b = new StringBuffer();
-        b.append('\'');
-        for (int i = 0; i < s.length(); i++)
-        {
-            char c = s.charAt(i);
-            if (c == '\'')
-            {
-                b.append(c);
-            }
-
-            b.append(c);
-        }
-
-        b.append('\'');
-
-        return b.toString();
-    }
-
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/Expression.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/Expression.java
deleted file mode 100644
index 5f646c15db..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/Expression.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/**
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.qpid.server.filter;
-//
-// Based on like named file from r450141 of the Apache ActiveMQ project <http://www.activemq.org/site/home.html>
-//
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.server.queue.AMQMessage;
-
-/**
- * Represents an expression
- */
-public interface Expression
-{
-
-    /**
-     * @return the value of this expression
-     */
-    public Object evaluate(AMQMessage message) throws AMQException;
-
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/FilterManager.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/FilterManager.java
deleted file mode 100644
index c82de9fa15..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/FilterManager.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.    
- *
- * 
- */
-package org.apache.qpid.server.filter;
-//
-// Based on like named file from r450141 of the Apache ActiveMQ project <http://www.activemq.org/site/home.html>
-//
-
-import org.apache.qpid.server.queue.AMQMessage;
-
-public interface FilterManager
-{
-    void add(MessageFilter filter);
-
-    void remove(MessageFilter filter);
-
-    boolean allAllow(AMQMessage msg);
-
-    boolean hasFilters();
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/FilterManagerFactory.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/FilterManagerFactory.java
deleted file mode 100644
index 311f0680ec..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/FilterManagerFactory.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.    
- *
- * 
- */
-package org.apache.qpid.server.filter;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.common.AMQPFilterTypes;
-import org.apache.qpid.framing.FieldTable;
-
-
-public class FilterManagerFactory
-{
-    //private final static Logger _logger = LoggerFactory.getLogger(FilterManagerFactory.class);
-    private final static org.apache.log4j.Logger _logger = org.apache.log4j.Logger.getLogger(FilterManagerFactory.class);
-
-    //fixme move to a common class so it can be refered to from client code.
-
-    public static FilterManager createManager(FieldTable filters) throws AMQException
-    {
-        FilterManager manager = null;
-
-        if (filters != null)
-        {
-
-            manager = new SimpleFilterManager();
-
-            if(filters.containsKey(AMQPFilterTypes.JMS_SELECTOR.getValue()))
-            {
-                String selector =  filters.getString(AMQPFilterTypes.JMS_SELECTOR.getValue());
-
-                if (selector != null && !selector.equals(""))
-                {
-                    manager.add(new JMSSelectorFilter(selector));
-                }
-
-            }
-
-            if (filters.containsKey(AMQPFilterTypes.NO_CONSUME.getValue()))
-            {
-                manager.add(new NoConsumerFilter());
-            }
-
-
-
-            //If we added no filters don't bear the overhead of having an filter manager
-            if (!manager.hasFilters())
-            {
-                manager = null;
-            }
-        }
-        else
-        {
-            _logger.debug("No Filters found.");
-        }
-
-
-        return manager;
-
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/JMSSelectorFilter.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/JMSSelectorFilter.java
deleted file mode 100644
index 2061803d65..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/JMSSelectorFilter.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.    
- *
- * 
- */
-package org.apache.qpid.server.filter;
-
-import org.apache.log4j.Logger;
-import org.apache.qpid.AMQException;
-import org.apache.qpid.server.filter.jms.selector.SelectorParser;
-import org.apache.qpid.server.queue.AMQMessage;
-
-
-
-public class JMSSelectorFilter implements MessageFilter
-{
-    private final static Logger _logger = org.apache.log4j.Logger.getLogger(JMSSelectorFilter.class);
-
-    private String _selector;
-    private BooleanExpression _matcher;
-
-    public JMSSelectorFilter(String selector) throws AMQException
-    {
-        _selector = selector;
-        _logger.info("Created JMSSelectorFilter with selector:" + _selector);
-
-
-        _matcher = new SelectorParser().parse(selector);
-
-
-    }
-
-    public boolean matches(AMQMessage message)
-    {
-        try
-        {
-            boolean match = _matcher.matches(message);
-            _logger.info(message + " match(" + match + ") selector(" + System.identityHashCode(_selector) + "):" + _selector);
-            return match;
-        }
-        catch (AMQException e)
-        {
-            //fixme this needs to be sorted.. it shouldn't happen
-            e.printStackTrace();  //To change body of catch statement use File | Settings | File Templates.
-        }
-        return false;
-    }
-
-    public String getSelector()
-    {
-        return _selector;
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/LogicExpression.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/LogicExpression.java
deleted file mode 100644
index c8cbdb2125..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/LogicExpression.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/**
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.qpid.server.filter;
-//
-// Based on like named file from r450141 of the Apache ActiveMQ project <http://www.activemq.org/site/home.html>
-//
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.server.queue.AMQMessage;
-
-/**
- * A filter performing a comparison of two objects
- */
-public abstract class LogicExpression extends BinaryExpression implements BooleanExpression
-{
-
-    public static BooleanExpression createOR(BooleanExpression lvalue, BooleanExpression rvalue)
-    {
-        return new LogicExpression(lvalue, rvalue)
-            {
-
-                public Object evaluate(AMQMessage message) throws AMQException
-                {
-
-                    Boolean lv = (Boolean) left.evaluate(message);
-                    // Can we do an OR shortcut??
-                    if ((lv != null) && lv.booleanValue())
-                    {
-                        return Boolean.TRUE;
-                    }
-
-                    Boolean rv = (Boolean) right.evaluate(message);
-
-                    return (rv == null) ? null : rv;
-                }
-
-                public String getExpressionSymbol()
-                {
-                    return "OR";
-                }
-            };
-    }
-
-    public static BooleanExpression createAND(BooleanExpression lvalue, BooleanExpression rvalue)
-    {
-        return new LogicExpression(lvalue, rvalue)
-            {
-
-                public Object evaluate(AMQMessage message) throws AMQException
-                {
-
-                    Boolean lv = (Boolean) left.evaluate(message);
-
-                    // Can we do an AND shortcut??
-                    if (lv == null)
-                    {
-                        return null;
-                    }
-
-                    if (!lv.booleanValue())
-                    {
-                        return Boolean.FALSE;
-                    }
-
-                    Boolean rv = (Boolean) right.evaluate(message);
-
-                    return (rv == null) ? null : rv;
-                }
-
-                public String getExpressionSymbol()
-                {
-                    return "AND";
-                }
-            };
-    }
-
-    /**
-     * @param left
-     * @param right
-     */
-    public LogicExpression(BooleanExpression left, BooleanExpression right)
-    {
-        super(left, right);
-    }
-
-    public abstract Object evaluate(AMQMessage message) throws AMQException;
-
-    public boolean matches(AMQMessage message) throws AMQException
-    {
-        Object object = evaluate(message);
-
-        return (object != null) && (object == Boolean.TRUE);
-    }
-
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/MessageFilter.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/MessageFilter.java
deleted file mode 100644
index e6bfe974d5..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/MessageFilter.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.    
- *
- * 
- */
-package org.apache.qpid.server.filter;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.server.queue.AMQMessage;
-
-public interface MessageFilter
-{
-    boolean matches(AMQMessage message) throws AMQException;
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/NoConsumerFilter.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/NoConsumerFilter.java
deleted file mode 100644
index 47ca930d12..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/NoConsumerFilter.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- *
- *
- */
-package org.apache.qpid.server.filter;
-
-import org.apache.log4j.Logger;
-import org.apache.qpid.AMQException;
-import org.apache.qpid.server.queue.AMQMessage;
-
-public class NoConsumerFilter implements MessageFilter
-{
-    private final static Logger _logger = org.apache.log4j.Logger.getLogger(NoConsumerFilter.class);
-
-
-    public NoConsumerFilter() throws AMQException
-    {
-        _logger.info("Created NoConsumerFilter");
-    }
-
-    public boolean matches(AMQMessage message)
-    {
-       return true;
-    }
-
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/PropertyExpression.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/PropertyExpression.java
deleted file mode 100644
index 5ab360ca19..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/PropertyExpression.java
+++ /dev/null
@@ -1,322 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.filter;
-//
-// Based on like named file from r450141 of the Apache ActiveMQ project <http://www.activemq.org/site/home.html>
-//
-
-import java.util.HashMap;
-
-import org.apache.log4j.Logger;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.framing.CommonContentHeaderProperties;
-import org.apache.qpid.server.queue.AMQMessage;
-
-/**
- * Represents a property  expression
- */
-public class PropertyExpression implements Expression
-{
-    // Constants - defined the same as JMS
-    private static final int NON_PERSISTENT = 1;
-    private static final int PERSISTENT = 2;
-    private static final int DEFAULT_PRIORITY = 4;
-
-    private static final Logger _logger = org.apache.log4j.Logger.getLogger(PropertyExpression.class);
-
-    private static final HashMap<String, Expression> JMS_PROPERTY_EXPRESSIONS = new HashMap<String, Expression>();
-
-    static
-    {
-        JMS_PROPERTY_EXPRESSIONS.put("JMSDestination", new Expression()
-                                     {
-                                         public Object evaluate(AMQMessage message)
-                                         {
-                                             //TODO
-                                             return null;
-                                         }
-                                     });
-        JMS_PROPERTY_EXPRESSIONS.put("JMSReplyTo", new Expression()
-                                     {
-                                         public Object evaluate(AMQMessage message)
-                                         {
-                                             try
-                                             {
-                                                 CommonContentHeaderProperties _properties =
-                                                     (CommonContentHeaderProperties)
-                                                         message.getContentHeaderBody().properties;
-                                                 AMQShortString replyTo = _properties.getReplyTo();
-
-                                                 return (replyTo == null) ? null : replyTo.toString();
-                                             }
-                                             catch (AMQException e)
-                                             {
-                                                 _logger.warn(e);
-
-                                                 return null;
-                                             }
-
-                                         }
-
-                                     });
-
-        JMS_PROPERTY_EXPRESSIONS.put("JMSType", new Expression()
-                                     {
-                                         public Object evaluate(AMQMessage message)
-                                         {
-                                             try
-                                             {
-                                                 CommonContentHeaderProperties _properties =
-                                                     (CommonContentHeaderProperties)
-                                                         message.getContentHeaderBody().properties;
-                                                 AMQShortString type = _properties.getType();
-
-                                                 return (type == null) ? null : type.toString();
-                                             }
-                                             catch (AMQException e)
-                                             {
-                                                 _logger.warn(e);
-
-                                                 return null;
-                                             }
-
-                                         }
-                                     });
-
-        JMS_PROPERTY_EXPRESSIONS.put("JMSDeliveryMode", new Expression()
-                                     {
-                                         public Object evaluate(AMQMessage message)
-                                         {
-                                             try
-                                             {
-                                                 int mode = message.isPersistent() ? PERSISTENT : NON_PERSISTENT;
-                                                 if (_logger.isDebugEnabled())
-                                                 {
-                                                     _logger.debug("JMSDeliveryMode is :" + mode);
-                                                 }
-
-                                                 return mode;
-                                             }
-                                             catch (AMQException e)
-                                             {
-                                                 _logger.warn(e);
-                                             }
-
-                                             return NON_PERSISTENT;
-                                         }
-                                     });
-
-        JMS_PROPERTY_EXPRESSIONS.put("JMSPriority", new Expression()
-                                     {
-                                         public Object evaluate(AMQMessage message)
-                                         {
-                                             try
-                                             {
-                                                 CommonContentHeaderProperties _properties =
-                                                     (CommonContentHeaderProperties)
-                                                         message.getContentHeaderBody().properties;
-
-                                                 return (int) _properties.getPriority();
-                                             }
-                                             catch (AMQException e)
-                                             {
-                                                 _logger.warn(e);
-                                             }
-
-                                             return DEFAULT_PRIORITY;
-                                         }
-                                     });
-
-        JMS_PROPERTY_EXPRESSIONS.put("AMQMessageID", new Expression()
-                                     {
-                                         public Object evaluate(AMQMessage message)
-                                         {
-
-                                             try
-                                             {
-                                                 CommonContentHeaderProperties _properties =
-                                                     (CommonContentHeaderProperties)
-                                                         message.getContentHeaderBody().properties;
-                                                 AMQShortString messageId = _properties.getMessageId();
-
-                                                 return (messageId == null) ? null : messageId;
-                                             }
-                                             catch (AMQException e)
-                                             {
-                                                 _logger.warn(e);
-
-                                                 return null;
-                                             }
-
-                                         }
-                                     });
-
-        JMS_PROPERTY_EXPRESSIONS.put("JMSTimestamp", new Expression()
-                                     {
-                                         public Object evaluate(AMQMessage message)
-                                         {
-
-                                             try
-                                             {
-                                                 CommonContentHeaderProperties _properties =
-                                                     (CommonContentHeaderProperties)
-                                                         message.getContentHeaderBody().properties;
-
-                                                 return _properties.getTimestamp();
-                                             }
-                                             catch (AMQException e)
-                                             {
-                                                 _logger.warn(e);
-
-                                                 return null;
-                                             }
-
-                                         }
-                                     });
-
-        JMS_PROPERTY_EXPRESSIONS.put("JMSCorrelationID", new Expression()
-                                     {
-                                         public Object evaluate(AMQMessage message)
-                                         {
-
-                                             try
-                                             {
-                                                 CommonContentHeaderProperties _properties =
-                                                     (CommonContentHeaderProperties)
-                                                         message.getContentHeaderBody().properties;
-                                                 AMQShortString correlationId = _properties.getCorrelationId();
-
-                                                 return (correlationId == null) ? null : correlationId.toString();
-                                             }
-                                             catch (AMQException e)
-                                             {
-                                                 _logger.warn(e);
-
-                                                 return null;
-                                             }
-
-                                         }
-                                     });
-
-        JMS_PROPERTY_EXPRESSIONS.put("JMSExpiration", new Expression()
-                                     {
-                                         public Object evaluate(AMQMessage message)
-                                         {
-
-                                             try
-                                             {
-                                                 CommonContentHeaderProperties _properties =
-                                                     (CommonContentHeaderProperties)
-                                                         message.getContentHeaderBody().properties;
-
-                                                 return _properties.getExpiration();
-                                             }
-                                             catch (AMQException e)
-                                             {
-                                                 _logger.warn(e);
-
-                                                 return null;
-                                             }
-
-                                         }
-                                     });
-
-        JMS_PROPERTY_EXPRESSIONS.put("JMSRedelivered", new Expression()
-                                     {
-                                         public Object evaluate(AMQMessage message)
-                                         {
-                                             return message.isRedelivered();
-                                         }
-                                     });
-
-    }
-
-    private final String name;
-    private final Expression jmsPropertyExpression;
-
-    public PropertyExpression(String name)
-    {
-        this.name = name;
-        jmsPropertyExpression = JMS_PROPERTY_EXPRESSIONS.get(name);
-    }
-
-    public Object evaluate(AMQMessage message) throws AMQException
-    {
-
-        if (jmsPropertyExpression != null)
-        {
-            return jmsPropertyExpression.evaluate(message);
-        }
-        else
-        {
-
-            CommonContentHeaderProperties _properties =
-                (CommonContentHeaderProperties) message.getContentHeaderBody().properties;
-
-            if (_logger.isDebugEnabled())
-            {
-                _logger.debug("Looking up property:" + name);
-                _logger.debug("Properties are:" + _properties.getHeaders().keySet());
-            }
-
-            return _properties.getHeaders().getObject(name);
-        }
-    }
-
-    public String getName()
-    {
-        return name;
-    }
-
-    /**
-     * @see java.lang.Object#toString()
-     */
-    public String toString()
-    {
-        return name;
-    }
-
-    /**
-     * @see java.lang.Object#hashCode()
-     */
-    public int hashCode()
-    {
-        return name.hashCode();
-    }
-
-    /**
-     * @see java.lang.Object#equals(java.lang.Object)
-     */
-    public boolean equals(Object o)
-    {
-
-        if ((o == null) || !this.getClass().equals(o.getClass()))
-        {
-            return false;
-        }
-
-        return name.equals(((PropertyExpression) o).name);
-
-    }
-
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/SimpleFilterManager.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/SimpleFilterManager.java
deleted file mode 100644
index 62a45f5420..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/SimpleFilterManager.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.    
- *
- * 
- */
-package org.apache.qpid.server.filter;
-
-import java.util.concurrent.ConcurrentLinkedQueue;
-
-import org.apache.log4j.Logger;
-import org.apache.qpid.AMQException;
-import org.apache.qpid.server.queue.AMQMessage;
-
-public class SimpleFilterManager implements FilterManager
-{
-    private final Logger _logger = Logger.getLogger(SimpleFilterManager.class);
-
-    private final ConcurrentLinkedQueue<MessageFilter> _filters;
-
-    public SimpleFilterManager()
-    {
-        _logger.debug("Creating SimpleFilterManager");
-        _filters = new ConcurrentLinkedQueue<MessageFilter>();
-    }
-
-    public void add(MessageFilter filter)
-    {
-        _filters.add(filter);
-    }
-
-    public void remove(MessageFilter filter)
-    {
-        _filters.remove(filter);
-    }
-
-    public boolean allAllow(AMQMessage msg)
-    {
-        for (MessageFilter filter : _filters)
-        {
-            try
-            {
-                if (!filter.matches(msg))
-                {
-                    return false;
-                }
-            }
-            catch (AMQException e)
-            {
-                //fixme
-                e.printStackTrace();  
-                return false;
-            }
-        }
-        return true;
-    }
-
-    public boolean hasFilters()
-    {
-        return !_filters.isEmpty();
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/UnaryExpression.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/UnaryExpression.java
deleted file mode 100644
index 83b4ed5358..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/UnaryExpression.java
+++ /dev/null
@@ -1,337 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.filter;
-//
-// Based on like named file from r450141 of the Apache ActiveMQ project <http://www.activemq.org/site/home.html>
-//
-
-import java.math.BigDecimal;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.server.queue.AMQMessage;
-
-/**
- * An expression which performs an operation on two expression values
- */
-public abstract class UnaryExpression implements Expression
-{
-
-    private static final BigDecimal BD_LONG_MIN_VALUE = BigDecimal.valueOf(Long.MIN_VALUE);
-    protected Expression right;
-
-    public static Expression createNegate(Expression left)
-    {
-        return new UnaryExpression(left)
-        {
-            public Object evaluate(AMQMessage message) throws AMQException
-            {
-                Object rvalue = right.evaluate(message);
-                if (rvalue == null)
-                {
-                    return null;
-                }
-
-                if (rvalue instanceof Number)
-                {
-                    return negate((Number) rvalue);
-                }
-
-                return null;
-            }
-
-            public String getExpressionSymbol()
-            {
-                return "-";
-            }
-        };
-    }
-
-    public static BooleanExpression createInExpression(PropertyExpression right, List elements, final boolean not)
-    {
-
-        // Use a HashSet if there are many elements.
-        Collection t;
-        if (elements.size() == 0)
-        {
-            t = null;
-        }
-        else if (elements.size() < 5)
-        {
-            t = elements;
-        }
-        else
-        {
-            t = new HashSet(elements);
-        }
-
-        final Collection inList = t;
-
-        return new BooleanUnaryExpression(right)
-        {
-            public Object evaluate(AMQMessage message) throws AMQException
-            {
-
-                Object rvalue = right.evaluate(message);
-                if (rvalue == null)
-                {
-                    return null;
-                }
-
-                if (rvalue.getClass() != String.class)
-                {
-                    return null;
-                }
-
-                if (((inList != null) && inList.contains(rvalue)) ^ not)
-                {
-                    return Boolean.TRUE;
-                }
-                else
-                {
-                    return Boolean.FALSE;
-                }
-
-            }
-
-            public String toString()
-            {
-                StringBuffer answer = new StringBuffer();
-                answer.append(right);
-                answer.append(" ");
-                answer.append(getExpressionSymbol());
-                answer.append(" ( ");
-
-                int count = 0;
-                for (Iterator i = inList.iterator(); i.hasNext();)
-                {
-                    Object o = (Object) i.next();
-                    if (count != 0)
-                    {
-                        answer.append(", ");
-                    }
-
-                    answer.append(o);
-                    count++;
-                }
-
-                answer.append(" )");
-
-                return answer.toString();
-            }
-
-            public String getExpressionSymbol()
-            {
-                if (not)
-                {
-                    return "NOT IN";
-                }
-                else
-                {
-                    return "IN";
-                }
-            }
-        };
-    }
-
-    abstract static class BooleanUnaryExpression extends UnaryExpression implements BooleanExpression
-    {
-        public BooleanUnaryExpression(Expression left)
-        {
-            super(left);
-        }
-
-        public boolean matches(AMQMessage message) throws AMQException
-        {
-            Object object = evaluate(message);
-
-            return (object != null) && (object == Boolean.TRUE);
-        }
-    }
-    ;
-
-    public static BooleanExpression createNOT(BooleanExpression left)
-    {
-        return new BooleanUnaryExpression(left)
-        {
-            public Object evaluate(AMQMessage message) throws AMQException
-            {
-                Boolean lvalue = (Boolean) right.evaluate(message);
-                if (lvalue == null)
-                {
-                    return null;
-                }
-
-                return lvalue.booleanValue() ? Boolean.FALSE : Boolean.TRUE;
-            }
-
-            public String getExpressionSymbol()
-            {
-                return "NOT";
-            }
-        };
-    }
-
-    public static BooleanExpression createXPath(final String xpath)
-    {
-        return new XPathExpression(xpath);
-    }
-
-    public static BooleanExpression createXQuery(final String xpath)
-    {
-        return new XQueryExpression(xpath);
-    }
-
-    public static BooleanExpression createBooleanCast(Expression left)
-    {
-        return new BooleanUnaryExpression(left)
-        {
-            public Object evaluate(AMQMessage message) throws AMQException
-            {
-                Object rvalue = right.evaluate(message);
-                if (rvalue == null)
-                {
-                    return null;
-                }
-
-                if (!rvalue.getClass().equals(Boolean.class))
-                {
-                    return Boolean.FALSE;
-                }
-
-                return ((Boolean) rvalue).booleanValue() ? Boolean.TRUE : Boolean.FALSE;
-            }
-
-            public String toString()
-            {
-                return right.toString();
-            }
-
-            public String getExpressionSymbol()
-            {
-                return "";
-            }
-        };
-    }
-
-    private static Number negate(Number left)
-    {
-        Class clazz = left.getClass();
-        if (clazz == Integer.class)
-        {
-            return new Integer(-left.intValue());
-        }
-        else if (clazz == Long.class)
-        {
-            return new Long(-left.longValue());
-        }
-        else if (clazz == Float.class)
-        {
-            return new Float(-left.floatValue());
-        }
-        else if (clazz == Double.class)
-        {
-            return new Double(-left.doubleValue());
-        }
-        else if (clazz == BigDecimal.class)
-        {
-            // We ussually get a big deciamal when we have Long.MIN_VALUE constant in the
-            // Selector.  Long.MIN_VALUE is too big to store in a Long as a positive so we store it
-            // as a Big decimal.  But it gets Negated right away.. to here we try to covert it back
-            // to a Long.
-            BigDecimal bd = (BigDecimal) left;
-            bd = bd.negate();
-
-            if (BD_LONG_MIN_VALUE.compareTo(bd) == 0)
-            {
-                return new Long(Long.MIN_VALUE);
-            }
-
-            return bd;
-        }
-        else
-        {
-            throw new RuntimeException("Don't know how to negate: " + left);
-        }
-    }
-
-    public UnaryExpression(Expression left)
-    {
-        this.right = left;
-    }
-
-    public Expression getRight()
-    {
-        return right;
-    }
-
-    public void setRight(Expression expression)
-    {
-        right = expression;
-    }
-
-    /**
-     * @see java.lang.Object#toString()
-     */
-    public String toString()
-    {
-        return "(" + getExpressionSymbol() + " " + right.toString() + ")";
-    }
-
-    /**
-     * TODO: more efficient hashCode()
-     *
-     * @see java.lang.Object#hashCode()
-     */
-    public int hashCode()
-    {
-        return toString().hashCode();
-    }
-
-    /**
-     * TODO: more efficient hashCode()
-     *
-     * @see java.lang.Object#equals(java.lang.Object)
-     */
-    public boolean equals(Object o)
-    {
-
-        if ((o == null) || !this.getClass().equals(o.getClass()))
-        {
-            return false;
-        }
-
-        return toString().equals(o.toString());
-
-    }
-
-    /**
-     * Returns the symbol that represents this binary expression.  For example, addition is
-     * represented by "+"
-     *
-     * @return
-     */
-    public abstract String getExpressionSymbol();
-
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/XPathExpression.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/XPathExpression.java
deleted file mode 100644
index 2fdea208f2..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/XPathExpression.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/**
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.qpid.server.filter;
-//
-// Based on like named file from r450141 of the Apache ActiveMQ project <http://www.activemq.org/site/home.html>
-//
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.qpid.AMQException;
-import org.apache.qpid.server.queue.AMQMessage;
-
-/**
- * Used to evaluate an XPath Expression in a JMS selector.
- */
-public final class XPathExpression implements BooleanExpression {
-
-    private static final Log log = LogFactory.getLog(XPathExpression.class);
-    private static final String EVALUATOR_SYSTEM_PROPERTY = "org.apache.qpid.server.filter.XPathEvaluatorClassName";
-    private static final String DEFAULT_EVALUATOR_CLASS_NAME=XalanXPathEvaluator.class.getName();
-    
-    private static final Constructor EVALUATOR_CONSTRUCTOR;
-    
-    static {
-        String cn = System.getProperty(EVALUATOR_SYSTEM_PROPERTY, DEFAULT_EVALUATOR_CLASS_NAME);        
-        Constructor m = null;
-        try {
-            try {
-                m = getXPathEvaluatorConstructor(cn);
-            } catch (Throwable e) {
-                log.warn("Invalid "+XPathEvaluator.class.getName()+" implementation: "+cn+", reason: "+e,e);
-                cn = DEFAULT_EVALUATOR_CLASS_NAME;
-                try {
-                    m = getXPathEvaluatorConstructor(cn);
-                } catch (Throwable e2) {
-                    log.error("Default XPath evaluator could not be loaded",e);
-                }
-            }
-        } finally {
-            EVALUATOR_CONSTRUCTOR = m;
-        }
-    }
-
-    private static Constructor getXPathEvaluatorConstructor(String cn) throws ClassNotFoundException, SecurityException, NoSuchMethodException {
-        Class c = XPathExpression.class.getClassLoader().loadClass(cn);
-        if( !XPathEvaluator.class.isAssignableFrom(c) ) {
-            throw new ClassCastException(""+c+" is not an instance of "+XPathEvaluator.class);
-        }
-        return c.getConstructor(new Class[]{String.class});
-    }
-    
-    private final String xpath;
-    private final XPathEvaluator evaluator;
-    
-    static public interface XPathEvaluator {
-        public boolean evaluate(AMQMessage message) throws AMQException;
-    }    
-    
-    XPathExpression(String xpath) {
-        this.xpath = xpath;
-        this.evaluator = createEvaluator(xpath);
-    }
-
-    private XPathEvaluator createEvaluator(String xpath2) {
-        try {
-            return (XPathEvaluator)EVALUATOR_CONSTRUCTOR.newInstance(new Object[]{xpath});
-        } catch (InvocationTargetException e) {
-            Throwable cause = e.getCause();
-            if( cause instanceof RuntimeException ) {
-                throw (RuntimeException)cause;
-            }
-            throw new RuntimeException("Invalid XPath Expression: "+xpath+" reason: "+e.getMessage(), e);
-        } catch (Throwable e) {
-            throw new RuntimeException("Invalid XPath Expression: "+xpath+" reason: "+e.getMessage(), e);
-        }
-    }
-
-    public Object evaluate(AMQMessage message) throws AMQException {
-//        try {
-//FIXME this is flow to disk work
-//            if( message.isDropped() )
-//                return null;
-            return evaluator.evaluate(message) ? Boolean.TRUE : Boolean.FALSE;
-//        } catch (IOException e) {
-//
-//            JMSException exception = new JMSException(e.getMessage());
-//            exception.initCause(e);
-//            throw exception;
-//
-//        }
-
-    }
-
-    public String toString() {
-        return "XPATH "+ConstantExpression.encodeString(xpath);
-    }
-    
-    /**
-     * @param message
-     * @return true if the expression evaluates to Boolean.TRUE.
-     * @throws AMQException
-     */
-    public boolean matches(AMQMessage message) throws AMQException
-    {
-        Object object = evaluate(message);
-        return object!=null && object==Boolean.TRUE;            
-    }
-
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/XQueryExpression.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/XQueryExpression.java
deleted file mode 100644
index f5debb607a..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/XQueryExpression.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/**
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.qpid.server.filter;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.server.queue.AMQMessage;
-
-//
-// Based on like named file from r450141 of the Apache ActiveMQ project <http://www.activemq.org/site/home.html>
-//
-
-/**
- * Used to evaluate an XQuery Expression in a JMS selector.
- */
-public final class XQueryExpression implements BooleanExpression {
-    private final String xpath;
-
-    XQueryExpression(String xpath) {
-        super();
-        this.xpath = xpath;
-    }
-
-    public Object evaluate(AMQMessage message) throws AMQException {
-        return Boolean.FALSE;
-    }
-
-    public String toString() {
-        return "XQUERY "+ConstantExpression.encodeString(xpath);
-    }
-    
-    /**
-     * @param message
-     * @return true if the expression evaluates to Boolean.TRUE.
-     * @throws AMQException
-     */
-    public boolean matches(AMQMessage message) throws AMQException
-    {
-        Object object = evaluate(message);
-        return object!=null && object==Boolean.TRUE;            
-    }
-
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/XalanXPathEvaluator.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/XalanXPathEvaluator.java
deleted file mode 100644
index 35d770fd5d..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/XalanXPathEvaluator.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/**
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.qpid.server.filter;
-//
-// Based on like named file from r450141 of the Apache ActiveMQ project <http://www.activemq.org/site/home.html>
-//
-
-import java.io.ByteArrayInputStream;
-import java.io.StringReader;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.server.queue.AMQMessage;
-import org.apache.xpath.CachedXPathAPI;
-import org.w3c.dom.Document;
-import org.w3c.dom.traversal.NodeIterator;
-import org.xml.sax.InputSource;
-
-public class XalanXPathEvaluator implements XPathExpression.XPathEvaluator {
-    
-    private final String xpath;
-
-    public XalanXPathEvaluator(String xpath) {
-        this.xpath = xpath;
-    }
-    
-    public boolean evaluate(AMQMessage m) throws AMQException
-    {
-        // TODO - we would have to check the content type and then evaluate the content
-        //        here... is this really a feature we wish to implement? - RobG
-        /*
-
-        if( m instanceof TextMessage ) {
-            String text = ((TextMessage)m).getText();
-            return evaluate(text);
-        } else if ( m instanceof BytesMessage ) {
-            BytesMessage bm = (BytesMessage) m;
-            byte data[] = new byte[(int) bm.getBodyLength()];
-            bm.readBytes(data);
-            return evaluate(data);
-        }
-        */
-        return false;
-
-    }
-
-    private boolean evaluate(byte[] data) {
-        try {
-            
-            InputSource inputSource = new InputSource(new ByteArrayInputStream(data));
-            
-            DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-            factory.setNamespaceAware(true);
-            DocumentBuilder dbuilder = factory.newDocumentBuilder();
-            Document doc = dbuilder.parse(inputSource);
-            
-            CachedXPathAPI cachedXPathAPI = new CachedXPathAPI();
-            NodeIterator iterator = cachedXPathAPI.selectNodeIterator(doc,xpath);
-            return iterator.nextNode()!=null;
-            
-        } catch (Throwable e) {
-            return false;
-        }
-    }
-
-    private boolean evaluate(String text) {
-        try {
-            InputSource inputSource = new InputSource(new StringReader(text));
-            
-            DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-            factory.setNamespaceAware(true);
-            DocumentBuilder dbuilder = factory.newDocumentBuilder();
-            Document doc = dbuilder.parse(inputSource);
-            
-            // We should associated the cachedXPathAPI object with the message being evaluated
-            // since that should speedup subsequent xpath expressions.
-            CachedXPathAPI cachedXPathAPI = new CachedXPathAPI();
-            NodeIterator iterator = cachedXPathAPI.selectNodeIterator(doc,xpath);
-            return iterator.nextNode()!=null;
-        } catch (Throwable e) {
-            return false;
-        }
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/BasicAckMethodHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/BasicAckMethodHandler.java
deleted file mode 100644
index a6972475a6..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/BasicAckMethodHandler.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.handler;
-
-import org.apache.log4j.Logger;
-import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.BasicAckBody;
-import org.apache.qpid.protocol.AMQMethodEvent;
-import org.apache.qpid.server.AMQChannel;
-import org.apache.qpid.server.protocol.AMQProtocolSession;
-import org.apache.qpid.server.state.AMQStateManager;
-import org.apache.qpid.server.state.StateAwareMethodListener;
-
-public class BasicAckMethodHandler implements StateAwareMethodListener<BasicAckBody>
-{
-    private static final Logger _log = Logger.getLogger(BasicAckMethodHandler.class);
-
-    private static final BasicAckMethodHandler _instance = new BasicAckMethodHandler();
-
-    public static BasicAckMethodHandler getInstance()
-    {
-        return _instance;
-    }
-
-    private BasicAckMethodHandler()
-    {
-    }
-
-    public void methodReceived(AMQStateManager stateManager, AMQMethodEvent<BasicAckBody> evt) throws AMQException
-    {
-        AMQProtocolSession protocolSession = stateManager.getProtocolSession();
-        BasicAckBody body = evt.getMethod();
-
-        if (_log.isDebugEnabled())
-        {
-            _log.debug("Ack(Tag:" + body.deliveryTag + ":Mult:" + body.multiple + ") received on channel " + evt.getChannelId());
-        }
-
-        final AMQChannel channel = protocolSession.getChannel(evt.getChannelId());
-
-        if (channel == null)
-        {
-            throw body.getChannelNotFoundException(evt.getChannelId());
-        }
-
-        // this method throws an AMQException if the delivery tag is not known
-        channel.acknowledgeMessage(body.deliveryTag, body.multiple);
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/BasicCancelMethodHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/BasicCancelMethodHandler.java
deleted file mode 100644
index 8bab96a11b..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/BasicCancelMethodHandler.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.handler;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.AMQFrame;
-import org.apache.qpid.framing.BasicCancelBody;
-import org.apache.qpid.framing.BasicCancelOkBody;
-import org.apache.qpid.protocol.AMQMethodEvent;
-import org.apache.qpid.server.AMQChannel;
-import org.apache.qpid.server.protocol.AMQProtocolSession;
-import org.apache.qpid.server.state.AMQStateManager;
-import org.apache.qpid.server.state.StateAwareMethodListener;
-import org.apache.log4j.Logger;
-
-public class BasicCancelMethodHandler implements StateAwareMethodListener<BasicCancelBody>
-{
-    private static final Logger _log = Logger.getLogger(BasicCancelMethodHandler.class);
-
-    private static final BasicCancelMethodHandler _instance = new BasicCancelMethodHandler();
-
-    public static BasicCancelMethodHandler getInstance()
-    {
-        return _instance;
-    }
-
-    private BasicCancelMethodHandler()
-    {
-    }
-
-    public void methodReceived(AMQStateManager stateManager, AMQMethodEvent<BasicCancelBody> evt) throws AMQException
-    {
-        AMQProtocolSession protocolSession = stateManager.getProtocolSession();
-
-        final AMQChannel channel = protocolSession.getChannel(evt.getChannelId());
-        final BasicCancelBody body = evt.getMethod();
-
-        if (channel == null)
-        {
-            throw body.getChannelNotFoundException(evt.getChannelId());
-        }
-
-        if (_log.isDebugEnabled())
-        {
-            _log.debug("BasicCancel: for:" + body.consumerTag +
-                       " nowait:" + body.nowait);
-        }
-
-        channel.unsubscribeConsumer(protocolSession, body.consumerTag);
-        if (!body.nowait)
-        {
-            // AMQP version change: Hardwire the version to 0-8 (major=8, minor=0)
-            // TODO: Connect this to the session version obtained from ProtocolInitiation for this session.
-            // Be aware of possible changes to parameter order as versions change.
-            final AMQFrame responseFrame = BasicCancelOkBody.createAMQFrame(evt.getChannelId(),
-                                                                            (byte) 8, (byte) 0,    // AMQP version (major, minor)
-                                                                            body.consumerTag);    // consumerTag
-            protocolSession.writeFrame(responseFrame);
-        }
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/BasicConsumeMethodHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/BasicConsumeMethodHandler.java
deleted file mode 100644
index ab4f2c4e64..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/BasicConsumeMethodHandler.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.handler;
-
-import org.apache.log4j.Logger;
-import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.framing.BasicConsumeBody;
-import org.apache.qpid.framing.BasicConsumeOkBody;
-import org.apache.qpid.framing.ChannelCloseBody;
-import org.apache.qpid.framing.ConnectionCloseBody;
-import org.apache.qpid.protocol.AMQConstant;
-import org.apache.qpid.protocol.AMQMethodEvent;
-import org.apache.qpid.server.AMQChannel;
-import org.apache.qpid.server.ConsumerTagNotUniqueException;
-import org.apache.qpid.server.protocol.AMQProtocolSession;
-import org.apache.qpid.server.queue.AMQQueue;
-import org.apache.qpid.server.queue.ExistingExclusiveSubscriptionException;
-import org.apache.qpid.server.queue.ExistingSubscriptionPreventsExclusiveException;
-import org.apache.qpid.server.state.AMQStateManager;
-import org.apache.qpid.server.state.StateAwareMethodListener;
-import org.apache.qpid.server.virtualhost.VirtualHost;
-
-public class BasicConsumeMethodHandler implements StateAwareMethodListener<BasicConsumeBody>
-{
-    private static final Logger _log = Logger.getLogger(BasicConsumeMethodHandler.class);
-
-    private static final BasicConsumeMethodHandler _instance = new BasicConsumeMethodHandler();
-
-    public static BasicConsumeMethodHandler getInstance()
-    {
-        return _instance;
-    }
-
-    private BasicConsumeMethodHandler()
-    {
-    }
-
-    public void methodReceived(AMQStateManager stateManager, AMQMethodEvent<BasicConsumeBody> evt) throws AMQException
-    {
-        AMQProtocolSession session = stateManager.getProtocolSession();
-
-        BasicConsumeBody body = evt.getMethod();
-        final int channelId = evt.getChannelId();
-
-        AMQChannel channel = session.getChannel(channelId);
-
-        VirtualHost vHost = session.getVirtualHost();
-
-        if (channel == null)
-        {
-            throw body.getChannelNotFoundException(evt.getChannelId());
-        }
-        else
-        {
-            if (_log.isDebugEnabled())
-            {
-                _log.debug("BasicConsume: from '" + body.queue +
-                           "' for:" + body.consumerTag +
-                           " nowait:" + body.nowait +
-                           " args:" + body.arguments);
-            }
-
-            AMQQueue queue = body.queue == null ? channel.getDefaultQueue() : vHost.getQueueRegistry().getQueue(body.queue);
-
-            if (queue == null)
-            {
-                if (_log.isTraceEnabled())
-                {
-                    _log.trace("No queue for '" + body.queue + "'");
-                }
-                if (body.queue != null)
-                {
-                    String msg = "No such queue, '" + body.queue + "'";
-                    throw body.getChannelException(AMQConstant.NOT_FOUND, msg);
-                }
-                else
-                {
-                    String msg = "No queue name provided, no default queue defined.";
-                    throw body.getConnectionException(AMQConstant.NOT_ALLOWED, msg);
-                }
-            }
-            else
-            {
-
-                if (body.consumerTag != null)
-                {
-                    body.consumerTag = body.consumerTag.intern();
-                }
-
-                try
-                {
-                    AMQShortString consumerTag = channel.subscribeToQueue(body.consumerTag, queue, session, !body.noAck,
-                                                                          body.arguments, body.noLocal, body.exclusive);
-                    if (!body.nowait)
-                    {
-                        // AMQP version change: Hardwire the version to 0-8 (major=8, minor=0)
-                        // TODO: Connect this to the session version obtained from ProtocolInitiation for this session.
-                        // Be aware of possible changes to parameter order as versions change.
-                        session.writeFrame(BasicConsumeOkBody.createAMQFrame(channelId,
-                                                                             (byte) 8, (byte) 0,    // AMQP version (major, minor)
-                                                                             consumerTag));        // consumerTag
-                    }
-
-                    //now allow queue to start async processing of any backlog of messages
-                    queue.deliverAsync();
-                }
-                catch (org.apache.qpid.AMQInvalidArgumentException ise)
-                {
-                    _log.debug("Closing connection due to invalid selector");
-                    // Why doesn't this ChannelException work.
-//                    throw body.getChannelException(AMQConstant.INVALID_ARGUMENT, ise.getMessage());
-                    // AMQP version change: Hardwire the version to 0-8 (major=8, minor=0)
-                    // TODO: Connect this to the session version obtained from ProtocolInitiation for this session.
-                    // Be aware of possible changes to parameter order as versions change.
-                    session.writeFrame(ChannelCloseBody.createAMQFrame(channelId,
-                                                                       (byte) 8, (byte) 0,    // AMQP version (major, minor)
-                                                                       BasicConsumeBody.getClazz((byte) 8, (byte) 0),    // classId
-                                                                       BasicConsumeBody.getMethod((byte) 8, (byte) 0),    // methodId
-                                                                       AMQConstant.INVALID_ARGUMENT.getCode(),    // replyCode
-                                                                       new AMQShortString(ise.getMessage())));        // replyText
-                }
-                catch (ConsumerTagNotUniqueException e)
-                {
-                    AMQShortString msg = new AMQShortString("Non-unique consumer tag, '" + body.consumerTag + "'");
-                    // If the above doesn't work then perhaps this is wrong too.
-//                    throw body.getConnectionException(AMQConstant.NOT_ALLOWED,
-//                                                      "Non-unique consumer tag, '" + body.consumerTag + "'");
-                    // AMQP version change: Hardwire the version to 0-8 (major=8, minor=0)
-                    // TODO: Connect this to the session version obtained from ProtocolInitiation for this session.
-                    // Be aware of possible changes to parameter order as versions change.
-                    session.writeFrame(ConnectionCloseBody.createAMQFrame(channelId,
-                                                                          (byte) 8, (byte) 0,    // AMQP version (major, minor)
-                                                                          BasicConsumeBody.getClazz((byte) 8, (byte) 0),    // classId
-                                                                          BasicConsumeBody.getMethod((byte) 8, (byte) 0),    // methodId
-                                                                          AMQConstant.NOT_ALLOWED.getCode(),    // replyCode
-                                                                          msg));    // replyText
-                }
-                catch (ExistingExclusiveSubscriptionException e)
-                {
-                    throw body.getChannelException(AMQConstant.ACCESS_REFUSED,
-                                                   "Cannot subscribe to queue "
-                                                   + queue.getName()
-                                                   + " as it already has an existing exclusive consumer");
-                }
-                catch (ExistingSubscriptionPreventsExclusiveException e)
-                {
-                    throw body.getChannelException(AMQConstant.ACCESS_REFUSED,
-                                                   "Cannot subscribe to queue "
-                                                   + queue.getName()
-                                                   + " exclusively as it already has a consumer");
-                }
-
-            }
-        }
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/BasicGetMethodHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/BasicGetMethodHandler.java
deleted file mode 100644
index 782a89c704..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/BasicGetMethodHandler.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*

- *  Licensed to the Apache Software Foundation (ASF) under one

- *  or more contributor license agreements.  See the NOTICE file

- *  distributed with this work for additional information

- *  regarding copyright ownership.  The ASF licenses this file

- *  to you under the Apache License, Version 2.0 (the

- *  "License"); you may not use this file except in compliance

- *  with the License.  You may obtain a copy of the License at

- *

- *    http://www.apache.org/licenses/LICENSE-2.0

- *

- *  Unless required by applicable law or agreed to in writing,

- *  software distributed under the License is distributed on an

- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- *  KIND, either express or implied.  See the License for the

- *  specific language governing permissions and limitations

- *  under the License.

- *

- *

- */

-

-package org.apache.qpid.server.handler;

-

-import org.apache.log4j.Logger;

-import org.apache.qpid.AMQException;

-import org.apache.qpid.framing.BasicGetBody;

-import org.apache.qpid.framing.BasicGetEmptyBody;

-import org.apache.qpid.protocol.AMQConstant;

-import org.apache.qpid.protocol.AMQMethodEvent;

-import org.apache.qpid.server.AMQChannel;

-import org.apache.qpid.server.protocol.AMQProtocolSession;

-import org.apache.qpid.server.queue.AMQQueue;

-import org.apache.qpid.server.state.AMQStateManager;

-import org.apache.qpid.server.state.StateAwareMethodListener;

-import org.apache.qpid.server.virtualhost.VirtualHost;

-

-public class BasicGetMethodHandler implements StateAwareMethodListener<BasicGetBody>

-{

-    private static final Logger _log = Logger.getLogger(BasicGetMethodHandler.class);

-

-    private static final BasicGetMethodHandler _instance = new BasicGetMethodHandler();

-

-    public static BasicGetMethodHandler getInstance()

-    {

-        return _instance;

-    }

-

-    private BasicGetMethodHandler()

-    {

-    }

-

-    public void methodReceived(AMQStateManager stateManager, AMQMethodEvent<BasicGetBody> evt) throws AMQException

-    {

-        AMQProtocolSession session = stateManager.getProtocolSession();

-

-        BasicGetBody body = evt.getMethod();

-        final int channelId = evt.getChannelId();

-        VirtualHost vHost = session.getVirtualHost();

-

-        AMQChannel channel = session.getChannel(channelId);

-        if (channel == null)

-        {

-            throw body.getChannelNotFoundException(evt.getChannelId());

-        }

-        else

-        {

-            AMQQueue queue = body.queue == null ? channel.getDefaultQueue() : vHost.getQueueRegistry().getQueue(body.queue);

-

-            if (queue == null)

-            {

-                _log.info("No queue for '" + body.queue + "'");

-                if(body.queue!=null)

-                {

-                    throw body.getConnectionException(AMQConstant.NOT_FOUND,

-                                                      "No such queue, '" + body.queue + "'");

-                }

-                else

-                {

-                    throw body.getConnectionException(AMQConstant.NOT_ALLOWED,

-                                                      "No queue name provided, no default queue defined.");

-                }

-            }

-            else

-            {

-                if(!queue.performGet(session, channel, !body.noAck))

-                {

-

-

-                    // TODO - set clusterId

-                    session.writeFrame(BasicGetEmptyBody.createAMQFrame(channelId, body.getMajor(), body.getMinor(), null));

-                }

-            }

-        }

-    }

-}

diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/BasicPublishMethodHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/BasicPublishMethodHandler.java
deleted file mode 100644
index 541d2afaf4..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/BasicPublishMethodHandler.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.handler;
-
-import org.apache.log4j.Logger;
-import org.apache.qpid.AMQException;
-import org.apache.qpid.exchange.ExchangeDefaults;
-import org.apache.qpid.framing.BasicPublishBody;
-import org.apache.qpid.protocol.AMQMethodEvent;
-import org.apache.qpid.protocol.AMQConstant;
-import org.apache.qpid.server.AMQChannel;
-import org.apache.qpid.framing.abstraction.MessagePublishInfo;
-import org.apache.qpid.server.exchange.Exchange;
-import org.apache.qpid.server.protocol.AMQProtocolSession;
-import org.apache.qpid.server.state.AMQStateManager;
-import org.apache.qpid.server.state.StateAwareMethodListener;
-import org.apache.qpid.server.virtualhost.VirtualHost;
-
-public class BasicPublishMethodHandler  implements StateAwareMethodListener<BasicPublishBody>
-{
-    private static final Logger _log = Logger.getLogger(BasicPublishMethodHandler.class);
-
-    private static final BasicPublishMethodHandler _instance = new BasicPublishMethodHandler();
-
-
-    public static BasicPublishMethodHandler getInstance()
-    {
-        return _instance;
-    }
-
-    private BasicPublishMethodHandler()
-    {
-    }
-
-    public void methodReceived(AMQStateManager stateManager, AMQMethodEvent<BasicPublishBody> evt) throws AMQException
-    {
-        AMQProtocolSession session = stateManager.getProtocolSession();
-
-        final BasicPublishBody body = evt.getMethod();
-
-        if (_log.isDebugEnabled())
-        {
-            _log.debug("Publish received on channel " + evt.getChannelId());
-        }
-
-        // TODO: check the delivery tag field details - is it unique across the broker or per subscriber?
-        if (body.exchange == null)
-        {
-            body.exchange = ExchangeDefaults.DEFAULT_EXCHANGE_NAME;
-
-        }
-        else
-        {
-            body.exchange = body.exchange.intern();
-        }
-        VirtualHost vHost = session.getVirtualHost();
-        Exchange e = vHost.getExchangeRegistry().getExchange(body.exchange);
-        // if the exchange does not exist we raise a channel exception
-        if (e == null)
-        {
-            throw body.getChannelException(AMQConstant.NOT_FOUND, "Unknown exchange name");
-        }
-        else
-        {
-            // The partially populated BasicDeliver frame plus the received route body
-            // is stored in the channel. Once the final body frame has been received
-            // it is routed to the exchange.
-            AMQChannel channel = session.getChannel(evt.getChannelId());
-
-            if (channel == null)
-            {
-                throw body.getChannelNotFoundException(evt.getChannelId());
-            }
-
-            if(body.routingKey != null)
-            {
-                body.routingKey = body.routingKey.intern();
-            }
-            
-            MessagePublishInfo info = session.getRegistry().getProtocolVersionMethodConverter().convertToInfo(body);
-            channel.setPublishFrame(info, session);
-        }
-    }
-}
-
-
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/BasicQosHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/BasicQosHandler.java
deleted file mode 100644
index 3cd6a87f64..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/BasicQosHandler.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.handler;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.BasicQosBody;
-import org.apache.qpid.framing.BasicQosOkBody;
-import org.apache.qpid.protocol.AMQMethodEvent;
-import org.apache.qpid.server.protocol.AMQProtocolSession;
-import org.apache.qpid.server.state.AMQStateManager;
-import org.apache.qpid.server.state.StateAwareMethodListener;
-import org.apache.qpid.server.AMQChannel;
-
-public class BasicQosHandler implements StateAwareMethodListener<BasicQosBody>
-{
-    private static final BasicQosHandler _instance = new BasicQosHandler();
-
-    public static BasicQosHandler getInstance()
-    {
-        return _instance;
-    }
-
-    public void methodReceived(AMQStateManager stateManager, AMQMethodEvent<BasicQosBody> evt) throws AMQException
-    {
-        AMQProtocolSession session = stateManager.getProtocolSession();
-        AMQChannel channel = session.getChannel(evt.getChannelId());
-        if (channel == null)
-        {
-            throw evt.getMethod().getChannelNotFoundException(evt.getChannelId());
-        }
-
-        channel.setPrefetchCount(evt.getMethod().prefetchCount);
-        channel.setPrefetchSize(evt.getMethod().prefetchSize);
-
-        // AMQP version change: Hardwire the version to 0-8 (major=8, minor=0)
-        // TODO: Connect this to the session version obtained from ProtocolInitiation for this session.
-        // Be aware of possible changes to parameter order as versions change.
-        session.writeFrame(BasicQosOkBody.createAMQFrame(evt.getChannelId(), (byte) 8, (byte) 0));
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/BasicRecoverMethodHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/BasicRecoverMethodHandler.java
deleted file mode 100644
index a436c35473..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/BasicRecoverMethodHandler.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.handler;
-
-import org.apache.log4j.Logger;
-import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.BasicRecoverBody;
-import org.apache.qpid.framing.BasicRecoverOkBody;
-import org.apache.qpid.protocol.AMQMethodEvent;
-import org.apache.qpid.server.AMQChannel;
-import org.apache.qpid.server.protocol.AMQProtocolSession;
-import org.apache.qpid.server.state.AMQStateManager;
-import org.apache.qpid.server.state.StateAwareMethodListener;
-
-public class BasicRecoverMethodHandler implements StateAwareMethodListener<BasicRecoverBody>
-{
-    private static final Logger _logger = Logger.getLogger(BasicRecoverMethodHandler.class);
-
-    private static final BasicRecoverMethodHandler _instance = new BasicRecoverMethodHandler();
-
-    public static BasicRecoverMethodHandler getInstance()
-    {
-        return _instance;
-    }
-
-    public void methodReceived(AMQStateManager stateManager, AMQMethodEvent<BasicRecoverBody> evt) throws AMQException
-    {
-        AMQProtocolSession session = stateManager.getProtocolSession();
-
-        _logger.debug("Recover received on protocol session " + session + " and channel " + evt.getChannelId());
-        AMQChannel channel = session.getChannel(evt.getChannelId());
-        BasicRecoverBody body = evt.getMethod();
-
-        if (channel == null)
-        {
-            throw body.getChannelNotFoundException(evt.getChannelId());
-        }
-
-        channel.resend(body.requeue);
-
-        // AMQP version change: Hardwire the version to 0-8 (major=8, minor=0)
-        // TODO: Connect this to the session version obtained from ProtocolInitiation for this session.
-        // Be aware of possible changes to parameter order as versions change.
-        session.writeFrame(BasicRecoverOkBody.createAMQFrame(evt.getChannelId(), (byte) 8, (byte) 0));
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/BasicRejectMethodHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/BasicRejectMethodHandler.java
deleted file mode 100644
index 32c840106f..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/BasicRejectMethodHandler.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.handler;
-
-import org.apache.log4j.Logger;
-import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.BasicRejectBody;
-import org.apache.qpid.protocol.AMQMethodEvent;
-import org.apache.qpid.server.AMQChannel;
-import org.apache.qpid.server.ack.UnacknowledgedMessage;
-import org.apache.qpid.server.protocol.AMQProtocolSession;
-import org.apache.qpid.server.state.AMQStateManager;
-import org.apache.qpid.server.state.StateAwareMethodListener;
-
-public class BasicRejectMethodHandler implements StateAwareMethodListener<BasicRejectBody>
-{
-    private static final Logger _logger = Logger.getLogger(BasicRejectMethodHandler.class);
-
-    private static BasicRejectMethodHandler _instance = new BasicRejectMethodHandler();
-
-    public static BasicRejectMethodHandler getInstance()
-    {
-        return _instance;
-    }
-
-    private BasicRejectMethodHandler()
-    {
-    }
-
-    public void methodReceived(AMQStateManager stateManager, AMQMethodEvent<BasicRejectBody> evt) throws AMQException
-    {
-        AMQProtocolSession session = stateManager.getProtocolSession();
-
-        int channelId = evt.getChannelId();
-
-//        if (_logger.isDebugEnabled())
-//        {
-//            _logger.debug("Rejecting:" + evt.getMethod().deliveryTag +
-//                          ": Requeue:" + evt.getMethod().requeue +
-////                              ": Resend:" + evt.getMethod().resend +
-//                          " on channel:" + channelId);
-//        }
-
-        AMQChannel channel = session.getChannel(channelId);
-
-        if (channel == null)
-        {
-            throw evt.getMethod().getChannelNotFoundException(channelId);
-        }
-
-        if (_logger.isDebugEnabled())
-        {
-            _logger.debug("Rejecting:" + evt.getMethod().deliveryTag +
-                          ": Requeue:" + evt.getMethod().requeue +
-                          //": Resend:" + evt.getMethod().resend +
-                          " on channel:" + channel.debugIdentity());
-        }
-
-        long deliveryTag = evt.getMethod().deliveryTag;
-
-        UnacknowledgedMessage message = channel.getUnacknowledgedMessageMap().get(deliveryTag);
-
-        if (message == null)
-        {
-            _logger.warn("Dropping reject request as message is null for tag:" + deliveryTag);
-//            throw evt.getMethod().getChannelException(AMQConstant.NOT_FOUND, "Delivery Tag(" + deliveryTag + ")not known");
-        }
-        else
-        {
-
-            if (_logger.isTraceEnabled())
-            {
-                _logger.trace("Rejecting: DT:" + deliveryTag + "-" + message.message.debugIdentity() +
-                              ": Requeue:" + evt.getMethod().requeue +
-                              //": Resend:" + evt.getMethod().resend +
-                              " on channel:" + channel.debugIdentity());
-            }
-
-            // If we haven't requested message to be resent to this consumer then reject it from ever getting it.
-//            if (!evt.getMethod().resend)
-            {
-                message.message.reject(message.message.getDeliveredSubscription(message.queue));
-            }
-
-            if (evt.getMethod().requeue)
-            {
-                channel.requeue(deliveryTag);
-            }
-            else
-            {
-                _logger.warn("Dropping message as requeue not required and there is no dead letter queue");
-//                message.queue = channel.getDefaultDeadLetterQueue();
-//                channel.requeue(deliveryTag);
-            }
-        }
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ChannelCloseHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ChannelCloseHandler.java
deleted file mode 100644
index 1f4f1f9221..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ChannelCloseHandler.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.handler;
-
-import org.apache.log4j.Logger;
-import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.AMQFrame;
-import org.apache.qpid.framing.ChannelCloseBody;
-import org.apache.qpid.framing.ChannelCloseOkBody;
-import org.apache.qpid.protocol.AMQMethodEvent;
-import org.apache.qpid.protocol.AMQConstant;
-import org.apache.qpid.server.protocol.AMQProtocolSession;
-import org.apache.qpid.server.state.AMQStateManager;
-import org.apache.qpid.server.state.StateAwareMethodListener;
-import org.apache.qpid.server.AMQChannel;
-
-public class ChannelCloseHandler implements StateAwareMethodListener<ChannelCloseBody>
-{
-    private static final Logger _logger = Logger.getLogger(ChannelCloseHandler.class);
-
-    private static ChannelCloseHandler _instance = new ChannelCloseHandler();
-
-    public static ChannelCloseHandler getInstance()
-    {
-        return _instance;
-    }
-
-    private ChannelCloseHandler()
-    {
-    }
-
-    public void methodReceived(AMQStateManager stateManager, AMQMethodEvent<ChannelCloseBody> evt) throws AMQException
-    {
-        AMQProtocolSession session = stateManager.getProtocolSession();
-        ChannelCloseBody body = evt.getMethod();
-        if (_logger.isInfoEnabled())
-        {
-            _logger.info("Received channel close for id " + evt.getChannelId() + " citing class " + body.classId +
-                         " and method " + body.methodId);
-        }
-        int channelId = evt.getChannelId();
-
-        AMQChannel channel = session.getChannel(channelId);
-
-        if (channel == null)
-        {
-            throw body.getConnectionException(AMQConstant.CHANNEL_ERROR, "Trying to close unknown channel");
-        }
-
-        session.closeChannel(channelId);
-        // Client requested closure so we don't wait for ok we send it
-        stateManager.getProtocolSession().closeChannelOk(channelId);
-
-        // AMQP version change: Hardwire the version to 0-8 (major=8, minor=0)
-        // TODO: Connect this to the session version obtained from ProtocolInitiation for this session.
-        // Be aware of possible changes to parameter order as versions change.
-        AMQFrame response = ChannelCloseOkBody.createAMQFrame(evt.getChannelId(), (byte) 8, (byte) 0);
-        session.writeFrame(response);
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ChannelCloseOkHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ChannelCloseOkHandler.java
deleted file mode 100644
index ad5604e7ea..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ChannelCloseOkHandler.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.handler;
-
-import org.apache.log4j.Logger;
-import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.ChannelCloseOkBody;
-import org.apache.qpid.protocol.AMQMethodEvent;
-import org.apache.qpid.server.state.AMQStateManager;
-import org.apache.qpid.server.state.StateAwareMethodListener;
-
-public class ChannelCloseOkHandler implements StateAwareMethodListener<ChannelCloseOkBody>
-{
-    private static final Logger _logger = Logger.getLogger(ChannelCloseOkHandler.class);
-
-    private static ChannelCloseOkHandler _instance = new ChannelCloseOkHandler();
-
-    public static ChannelCloseOkHandler getInstance()
-    {
-        return _instance;
-    }
-
-    private ChannelCloseOkHandler()
-    {
-    }
-
-    public void methodReceived(AMQStateManager stateManager, AMQMethodEvent<ChannelCloseOkBody> evt) throws AMQException
-    {
-        int channelId = evt.getChannelId();
-        _logger.info("Received channel-close-ok for channel-id " + channelId);
-        
-        // Let the Protocol Session know the channel is now closed.
-        stateManager.getProtocolSession().closeChannelOk(channelId);
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ChannelFlowHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ChannelFlowHandler.java
deleted file mode 100644
index bfa170cfc5..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ChannelFlowHandler.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.handler;
-
-import org.apache.log4j.Logger;
-import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.AMQFrame;
-import org.apache.qpid.framing.ChannelFlowBody;
-import org.apache.qpid.framing.ChannelFlowOkBody;
-import org.apache.qpid.protocol.AMQMethodEvent;
-import org.apache.qpid.server.AMQChannel;
-import org.apache.qpid.server.protocol.AMQProtocolSession;
-import org.apache.qpid.server.state.AMQStateManager;
-import org.apache.qpid.server.state.StateAwareMethodListener;
-
-public class ChannelFlowHandler implements StateAwareMethodListener<ChannelFlowBody>
-{
-    private static final Logger _logger = Logger.getLogger(ChannelFlowHandler.class);
-
-    private static ChannelFlowHandler _instance = new ChannelFlowHandler();
-
-    public static ChannelFlowHandler getInstance()
-    {
-        return _instance;
-    }
-
-    private ChannelFlowHandler()
-    {
-    }
-
-    public void methodReceived(AMQStateManager stateManager, AMQMethodEvent<ChannelFlowBody> evt) throws AMQException
-    {
-        AMQProtocolSession session = stateManager.getProtocolSession();
-        ChannelFlowBody body = evt.getMethod();
-
-        AMQChannel channel = session.getChannel(evt.getChannelId());
-
-        if (channel == null)
-        {
-            throw body.getChannelNotFoundException(evt.getChannelId());
-        }
-
-        channel.setSuspended(!body.active);
-        _logger.debug("Channel.Flow for channel " + evt.getChannelId() + ", active=" + body.active);
-
-        // AMQP version change: Hardwire the version to 0-8 (major=8, minor=0)
-        // TODO: Connect this to the session version obtained from ProtocolInitiation for this session.
-        // Be aware of possible changes to parameter order as versions change.
-        AMQFrame response = ChannelFlowOkBody.createAMQFrame(evt.getChannelId(),
-            (byte)8, (byte)0,	// AMQP version (major, minor)
-            body.active);	// active
-        session.writeFrame(response);
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ChannelOpenHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ChannelOpenHandler.java
deleted file mode 100644
index e4abae4f28..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ChannelOpenHandler.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.handler;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.AMQFrame;
-import org.apache.qpid.framing.ChannelOpenBody;
-import org.apache.qpid.framing.ChannelOpenOkBody;
-import org.apache.qpid.protocol.AMQMethodEvent;
-import org.apache.qpid.server.AMQChannel;
-import org.apache.qpid.server.protocol.AMQProtocolSession;
-import org.apache.qpid.server.state.AMQStateManager;
-import org.apache.qpid.server.state.StateAwareMethodListener;
-import org.apache.qpid.server.virtualhost.VirtualHost;
-
-public class ChannelOpenHandler implements StateAwareMethodListener<ChannelOpenBody>
-{
-    private static ChannelOpenHandler _instance = new ChannelOpenHandler();
-
-    public static ChannelOpenHandler getInstance()
-    {
-        return _instance;
-    }
-
-    private ChannelOpenHandler()
-    {
-    }
-
-    public void methodReceived(AMQStateManager stateManager, AMQMethodEvent<ChannelOpenBody> evt) throws AMQException
-    {
-        AMQProtocolSession session = stateManager.getProtocolSession();
-        VirtualHost virtualHost = session.getVirtualHost();
-
-        final AMQChannel channel = new AMQChannel(session,evt.getChannelId(), virtualHost.getTransactionManager(),
-                                                  virtualHost.getMessageStore(),
-                                                  virtualHost.getExchangeRegistry());
-        session.addChannel(channel);
-        // AMQP version change: Hardwire the version to 0-8 (major=8, minor=0)
-        // TODO: Connect this to the session version obtained from ProtocolInitiation for this session.
-        // Be aware of possible changes to parameter order as versions change.
-        AMQFrame response = ChannelOpenOkBody.createAMQFrame(evt.getChannelId(), (byte)8, (byte)0);
-        session.writeFrame(response);
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionCloseMethodHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionCloseMethodHandler.java
deleted file mode 100644
index b086cad67f..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionCloseMethodHandler.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.handler;
-
-import org.apache.log4j.Logger;
-import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.AMQFrame;
-import org.apache.qpid.framing.ConnectionCloseBody;
-import org.apache.qpid.framing.ConnectionCloseOkBody;
-import org.apache.qpid.protocol.AMQMethodEvent;
-import org.apache.qpid.server.protocol.AMQProtocolSession;
-import org.apache.qpid.server.state.AMQStateManager;
-import org.apache.qpid.server.state.StateAwareMethodListener;
-
-public class ConnectionCloseMethodHandler implements StateAwareMethodListener<ConnectionCloseBody>
-{
-    private static final Logger _logger = Logger.getLogger(ConnectionCloseMethodHandler.class);
-
-    private static ConnectionCloseMethodHandler _instance = new ConnectionCloseMethodHandler();
-
-    public static ConnectionCloseMethodHandler getInstance()
-    {
-        return _instance;
-    }
-
-    private ConnectionCloseMethodHandler()
-    {
-    }
-
-    public void methodReceived(AMQStateManager stateManager, AMQMethodEvent<ConnectionCloseBody> evt) throws AMQException
-    {
-        AMQProtocolSession session = stateManager.getProtocolSession();
-        final ConnectionCloseBody body = evt.getMethod();
-        if (_logger.isInfoEnabled())
-        {
-            _logger.info("ConnectionClose received with reply code/reply text " + body.replyCode + "/" +
-                         body.replyText + " for " + session);
-        }
-        try
-        {
-            session.closeSession();
-        }
-        catch (Exception e)
-        {
-            _logger.error("Error closing protocol session: " + e, e);
-        }
-        // AMQP version change: Hardwire the version to 0-8 (major=8, minor=0)
-        // TODO: Connect this to the session version obtained from ProtocolInitiation for this session.
-        // Be aware of possible changes to parameter order as versions change.
-        final AMQFrame response = ConnectionCloseOkBody.createAMQFrame(evt.getChannelId(), (byte) 8, (byte) 0);
-        session.writeFrame(response);
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionCloseOkMethodHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionCloseOkMethodHandler.java
deleted file mode 100644
index 853f4df435..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionCloseOkMethodHandler.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.handler;
-
-import org.apache.log4j.Logger;
-import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.ConnectionCloseOkBody;
-import org.apache.qpid.protocol.AMQMethodEvent;
-import org.apache.qpid.server.protocol.AMQProtocolSession;
-import org.apache.qpid.server.state.AMQState;
-import org.apache.qpid.server.state.AMQStateManager;
-import org.apache.qpid.server.state.StateAwareMethodListener;
-
-public class ConnectionCloseOkMethodHandler implements StateAwareMethodListener<ConnectionCloseOkBody>
-{
-    private static final Logger _logger = Logger.getLogger(ConnectionCloseOkMethodHandler.class);
-
-    private static ConnectionCloseOkMethodHandler _instance = new ConnectionCloseOkMethodHandler();
-
-    public static ConnectionCloseOkMethodHandler getInstance()
-    {
-        return _instance;
-    }
-
-    private ConnectionCloseOkMethodHandler()
-    {
-    }
-
-    public void methodReceived(AMQStateManager stateManager, AMQMethodEvent<ConnectionCloseOkBody> evt) throws AMQException
-    {
-        AMQProtocolSession session = stateManager.getProtocolSession();
-        //todo should this not do more than just log the method?
-        _logger.info("Received Connection-close-ok");
-
-        try
-        {
-            stateManager.changeState(AMQState.CONNECTION_CLOSED);
-            session.closeSession();
-        }
-        catch (Exception e)
-        {
-            _logger.error("Error closing protocol session: " + e, e);
-        }
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionOpenMethodHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionOpenMethodHandler.java
deleted file mode 100644
index 30a40c5a75..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionOpenMethodHandler.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.handler;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.AMQFrame;
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.framing.ConnectionOpenBody;
-import org.apache.qpid.framing.ConnectionOpenOkBody;
-import org.apache.qpid.protocol.AMQConstant;
-import org.apache.qpid.protocol.AMQMethodEvent;
-import org.apache.qpid.server.protocol.AMQProtocolSession;
-import org.apache.qpid.server.state.AMQState;
-import org.apache.qpid.server.state.AMQStateManager;
-import org.apache.qpid.server.state.StateAwareMethodListener;
-import org.apache.qpid.server.virtualhost.VirtualHost;
-import org.apache.qpid.server.security.access.AccessResult;
-import org.apache.qpid.server.security.access.AccessRights;
-import org.apache.log4j.Logger;
-
-public class ConnectionOpenMethodHandler implements StateAwareMethodListener<ConnectionOpenBody>
-{
-    private static final Logger _logger = Logger.getLogger(ConnectionOpenMethodHandler.class);
-
-    private static ConnectionOpenMethodHandler _instance = new ConnectionOpenMethodHandler();
-
-    public static ConnectionOpenMethodHandler getInstance()
-    {
-        return _instance;
-    }
-
-    private ConnectionOpenMethodHandler()
-    {
-    }
-
-    private static AMQShortString generateClientID()
-    {
-        return new AMQShortString(Long.toString(System.currentTimeMillis()));
-    }
-
-    public void methodReceived(AMQStateManager stateManager, AMQMethodEvent<ConnectionOpenBody> evt) throws AMQException
-    {
-        AMQProtocolSession session = stateManager.getProtocolSession();
-        ConnectionOpenBody body = evt.getMethod();
-
-        //ignore leading '/'
-        String virtualHostName;
-        if ((body.virtualHost != null) && body.virtualHost.charAt(0) == '/')
-        {
-            virtualHostName = new StringBuilder(body.virtualHost.subSequence(1, body.virtualHost.length())).toString();
-        }
-        else
-        {
-            virtualHostName = body.virtualHost == null ? null : String.valueOf(body.virtualHost);
-        }
-
-        VirtualHost virtualHost = stateManager.getVirtualHostRegistry().getVirtualHost(virtualHostName);
-
-        if (virtualHost == null)
-        {
-            throw body.getConnectionException(AMQConstant.NOT_FOUND, "Unknown virtual host: '" + virtualHostName + "'");
-        }
-        else
-        {
-            session.setVirtualHost(virtualHost);
-
-            AccessResult result = virtualHost.getAccessManager().isAuthorized(virtualHost, session.getAuthorizedID(), AccessRights.Rights.ANY);
-
-            switch (result.getStatus())
-            {
-                default:
-                case REFUSED:
-                    String error = "Any access denied to vHost '" + virtualHostName + "' by "
-                                   + result.getAuthorizer();
-                    
-                    _logger.warn(error);
-
-                    throw body.getConnectionException(AMQConstant.ACCESS_REFUSED, error);
-                case GRANTED:
-                    _logger.info("Granted any access to vHost '" + virtualHostName + "' for " + session.getAuthorizedID()
-                                 + " by '" + result.getAuthorizer() + "'");
-            }
-
-            // See Spec (0.8.2). Section  3.1.2 Virtual Hosts
-            if (session.getContextKey() == null)
-            {
-                session.setContextKey(generateClientID());
-            }
-
-            // AMQP version change: Hardwire the version to 0-8 (major=8, minor=0)
-            // TODO: Connect this to the session version obtained from ProtocolInitiation for this session.
-            // Be aware of possible changes to parameter order as versions change.
-            AMQFrame response = ConnectionOpenOkBody.createAMQFrame((short) 0,
-                                                                    (byte) 8, (byte) 0,    // AMQP version (major, minor)
-                                                                    body.virtualHost);
-            stateManager.changeState(AMQState.CONNECTION_OPEN);
-            session.writeFrame(response);
-        }
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionSecureOkMethodHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionSecureOkMethodHandler.java
deleted file mode 100644
index 43986adea7..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionSecureOkMethodHandler.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.handler;
-
-import javax.security.sasl.SaslException;
-import javax.security.sasl.SaslServer;
-
-import org.apache.log4j.Logger;
-import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.AMQFrame;
-import org.apache.qpid.framing.ConnectionCloseBody;
-import org.apache.qpid.framing.ConnectionSecureBody;
-import org.apache.qpid.framing.ConnectionSecureOkBody;
-import org.apache.qpid.framing.ConnectionTuneBody;
-import org.apache.qpid.protocol.AMQConstant;
-import org.apache.qpid.protocol.AMQMethodEvent;
-import org.apache.qpid.server.protocol.AMQProtocolSession;
-import org.apache.qpid.server.protocol.HeartbeatConfig;
-import org.apache.qpid.server.registry.ApplicationRegistry;
-import org.apache.qpid.server.security.auth.manager.AuthenticationManager;
-import org.apache.qpid.server.security.auth.AuthenticationResult;
-import org.apache.qpid.server.security.auth.sasl.UsernamePrincipal;
-import org.apache.qpid.server.state.AMQState;
-import org.apache.qpid.server.state.AMQStateManager;
-import org.apache.qpid.server.state.StateAwareMethodListener;
-
-public class ConnectionSecureOkMethodHandler implements StateAwareMethodListener<ConnectionSecureOkBody>
-{
-    private static final Logger _logger = Logger.getLogger(ConnectionSecureOkMethodHandler.class);
-
-    private static ConnectionSecureOkMethodHandler _instance = new ConnectionSecureOkMethodHandler();
-
-    public static ConnectionSecureOkMethodHandler getInstance()
-    {
-        return _instance;
-    }
-
-    private ConnectionSecureOkMethodHandler()
-    {
-    }
-
-    public void methodReceived(AMQStateManager stateManager, AMQMethodEvent<ConnectionSecureOkBody> evt) throws AMQException
-    {
-        AMQProtocolSession session = stateManager.getProtocolSession();
-        ConnectionSecureOkBody body = evt.getMethod();
-
-        //fixme Vhost not defined yet
-        //session.getVirtualHost().getAuthenticationManager();
-        AuthenticationManager authMgr = ApplicationRegistry.getInstance().getAuthenticationManager();
-
-        SaslServer ss = session.getSaslServer();
-        if (ss == null)
-        {
-            throw new AMQException(null, "No SASL context set up in session", null);
-        }
-
-        AuthenticationResult authResult = authMgr.authenticate(ss, body.response);
-        switch (authResult.status)
-        {
-            case ERROR:
-                // Can't do this as we violate protocol. Need to send Close
-                // throw new AMQException(AMQConstant.NOT_ALLOWED.getCode(), AMQConstant.NOT_ALLOWED.getName());
-                _logger.info("Authentication failed");
-                stateManager.changeState(AMQState.CONNECTION_CLOSING);
-                // AMQP version change: Hardwire the version to 0-8 (major=8, minor=0)
-                // TODO: Connect this to the session version obtained from ProtocolInitiation for this session.
-                // Be aware of possible changes to parameter order as versions change.
-                AMQFrame close = ConnectionCloseBody.createAMQFrame(0,
-                    (byte)8, (byte)0,	// AMQP version (major, minor)
-                    ConnectionCloseBody.getClazz((byte)8, (byte)0),		// classId
-                    ConnectionCloseBody.getMethod((byte)8, (byte)0),	// methodId
-                    AMQConstant.NOT_ALLOWED.getCode(),	// replyCode
-                    AMQConstant.NOT_ALLOWED.getName());	// replyText
-                session.writeFrame(close);
-                disposeSaslServer(session);
-                break;
-            case SUCCESS:
-                _logger.info("Connected as: " + ss.getAuthorizationID());
-                stateManager.changeState(AMQState.CONNECTION_NOT_TUNED);
-                // TODO: Check the value of channelMax here: This should be the max
-                // value of a 2-byte unsigned integer (as channel is only 2 bytes on the wire),
-                // not Integer.MAX_VALUE (which is signed 4 bytes).
-                // AMQP version change: Hardwire the version to 0-8 (major=8, minor=0)
-                // TODO: Connect this to the session version obtained from ProtocolInitiation for this session.
-                // Be aware of possible changes to parameter order as versions change.
-                AMQFrame tune = ConnectionTuneBody.createAMQFrame(0,
-                    (byte)8, (byte)0,	// AMQP version (major, minor)
-                    Integer.MAX_VALUE,	// channelMax
-                    ConnectionStartOkMethodHandler.getConfiguredFrameSize(),	// frameMax
-                    HeartbeatConfig.getInstance().getDelay());	// heartbeat
-                session.writeFrame(tune);
-                session.setAuthorizedID(new UsernamePrincipal(ss.getAuthorizationID()));                
-                disposeSaslServer(session);
-                break;
-            case CONTINUE:
-                stateManager.changeState(AMQState.CONNECTION_NOT_AUTH);
-                // AMQP version change: Hardwire the version to 0-8 (major=8, minor=0)
-                // TODO: Connect this to the session version obtained from ProtocolInitiation for this session.
-                // Be aware of possible changes to parameter order as versions change.
-                AMQFrame challenge = ConnectionSecureBody.createAMQFrame(0,
-                    (byte)8, (byte)0,	// AMQP version (major, minor)
-                    authResult.challenge);	// challenge
-                session.writeFrame(challenge);
-        }
-    }
-
-    private void disposeSaslServer(AMQProtocolSession ps)
-    {
-        SaslServer ss = ps.getSaslServer();
-        if (ss != null)
-        {
-            ps.setSaslServer(null);
-            try
-            {
-                ss.dispose();
-            }
-            catch (SaslException e)
-            {
-                _logger.error("Error disposing of Sasl server: " + e);
-            }
-        }
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionStartOkMethodHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionStartOkMethodHandler.java
deleted file mode 100644
index 5dbd1b18de..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionStartOkMethodHandler.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.handler;
-
-import javax.security.sasl.SaslException;
-import javax.security.sasl.SaslServer;
-
-import org.apache.commons.configuration.Configuration;
-import org.apache.log4j.Logger;
-import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.AMQFrame;
-import org.apache.qpid.framing.ConnectionSecureBody;
-import org.apache.qpid.framing.ConnectionStartOkBody;
-import org.apache.qpid.framing.ConnectionTuneBody;
-import org.apache.qpid.framing.ConnectionCloseBody;
-import org.apache.qpid.protocol.AMQMethodEvent;
-import org.apache.qpid.protocol.AMQConstant;
-import org.apache.qpid.server.protocol.AMQProtocolSession;
-import org.apache.qpid.server.protocol.HeartbeatConfig;
-import org.apache.qpid.server.registry.ApplicationRegistry;
-import org.apache.qpid.server.security.auth.manager.AuthenticationManager;
-import org.apache.qpid.server.security.auth.AuthenticationResult;
-import org.apache.qpid.server.security.auth.sasl.UsernamePrincipal;
-import org.apache.qpid.server.state.AMQState;
-import org.apache.qpid.server.state.AMQStateManager;
-import org.apache.qpid.server.state.StateAwareMethodListener;
-
-
-public class ConnectionStartOkMethodHandler implements StateAwareMethodListener<ConnectionStartOkBody>
-{
-    private static final Logger _logger = Logger.getLogger(ConnectionStartOkMethodHandler.class);
-
-    private static ConnectionStartOkMethodHandler _instance = new ConnectionStartOkMethodHandler();
-
-    private static final int DEFAULT_FRAME_SIZE = 65536;
-
-    public static StateAwareMethodListener<ConnectionStartOkBody> getInstance()
-    {
-        return _instance;
-    }
-
-    private ConnectionStartOkMethodHandler()
-    {
-    }
-
-    public void methodReceived(AMQStateManager stateManager, AMQMethodEvent<ConnectionStartOkBody> evt) throws AMQException
-    {
-        AMQProtocolSession session = stateManager.getProtocolSession();
-        final ConnectionStartOkBody body = evt.getMethod();
-        _logger.info("SASL Mechanism selected: " + body.mechanism);
-        _logger.info("Locale selected: " + body.locale);
-
-        AuthenticationManager authMgr = ApplicationRegistry.getInstance().getAuthenticationManager();//session.getVirtualHost().getAuthenticationManager();
-
-        SaslServer ss = null;
-        try
-        {
-            ss = authMgr.createSaslServer(String.valueOf(body.mechanism), session.getLocalFQDN());
-
-            if (ss == null)
-            {
-                throw body.getConnectionException(AMQConstant.RESOURCE_ERROR, "Unable to create SASL Server:" + body.mechanism
-                );
-            }
-
-            session.setSaslServer(ss);
-
-            AuthenticationResult authResult = authMgr.authenticate(ss, body.response);
-
-            //save clientProperties
-            if (session.getClientProperties() == null)
-            {
-                session.setClientProperties(body.clientProperties);
-            }
-
-            switch (authResult.status)
-            {
-                case ERROR:
-                    _logger.info("Authentication failed");
-                    stateManager.changeState(AMQState.CONNECTION_CLOSING);
-                    // AMQP version change: Hardwire the version to 0-8 (major=8, minor=0)
-                    // TODO: Connect this to the session version obtained from ProtocolInitiation for this session.
-                    // Be aware of possible changes to parameter order as versions change.
-                    AMQFrame close = ConnectionCloseBody.createAMQFrame(0,
-                                                                        (byte) 8, (byte) 0,    // AMQP version (major, minor)
-                                                                        ConnectionCloseBody.getClazz((byte) 8, (byte) 0),        // classId
-                                                                        ConnectionCloseBody.getMethod((byte) 8, (byte) 0),    // methodId
-                                                                        AMQConstant.NOT_ALLOWED.getCode(),    // replyCode
-                                                                        AMQConstant.NOT_ALLOWED.getName());    // replyText
-                    session.writeFrame(close);
-                    disposeSaslServer(session);
-                    break;
-
-                case SUCCESS:
-                    _logger.info("Connected as: " + ss.getAuthorizationID());
-                    session.setAuthorizedID(new UsernamePrincipal(ss.getAuthorizationID()));
-
-                    stateManager.changeState(AMQState.CONNECTION_NOT_TUNED);
-                    // AMQP version change: Hardwire the version to 0-8 (major=8, minor=0)
-                    // TODO: Connect this to the session version obtained from ProtocolInitiation for this session.
-                    // Be aware of possible changes to parameter order as versions change.
-                    AMQFrame tune = ConnectionTuneBody.createAMQFrame(0,
-                                                                      (byte) 8, (byte) 0,    // AMQP version (major, minor)
-                                                                      Integer.MAX_VALUE,    // channelMax
-                                                                      getConfiguredFrameSize(),    // frameMax
-                                                                      HeartbeatConfig.getInstance().getDelay());    // heartbeat
-                    session.writeFrame(tune);
-                    break;
-                case CONTINUE:
-                    stateManager.changeState(AMQState.CONNECTION_NOT_AUTH);
-                    // AMQP version change: Hardwire the version to 0-8 (major=8, minor=0)
-                    // TODO: Connect this to the session version obtained from ProtocolInitiation for this session.
-                    // Be aware of possible changes to parameter order as versions change.
-                    AMQFrame challenge = ConnectionSecureBody.createAMQFrame(0,
-                                                                             (byte) 8, (byte) 0,    // AMQP version (major, minor)
-                                                                             authResult.challenge);    // challenge
-                    session.writeFrame(challenge);
-            }
-        }
-        catch (SaslException e)
-        {
-            disposeSaslServer(session);
-            throw new AMQException(null, "SASL error: " + e, e);
-        }
-    }
-
-    private void disposeSaslServer(AMQProtocolSession ps)
-    {
-        SaslServer ss = ps.getSaslServer();
-        if (ss != null)
-        {
-            ps.setSaslServer(null);
-            try
-            {
-                ss.dispose();
-            }
-            catch (SaslException e)
-            {
-                _logger.error("Error disposing of Sasl server: " + e);
-            }
-        }
-    }
-
-    static int getConfiguredFrameSize()
-    {
-        final Configuration config = ApplicationRegistry.getInstance().getConfiguration();
-        final int framesize = config.getInt("advanced.framesize", DEFAULT_FRAME_SIZE);
-        _logger.info("Framesize set to " + framesize);
-        return framesize;
-    }
-}
-
-
-
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionTuneOkMethodHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionTuneOkMethodHandler.java
deleted file mode 100644
index ab7695955c..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionTuneOkMethodHandler.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.handler;
-
-import org.apache.log4j.Logger;
-import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.ConnectionTuneOkBody;
-import org.apache.qpid.protocol.AMQMethodEvent;
-import org.apache.qpid.server.protocol.AMQProtocolSession;
-import org.apache.qpid.server.state.AMQState;
-import org.apache.qpid.server.state.AMQStateManager;
-import org.apache.qpid.server.state.StateAwareMethodListener;
-
-public class ConnectionTuneOkMethodHandler implements StateAwareMethodListener<ConnectionTuneOkBody>
-{
-    private static final Logger _logger = Logger.getLogger(ConnectionTuneOkMethodHandler.class);
-
-    private static ConnectionTuneOkMethodHandler _instance = new ConnectionTuneOkMethodHandler();
-
-    public static ConnectionTuneOkMethodHandler getInstance()
-    {
-        return _instance;
-    }
-
-    public void methodReceived(AMQStateManager stateManager, AMQMethodEvent<ConnectionTuneOkBody> evt) throws AMQException
-    {
-        AMQProtocolSession session = stateManager.getProtocolSession();
-        ConnectionTuneOkBody body = evt.getMethod();
-        if (_logger.isDebugEnabled())
-        {
-            _logger.debug(body);
-        }
-        stateManager.changeState(AMQState.CONNECTION_NOT_OPENED);
-        session.initHeartbeats(body.heartbeat);
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ExchangeBoundHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ExchangeBoundHandler.java
deleted file mode 100644
index 0ff19bdf9e..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ExchangeBoundHandler.java
+++ /dev/null
@@ -1,205 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.handler;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.AMQFrame;
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.framing.ExchangeBoundBody;
-import org.apache.qpid.framing.ExchangeBoundOkBody;
-import org.apache.qpid.protocol.AMQMethodEvent;
-import org.apache.qpid.server.exchange.Exchange;
-import org.apache.qpid.server.protocol.AMQProtocolSession;
-import org.apache.qpid.server.queue.AMQQueue;
-import org.apache.qpid.server.queue.QueueRegistry;
-import org.apache.qpid.server.state.AMQStateManager;
-import org.apache.qpid.server.state.StateAwareMethodListener;
-import org.apache.qpid.server.virtualhost.VirtualHost;
-
-/**
- * @author Apache Software Foundation
- */
-public class ExchangeBoundHandler implements StateAwareMethodListener<ExchangeBoundBody>
-{
-    private static final ExchangeBoundHandler _instance = new ExchangeBoundHandler();
-
-    public static final int OK = 0;
-
-    public static final int EXCHANGE_NOT_FOUND = 1;
-
-    public static final int QUEUE_NOT_FOUND = 2;
-
-    public static final int NO_BINDINGS = 3;
-
-    public static final int QUEUE_NOT_BOUND = 4;
-
-    public static final int NO_QUEUE_BOUND_WITH_RK = 5;
-
-    public static final int SPECIFIC_QUEUE_NOT_BOUND_WITH_RK = 6;
-
-    public static ExchangeBoundHandler getInstance()
-    {
-        return _instance;
-    }
-
-    private ExchangeBoundHandler()
-    {
-    }
-
-    public void methodReceived(AMQStateManager stateManager, AMQMethodEvent<ExchangeBoundBody> evt) throws AMQException
-    {
-        AMQProtocolSession session = stateManager.getProtocolSession();
-        VirtualHost virtualHost = session.getVirtualHost();
-        QueueRegistry queueRegistry = virtualHost.getQueueRegistry();
-
-        // AMQP version change: Hardwire the version to 0-8 (major=8, minor=0)
-        // TODO: Connect this to the session version obtained from ProtocolInitiation for this session.
-        byte major = (byte)8;
-        byte minor = (byte)0;
-        
-        ExchangeBoundBody body = evt.getMethod();
-
-        AMQShortString exchangeName = body.exchange;
-        AMQShortString queueName = body.queue;
-        AMQShortString routingKey = body.routingKey;
-        if (exchangeName == null)
-        {
-            throw new AMQException(null, "Exchange exchange must not be null", null);
-        }
-        Exchange exchange = virtualHost.getExchangeRegistry().getExchange(exchangeName);
-        AMQFrame response;
-        if (exchange == null)
-        {
-            // AMQP version change:  Be aware of possible changes to parameter order as versions change.
-            response = ExchangeBoundOkBody.createAMQFrame(evt.getChannelId(),
-                major, minor,	// AMQP version (major, minor)
-                EXCHANGE_NOT_FOUND,	// replyCode
-                new AMQShortString("Exchange " + exchangeName + " not found"));	// replyText
-        }
-        else if (routingKey == null)
-        {
-            if (queueName == null)
-            {
-                if (exchange.hasBindings())
-                {
-                    // AMQP version change:  Be aware of possible changes to parameter order as versions change.
-                    response = ExchangeBoundOkBody.createAMQFrame(evt.getChannelId(),
-                        major, minor,	// AMQP version (major, minor)
-                        OK,	// replyCode
-                        null);	// replyText
-                }
-                else
-                {
-                    // AMQP version change:  Be aware of possible changes to parameter order as versions change.
-                    response = ExchangeBoundOkBody.createAMQFrame(evt.getChannelId(),
-                        major, minor,	// AMQP version (major, minor)
-                        NO_BINDINGS,	// replyCode
-                        null);	// replyText
-                }
-            }
-            else
-            {
-
-                AMQQueue queue = queueRegistry.getQueue(queueName);
-                if (queue == null)
-                {
-                    // AMQP version change:  Be aware of possible changes to parameter order as versions change.
-                    response = ExchangeBoundOkBody.createAMQFrame(evt.getChannelId(),
-                        major, minor,	// AMQP version (major, minor)
-                        QUEUE_NOT_FOUND,	// replyCode
-                        new AMQShortString("Queue " + queueName + " not found"));	// replyText
-                }
-                else
-                {
-                    if (exchange.isBound(queue))
-                    {
-                        // AMQP version change:  Be aware of possible changes to parameter order as versions change.
-                        response = ExchangeBoundOkBody.createAMQFrame(evt.getChannelId(),
-                            major, minor,	// AMQP version (major, minor)
-                            OK,	// replyCode
-                            null);	// replyText
-                    }
-                    else
-                    {
-                        // AMQP version change:  Be aware of possible changes to parameter order as versions change.
-                        response = ExchangeBoundOkBody.createAMQFrame(evt.getChannelId(),
-                            major, minor,	// AMQP version (major, minor)
-                            QUEUE_NOT_BOUND,	// replyCode
-                            new AMQShortString("Queue " + queueName + " not bound to exchange " + exchangeName));	// replyText
-                    }
-                }
-            }
-        }
-        else if (queueName != null)
-        {
-            AMQQueue queue = queueRegistry.getQueue(queueName);
-            if (queue == null)
-            {
-                // AMQP version change:  Be aware of possible changes to parameter order as versions change.
-                response = ExchangeBoundOkBody.createAMQFrame(evt.getChannelId(),
-                    major, minor,	// AMQP version (major, minor)
-                    QUEUE_NOT_FOUND,	// replyCode
-                    new AMQShortString("Queue " + queueName + " not found"));	// replyText
-            }
-            else
-            {
-                if (exchange.isBound(body.routingKey, queue))
-                {
-                    // AMQP version change:  Be aware of possible changes to parameter order as versions change.
-                    response = ExchangeBoundOkBody.createAMQFrame(evt.getChannelId(),
-                        major, minor,	// AMQP version (major, minor)
-                        OK,	// replyCode
-                        null);	// replyText
-                }
-                else
-                {
-                    // AMQP version change:  Be aware of possible changes to parameter order as versions change.
-                    response = ExchangeBoundOkBody.createAMQFrame(evt.getChannelId(),
-                        major, minor,	// AMQP version (major, minor)
-                        SPECIFIC_QUEUE_NOT_BOUND_WITH_RK,	// replyCode
-                        new AMQShortString("Queue " + queueName + " not bound with routing key " +
-                        body.routingKey + " to exchange " + exchangeName));	// replyText
-                }
-            }
-        }
-        else
-        {
-            if (exchange.isBound(body.routingKey))
-            {
-                // AMQP version change:  Be aware of possible changes to parameter order as versions change.
-                response = ExchangeBoundOkBody.createAMQFrame(evt.getChannelId(),
-                    major, minor,	// AMQP version (major, minor)
-                    OK,	// replyCode
-                    null);	// replyText
-            }
-            else
-            {
-                // AMQP version change:  Be aware of possible changes to parameter order as versions change.
-                response = ExchangeBoundOkBody.createAMQFrame(evt.getChannelId(),
-                    major, minor,	// AMQP version (major, minor)
-                    NO_QUEUE_BOUND_WITH_RK,	// replyCode
-                    new AMQShortString("No queue bound with routing key " + body.routingKey +
-                    " to exchange " + exchangeName));	// replyText
-            }
-        }
-        session.writeFrame(response);
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ExchangeDeclareHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ExchangeDeclareHandler.java
deleted file mode 100644
index f0f6fde08c..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ExchangeDeclareHandler.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.handler;
-
-import org.apache.log4j.Logger;
-import org.apache.qpid.AMQConnectionException;
-import org.apache.qpid.AMQException;
-import org.apache.qpid.AMQUnknownExchangeType;
-import org.apache.qpid.framing.AMQFrame;
-import org.apache.qpid.framing.ExchangeDeclareBody;
-import org.apache.qpid.framing.ExchangeDeclareOkBody;
-import org.apache.qpid.protocol.AMQConstant;
-import org.apache.qpid.protocol.AMQMethodEvent;
-import org.apache.qpid.server.exchange.Exchange;
-import org.apache.qpid.server.exchange.ExchangeFactory;
-import org.apache.qpid.server.exchange.ExchangeRegistry;
-import org.apache.qpid.server.protocol.AMQProtocolSession;
-import org.apache.qpid.server.state.AMQStateManager;
-import org.apache.qpid.server.state.StateAwareMethodListener;
-import org.apache.qpid.server.virtualhost.VirtualHost;
-
-public class ExchangeDeclareHandler implements StateAwareMethodListener<ExchangeDeclareBody>
-{
-    private static final Logger _logger = Logger.getLogger(ExchangeDeclareHandler.class);
-
-    private static final ExchangeDeclareHandler _instance = new ExchangeDeclareHandler();
-
-    public static ExchangeDeclareHandler getInstance()
-    {
-        return _instance;
-    }
-
-
-
-    private ExchangeDeclareHandler()
-    {
-    }
-
-    public void methodReceived(AMQStateManager stateManager, AMQMethodEvent<ExchangeDeclareBody> evt) throws AMQException
-    {
-        AMQProtocolSession session = stateManager.getProtocolSession();
-        VirtualHost virtualHost = session.getVirtualHost();
-        ExchangeRegistry exchangeRegistry = virtualHost.getExchangeRegistry();
-        ExchangeFactory exchangeFactory = virtualHost.getExchangeFactory();
-        
-        final ExchangeDeclareBody body = evt.getMethod();
-        if (_logger.isDebugEnabled())
-        {
-            _logger.debug("Request to declare exchange of type " + body.type + " with name " + body.exchange);
-        }
-        synchronized(exchangeRegistry)
-        {
-            Exchange exchange = exchangeRegistry.getExchange(body.exchange);
-
-
-
-            if (exchange == null)
-            {
-                if(body.passive && ((body.type == null) || body.type.length() ==0))
-                {
-                    throw body.getChannelException(AMQConstant.NOT_FOUND, "Unknown exchange: " + body.exchange);                    
-                }
-                else
-                {
-                    try
-                    {
-
-                    exchange = exchangeFactory.createExchange(body.exchange == null ? null : body.exchange.intern(),
-                                                              body.type == null ? null : body.type.intern(), 
-                                                              body.durable,
-                                                              body.passive, body.ticket);
-                    exchangeRegistry.registerExchange(exchange);
-                    }
-                    catch(AMQUnknownExchangeType e)
-                    {
-                        throw body.getConnectionException(AMQConstant.COMMAND_INVALID, "Unknown exchange: " + body.exchange,e);
-                    }
-                }
-            }
-            else if (!exchange.getType().equals(body.type))
-            {
-
-                throw new AMQConnectionException(AMQConstant.NOT_ALLOWED, "Attempt to redeclare exchange: " + body.exchange + " of type " + exchange.getType() + " to " + body.type +".",body.getClazz(), body.getMethod(),body.getMajor(),body.getMinor(), null);    
-            }
-
-        }
-        if(!body.nowait)
-        {
-            // AMQP version change: Hardwire the version to 0-8 (major=8, minor=0)
-            // TODO: Connect this to the session version obtained from ProtocolInitiation for this session.
-            // Be aware of possible changes to parameter order as versions change.
-            AMQFrame response = ExchangeDeclareOkBody.createAMQFrame(evt.getChannelId(), (byte)8, (byte)0);
-            session.writeFrame(response);
-        }
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ExchangeDeleteHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ExchangeDeleteHandler.java
deleted file mode 100644
index f9926c399c..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ExchangeDeleteHandler.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.handler;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.AMQFrame;
-import org.apache.qpid.framing.ExchangeDeleteBody;
-import org.apache.qpid.framing.ExchangeDeleteOkBody;
-import org.apache.qpid.protocol.AMQMethodEvent;
-import org.apache.qpid.server.exchange.ExchangeInUseException;
-import org.apache.qpid.server.exchange.ExchangeRegistry;
-import org.apache.qpid.server.protocol.AMQProtocolSession;
-import org.apache.qpid.server.state.AMQStateManager;
-import org.apache.qpid.server.state.StateAwareMethodListener;
-import org.apache.qpid.server.virtualhost.VirtualHost;
-
-public class ExchangeDeleteHandler implements StateAwareMethodListener<ExchangeDeleteBody>
-{
-    private static final ExchangeDeleteHandler _instance = new ExchangeDeleteHandler();
-
-    public static ExchangeDeleteHandler getInstance()
-    {
-        return _instance;
-    }
-
-    private ExchangeDeleteHandler()
-    {
-    }
-
-    public void methodReceived(AMQStateManager stateManager, AMQMethodEvent<ExchangeDeleteBody> evt) throws AMQException
-    {
-        AMQProtocolSession session = stateManager.getProtocolSession();
-        VirtualHost virtualHost = session.getVirtualHost();
-        ExchangeRegistry exchangeRegistry = virtualHost.getExchangeRegistry();
-
-        ExchangeDeleteBody body = evt.getMethod();
-        try
-        {
-            exchangeRegistry.unregisterExchange(body.exchange, body.ifUnused);
-            // AMQP version change: Hardwire the version to 0-8 (major=8, minor=0)
-            // TODO: Connect this to the session version obtained from ProtocolInitiation for this session.
-            // Be aware of possible changes to parameter order as versions change.
-            AMQFrame response = ExchangeDeleteOkBody.createAMQFrame(evt.getChannelId(), (byte)8, (byte)0);
-            session.writeFrame(response);
-        }
-        catch (ExchangeInUseException e)
-        {
-            // TODO: sort out consistent channel close mechanism that does all clean up etc.
-        }
-
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/OnCurrentThreadExecutor.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/OnCurrentThreadExecutor.java
deleted file mode 100644
index ac516b6133..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/OnCurrentThreadExecutor.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.handler;
-
-import java.util.concurrent.Executor;
-
-/**
- * An executor that executes the task on the current thread.
- */
-public class OnCurrentThreadExecutor implements Executor
-{
-    public void execute(Runnable command)
-    {
-        command.run();
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/QueueBindHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/QueueBindHandler.java
deleted file mode 100644
index 3e68069838..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/QueueBindHandler.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.handler;
-
-import org.apache.log4j.Logger;
-import org.apache.qpid.AMQException;
-import org.apache.qpid.AMQInvalidRoutingKeyException;
-import org.apache.qpid.framing.AMQFrame;
-import org.apache.qpid.framing.QueueBindBody;
-import org.apache.qpid.framing.QueueBindOkBody;
-import org.apache.qpid.protocol.AMQConstant;
-import org.apache.qpid.protocol.AMQMethodEvent;
-import org.apache.qpid.server.AMQChannel;
-import org.apache.qpid.server.exchange.Exchange;
-import org.apache.qpid.server.exchange.ExchangeRegistry;
-import org.apache.qpid.server.protocol.AMQProtocolSession;
-import org.apache.qpid.server.queue.AMQQueue;
-import org.apache.qpid.server.queue.QueueRegistry;
-import org.apache.qpid.server.state.AMQStateManager;
-import org.apache.qpid.server.state.StateAwareMethodListener;
-import org.apache.qpid.server.virtualhost.VirtualHost;
-
-public class QueueBindHandler implements StateAwareMethodListener<QueueBindBody>
-{
-    private static final Logger _log = Logger.getLogger(QueueBindHandler.class);
-
-    private static final QueueBindHandler _instance = new QueueBindHandler();
-
-    public static QueueBindHandler getInstance()
-    {
-        return _instance;
-    }
-
-    private QueueBindHandler()
-    {
-    }
-
-    public void methodReceived(AMQStateManager stateManager, AMQMethodEvent<QueueBindBody> evt) throws AMQException
-    {
-        AMQProtocolSession session = stateManager.getProtocolSession();
-        VirtualHost virtualHost = session.getVirtualHost();
-        ExchangeRegistry exchangeRegistry = virtualHost.getExchangeRegistry();
-        QueueRegistry queueRegistry = virtualHost.getQueueRegistry();
-
-        final QueueBindBody body = evt.getMethod();
-        final AMQQueue queue;
-        if (body.queue == null)
-        {
-            AMQChannel channel = session.getChannel(evt.getChannelId());
-
-            if (channel == null)
-            {
-                throw body.getChannelNotFoundException(evt.getChannelId());
-            }
-
-            queue = channel.getDefaultQueue();
-
-            if (queue == null)
-            {
-                throw body.getChannelException(AMQConstant.NOT_FOUND, "No default queue defined on channel and queue was null");
-            }
-
-            if (body.routingKey == null)
-            {
-                body.routingKey = queue.getName();
-            }
-        }
-        else
-        {
-            queue = queueRegistry.getQueue(body.queue);
-        }
-
-        if (queue == null)
-        {
-            throw body.getChannelException(AMQConstant.NOT_FOUND, "Queue " + body.queue + " does not exist.");
-        }
-        final Exchange exch = exchangeRegistry.getExchange(body.exchange);
-        if (exch == null)
-        {
-            throw body.getChannelException(AMQConstant.NOT_FOUND, "Exchange " + body.exchange + " does not exist.");
-        }
-
-        if (body.routingKey != null)
-        {
-            body.routingKey = body.routingKey.intern();
-        }
-
-        try
-        {
-            if (!exch.isBound(body.routingKey, body.arguments, queue))
-            {
-                queue.bind(body.routingKey, body.arguments, exch);
-            }
-        }
-        catch (AMQInvalidRoutingKeyException rke)
-        {
-            throw body.getChannelException(AMQConstant.INVALID_ROUTING_KEY, body.routingKey.toString());
-        }
-        catch (AMQException e)
-        {
-            throw body.getChannelException(AMQConstant.CHANNEL_ERROR, e.toString());
-        }
-
-        if (_log.isInfoEnabled())
-        {
-            _log.info("Binding queue " + queue + " to exchange " + exch + " with routing key " + body.routingKey);
-        }
-        if (!body.nowait)
-        {
-            // AMQP version change: Hardwire the version to 0-8 (major=8, minor=0)
-            // TODO: Connect this to the session version obtained from ProtocolInitiation for this session.
-            // Be aware of possible changes to parameter order as versions change.
-            final AMQFrame response = QueueBindOkBody.createAMQFrame(evt.getChannelId(), (byte) 8, (byte) 0);
-            session.writeFrame(response);
-        }
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/QueueDeclareHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/QueueDeclareHandler.java
deleted file mode 100644
index 9be0dabb68..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/QueueDeclareHandler.java
+++ /dev/null
@@ -1,215 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.handler;
-
-import java.text.MessageFormat;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import org.apache.log4j.Logger;
-import org.apache.qpid.AMQException;
-import org.apache.qpid.configuration.Configured;
-import org.apache.qpid.exchange.ExchangeDefaults;
-import org.apache.qpid.framing.AMQFrame;
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.framing.QueueDeclareBody;
-import org.apache.qpid.framing.QueueDeclareOkBody;
-import org.apache.qpid.protocol.AMQConstant;
-import org.apache.qpid.protocol.AMQMethodEvent;
-import org.apache.qpid.server.configuration.Configurator;
-import org.apache.qpid.server.configuration.VirtualHostConfiguration;
-import org.apache.qpid.server.exchange.Exchange;
-import org.apache.qpid.server.exchange.ExchangeRegistry;
-import org.apache.qpid.server.protocol.AMQProtocolSession;
-import org.apache.qpid.server.queue.AMQQueue;
-import org.apache.qpid.server.queue.QueueRegistry;
-import org.apache.qpid.server.state.AMQStateManager;
-import org.apache.qpid.server.state.StateAwareMethodListener;
-import org.apache.qpid.server.store.MessageStore;
-import org.apache.qpid.server.virtualhost.VirtualHost;
-import org.apache.qpid.server.AMQChannel;
-import org.apache.commons.configuration.Configuration;
-
-public class QueueDeclareHandler implements StateAwareMethodListener<QueueDeclareBody>
-{
-    private static final Logger _log = Logger.getLogger(QueueDeclareHandler.class);
-
-    private static final QueueDeclareHandler _instance = new QueueDeclareHandler();
-
-    public static QueueDeclareHandler getInstance()
-    {
-        return _instance;
-    }
-
-    @Configured(path = "queue.auto_register", defaultValue = "false")
-    public boolean autoRegister;
-
-    private final AtomicInteger _counter = new AtomicInteger();
-
-
-    protected QueueDeclareHandler()
-    {
-        Configurator.configure(this);
-    }
-
-    public void methodReceived(AMQStateManager stateManager, AMQMethodEvent<QueueDeclareBody> evt) throws AMQException
-    {
-        AMQProtocolSession session = stateManager.getProtocolSession();
-        VirtualHost virtualHost = session.getVirtualHost();
-        ExchangeRegistry exchangeRegistry = virtualHost.getExchangeRegistry();
-        QueueRegistry queueRegistry = virtualHost.getQueueRegistry();
-        MessageStore store = virtualHost.getMessageStore();
-
-        QueueDeclareBody body = evt.getMethod();
-
-        // if we aren't given a queue name, we create one which we return to the client
-        if (body.queue == null)
-        {
-            body.queue = createName();
-        }
-
-        AMQQueue queue;
-        //TODO: do we need to check that the queue already exists with exactly the same "configuration"?
-
-        synchronized (queueRegistry)
-        {
-
-            if (((queue = queueRegistry.getQueue(body.queue)) == null))
-            {
-                if(body.queue != null)
-                {
-                    body.queue = body.queue.intern();
-                }
-
-                if (body.passive)
-                {
-                    String msg = "Queue: " + body.queue + " not found on VirtualHost(" + virtualHost + ").";
-                    throw body.getChannelException(AMQConstant.NOT_FOUND, msg);
-                }
-                else
-                {
-                    queue = createQueue(body, virtualHost, session);
-                    if (queue.isDurable() && !queue.isAutoDelete())
-                    {
-                        //DTX MessageStore
-//                        try
-//                        {
-                            store.createQueue(queue);
-//                        } catch (Exception e)
-//                        {
-//                           throw new AMQException(null, "Problem when creating queue " + queue,  e);
-//                        }
-                    }
-                    queueRegistry.registerQueue(queue);
-                    if (autoRegister)
-                    {
-                        Exchange defaultExchange = exchangeRegistry.getDefaultExchange();
-
-                        queue.bind(body.queue, null, defaultExchange);
-                        _log.info("Queue " + body.queue + " bound to default exchange(" + defaultExchange.getName() + ")");
-                    }
-                }
-            }
-            else if (queue.getOwner() != null && !session.getContextKey().equals(queue.getOwner()))
-            {
-                throw body.getChannelException(AMQConstant.ALREADY_EXISTS, "Cannot declare queue('" + body.queue + "'),"
-                                                                           + " as exclusive queue with same name "
-                                                                           + "declared on another client ID('"
-                                                                           + queue.getOwner() + "')");
-            }
-
-            AMQChannel channel = session.getChannel(evt.getChannelId());
-
-            if (channel == null)
-            {
-                throw body.getChannelNotFoundException(evt.getChannelId());
-            }
-
-            //set this as the default queue on the channel:
-            channel.setDefaultQueue(queue);
-        }
-
-        if (!body.nowait)
-        {
-            // AMQP version change: Hardwire the version to 0-8 (major=8, minor=0)
-            // TODO: Connect this to the session version obtained from ProtocolInitiation for this session.
-            // Be aware of possible changes to parameter order as versions change.
-            AMQFrame response = QueueDeclareOkBody.createAMQFrame(evt.getChannelId(),
-                                                                  (byte) 8, (byte) 0,    // AMQP version (major, minor)
-                                                                  queue.getConsumerCount(), // consumerCount
-                                                                  queue.getMessageCount(), // messageCount
-                                                                  body.queue); // queue
-            _log.info("Queue " + body.queue + " declared successfully");
-            session.writeFrame(response);
-        }
-    }
-
-    protected AMQShortString createName()
-    {
-        return new AMQShortString("tmp_" + pad(_counter.incrementAndGet()));
-    }
-
-    protected static String pad(int value)
-    {
-        return MessageFormat.format("{0,number,0000000000000}", value);
-    }
-
-    protected AMQQueue createQueue(QueueDeclareBody body, VirtualHost virtualHost, final AMQProtocolSession session)
-            throws AMQException
-    {
-        final QueueRegistry registry = virtualHost.getQueueRegistry();
-        AMQShortString owner = body.exclusive ? session.getContextKey() : null;
-        final AMQQueue queue = new AMQQueue(body.queue, body.durable, owner, body.autoDelete, virtualHost);
-        final AMQShortString queueName = queue.getName();
-
-        if (body.exclusive && !body.durable)
-        {
-            final AMQProtocolSession.Task deleteQueueTask =
-                    new AMQProtocolSession.Task()
-                    {
-                        public void doTask(AMQProtocolSession session) throws AMQException
-                        {
-                            if (registry.getQueue(queueName) == queue)
-                            {
-                                queue.delete();
-                            }
-                        }
-                    };
-
-            session.addSessionCloseTask(deleteQueueTask);
-
-            queue.addQueueDeleteTask(new AMQQueue.Task()
-            {
-                public void doTask(AMQQueue queue)
-                {
-                    session.removeSessionCloseTask(deleteQueueTask);
-                }
-            });
-        }// if exclusive and not durable
-
-        Configuration virtualHostDefaultQueueConfiguration = VirtualHostConfiguration.getDefaultQueueConfiguration(queue);
-        if (virtualHostDefaultQueueConfiguration != null)
-        {
-            Configurator.configure(queue, virtualHostDefaultQueueConfiguration);
-        }
-
-        return queue;
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/QueueDeleteHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/QueueDeleteHandler.java
deleted file mode 100644
index edeb6f1f48..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/QueueDeleteHandler.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.handler;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.QueueDeleteBody;
-import org.apache.qpid.framing.QueueDeleteOkBody;
-import org.apache.qpid.protocol.AMQMethodEvent;
-import org.apache.qpid.protocol.AMQConstant;
-import org.apache.qpid.server.protocol.AMQProtocolSession;
-import org.apache.qpid.server.queue.AMQQueue;
-import org.apache.qpid.server.queue.QueueRegistry;
-import org.apache.qpid.server.state.AMQStateManager;
-import org.apache.qpid.server.state.StateAwareMethodListener;
-import org.apache.qpid.server.store.MessageStore;
-import org.apache.qpid.server.virtualhost.VirtualHost;
-import org.apache.qpid.server.AMQChannel;
-import org.apache.qpid.server.exception.InternalErrorException;
-import org.apache.qpid.server.exception.QueueDoesntExistException;
-
-public class QueueDeleteHandler implements StateAwareMethodListener<QueueDeleteBody>
-{
-    private static final QueueDeleteHandler _instance = new QueueDeleteHandler();
-
-    public static QueueDeleteHandler getInstance()
-    {
-        return _instance;
-    }
-
-    private final boolean _failIfNotFound;
-
-    public QueueDeleteHandler()
-    {
-        this(true);
-    }
-
-    public QueueDeleteHandler(boolean failIfNotFound)
-    {
-        _failIfNotFound = failIfNotFound;
-
-    }
-
-    public void methodReceived(AMQStateManager stateManager, AMQMethodEvent<QueueDeleteBody> evt) throws AMQException
-    {
-        AMQProtocolSession session = stateManager.getProtocolSession();
-        VirtualHost virtualHost = session.getVirtualHost();
-        QueueRegistry queueRegistry = virtualHost.getQueueRegistry();
-        MessageStore store = virtualHost.getMessageStore();
-
-        QueueDeleteBody body = evt.getMethod();
-        AMQQueue queue;
-        if (body.queue == null)
-        {
-            AMQChannel channel = session.getChannel(evt.getChannelId());
-
-            if (channel == null)
-            {
-                throw body.getChannelNotFoundException(evt.getChannelId());
-            }
-
-            //get the default queue on the channel:            
-            queue = channel.getDefaultQueue();
-        }
-        else
-        {
-            queue = queueRegistry.getQueue(body.queue);
-        }
-
-        if (queue == null)
-        {
-            if (_failIfNotFound)
-            {
-                throw body.getChannelException(AMQConstant.NOT_FOUND, "Queue " + body.queue + " does not exist.");
-            }
-        }
-        else
-        {
-            if (body.ifEmpty && !queue.isEmpty())
-            {
-                throw body.getChannelException(AMQConstant.IN_USE, "Queue: " + body.queue + " is not empty.");
-            }
-            else if (body.ifUnused && !queue.isUnused())
-            {
-                // TODO - Error code
-                throw body.getChannelException(AMQConstant.IN_USE, "Queue: " + body.queue + " is still used.");
-
-            }
-            else
-            {
-                int purged = queue.delete(body.ifUnused, body.ifEmpty);
-
-                if (queue.isDurable())
-                {
-                    try
-                    {
-                        //DTX MessageStore
-//                        store.destroyQueue(queue);                        
-                        store.removeQueue(queue.getName());
-                    } catch (Exception e)
-                    {
-                      throw new AMQException(null, "problem when destroying queue " + queue, e);
-                    }
-                }
-                
-                // AMQP version change: Hardwire the version to 0-8 (major=8, minor=0)
-                // TODO: Connect this to the session version obtained from ProtocolInitiation for this session.
-                // Be aware of possible changes to parameter order as versions change.
-                session.writeFrame(QueueDeleteOkBody.createAMQFrame(evt.getChannelId(),
-                                                                    (byte) 8, (byte) 0,    // AMQP version (major, minor)
-                                                                    purged));    // messageCount
-            }
-        }
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/QueuePurgeHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/QueuePurgeHandler.java
deleted file mode 100644
index 3e1937bb43..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/QueuePurgeHandler.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*

- *  Licensed to the Apache Software Foundation (ASF) under one

- *  or more contributor license agreements.  See the NOTICE file

- *  distributed with this work for additional information

- *  regarding copyright ownership.  The ASF licenses this file

- *  to you under the Apache License, Version 2.0 (the

- *  "License"); you may not use this file except in compliance

- *  with the License.  You may obtain a copy of the License at

- *

- *    http://www.apache.org/licenses/LICENSE-2.0

- *

- *  Unless required by applicable law or agreed to in writing,

- *  software distributed under the License is distributed on an

- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- *  KIND, either express or implied.  See the License for the

- *  specific language governing permissions and limitations

- *  under the License.

- *

- *

- */

-

-package org.apache.qpid.server.handler;

-

-import org.apache.qpid.AMQException;

-import org.apache.qpid.framing.QueuePurgeBody;

-import org.apache.qpid.framing.QueuePurgeOkBody;

-import org.apache.qpid.protocol.AMQConstant;

-import org.apache.qpid.protocol.AMQMethodEvent;

-import org.apache.qpid.server.protocol.AMQProtocolSession;

-import org.apache.qpid.server.queue.AMQQueue;

-import org.apache.qpid.server.queue.QueueRegistry;

-import org.apache.qpid.server.state.AMQStateManager;

-import org.apache.qpid.server.state.StateAwareMethodListener;

-import org.apache.qpid.server.virtualhost.VirtualHost;

-import org.apache.qpid.server.AMQChannel;

-

-public class QueuePurgeHandler implements StateAwareMethodListener<QueuePurgeBody>

-{

-    private static final QueuePurgeHandler _instance = new QueuePurgeHandler();

-

-    public static QueuePurgeHandler getInstance()

-    {

-        return _instance;

-    }

-

-    private final boolean _failIfNotFound;

-

-    public QueuePurgeHandler()

-    {

-        this(true);

-    }

-

-    public QueuePurgeHandler(boolean failIfNotFound)

-    {

-        _failIfNotFound = failIfNotFound;

-    }

-

-    public void methodReceived(AMQStateManager stateManager, AMQMethodEvent<QueuePurgeBody> evt) throws AMQException

-    {

-        AMQProtocolSession session = stateManager.getProtocolSession();

-        VirtualHost virtualHost = session.getVirtualHost();

-        QueueRegistry queueRegistry = virtualHost.getQueueRegistry();

-

-        AMQChannel channel = session.getChannel(evt.getChannelId());

-

-        QueuePurgeBody body = evt.getMethod();

-        AMQQueue queue;

-        if(body.queue == null)

-        {

-

-           if (channel == null)

-           {

-               throw body.getChannelNotFoundException(evt.getChannelId());

-           }

-

-           //get the default queue on the channel:

-           queue = channel.getDefaultQueue();

-            

-            if(queue == null)

-            {

-                if(_failIfNotFound)

-                {

-                    throw body.getConnectionException(AMQConstant.NOT_ALLOWED,"No queue specified.");

-                }

-            }

-        }

-        else

-        {

-            queue = queueRegistry.getQueue(body.queue);

-        }

-

-        if(queue == null)

-        {

-            if(_failIfNotFound)

-            {

-                throw body.getChannelException(AMQConstant.NOT_FOUND, "Queue " + body.queue + " does not exist.");

-            }

-        }

-        else

-        {

-                long purged = queue.clearQueue(channel.getStoreContext());

-

-

-                if(!body.nowait)

-                {

-                    // AMQP version change: Hardwire the version to 0-8 (major=8, minor=0)

-                    // TODO: Connect this to the session version obtained from ProtocolInitiation for this session.

-                    // Be aware of possible changes to parameter order as versions change.

-                    session.writeFrame(QueuePurgeOkBody.createAMQFrame(evt.getChannelId(),

-                        (byte)8, (byte)0,	// AMQP version (major, minor)

-                        purged));	// messageCount

-                }

-        }

-    }

-}

diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/TxCommitHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/TxCommitHandler.java
deleted file mode 100644
index 3d7ec286f9..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/TxCommitHandler.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.handler;
-
-import org.apache.log4j.Logger;
-import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.TxCommitBody;
-import org.apache.qpid.framing.TxCommitOkBody;
-import org.apache.qpid.protocol.AMQMethodEvent;
-import org.apache.qpid.server.AMQChannel;
-import org.apache.qpid.server.protocol.AMQProtocolSession;
-import org.apache.qpid.server.state.AMQStateManager;
-import org.apache.qpid.server.state.StateAwareMethodListener;
-
-public class TxCommitHandler implements StateAwareMethodListener<TxCommitBody>
-{
-    private static final Logger _log = Logger.getLogger(TxCommitHandler.class);
-
-    private static TxCommitHandler _instance = new TxCommitHandler();
-
-    public static TxCommitHandler getInstance()
-    {
-        return _instance;
-    }
-
-    private TxCommitHandler()
-    {
-    }
-
-    public void methodReceived(AMQStateManager stateManager, AMQMethodEvent<TxCommitBody> evt) throws AMQException
-    {
-        AMQProtocolSession session = stateManager.getProtocolSession();
-
-        try
-        {
-            if (_log.isDebugEnabled())
-            {
-                _log.debug("Commit received on channel " + evt.getChannelId());
-            }
-            AMQChannel channel = session.getChannel(evt.getChannelId());
-
-            if (channel == null)
-            {
-                throw evt.getMethod().getChannelNotFoundException(evt.getChannelId());
-            }
-
-            channel.commit();
-            // AMQP version change: Hardwire the version to 0-8 (major=8, minor=0)
-            // TODO: Connect this to the session version obtained from ProtocolInitiation for this session.
-            // Be aware of possible changes to parameter order as versions change.
-            session.writeFrame(TxCommitOkBody.createAMQFrame(evt.getChannelId(), (byte) 8, (byte) 0));
-            channel.processReturns(session);
-        }
-        catch (AMQException e)
-        {
-            throw evt.getMethod().getChannelException(e.getErrorCode(), "Failed to commit: " + e.getMessage());
-        }
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/TxRollbackHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/TxRollbackHandler.java
deleted file mode 100644
index f747f7a840..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/TxRollbackHandler.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.handler;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.TxRollbackBody;
-import org.apache.qpid.framing.TxRollbackOkBody;
-import org.apache.qpid.protocol.AMQMethodEvent;
-import org.apache.qpid.server.AMQChannel;
-import org.apache.qpid.server.protocol.AMQProtocolSession;
-import org.apache.qpid.server.state.AMQStateManager;
-import org.apache.qpid.server.state.StateAwareMethodListener;
-
-public class TxRollbackHandler implements StateAwareMethodListener<TxRollbackBody>
-{
-    private static TxRollbackHandler _instance = new TxRollbackHandler();
-
-    public static TxRollbackHandler getInstance()
-    {
-        return _instance;
-    }
-
-    private TxRollbackHandler()
-    {
-    }
-
-    public void methodReceived(AMQStateManager stateManager, AMQMethodEvent<TxRollbackBody> evt) throws AMQException
-    {
-        AMQProtocolSession session = stateManager.getProtocolSession();
-
-        try
-        {
-            AMQChannel channel = session.getChannel(evt.getChannelId());
-
-            if (channel == null)
-            {
-                throw evt.getMethod().getChannelNotFoundException(evt.getChannelId());
-            }
-
-            channel.rollback();
-            // AMQP version change: Hardwire the version to 0-8 (major=8, minor=0)
-            // TODO: Connect this to the session version obtained from ProtocolInitiation for this session.
-            // Be aware of possible changes to parameter order as versions change.
-            session.writeFrame(TxRollbackOkBody.createAMQFrame(evt.getChannelId(), (byte) 8, (byte) 0));
-            //Now resend all the unacknowledged messages back to the original subscribers.
-            //(Must be done after the TxnRollback-ok response).
-            // Why, are we not allowed to send messages back to client before the ok method?
-            channel.resend(false);
-        }
-        catch (AMQException e)
-        {
-            throw evt.getMethod().getChannelException(e.getErrorCode(), "Failed to rollback: " + e.getMessage());
-        }
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/TxSelectHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/TxSelectHandler.java
deleted file mode 100644
index a9e478e301..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/TxSelectHandler.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.handler;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.TxSelectBody;
-import org.apache.qpid.framing.TxSelectOkBody;
-import org.apache.qpid.protocol.AMQMethodEvent;
-import org.apache.qpid.server.protocol.AMQProtocolSession;
-import org.apache.qpid.server.state.AMQStateManager;
-import org.apache.qpid.server.state.StateAwareMethodListener;
-import org.apache.qpid.server.AMQChannel;
-
-public class TxSelectHandler implements StateAwareMethodListener<TxSelectBody>
-{
-    private static TxSelectHandler _instance = new TxSelectHandler();
-
-    public static TxSelectHandler getInstance()
-    {
-        return _instance;
-    }
-
-    private TxSelectHandler()
-    {
-    }
-
-    public void methodReceived(AMQStateManager stateManager, AMQMethodEvent<TxSelectBody> evt) throws AMQException
-    {
-        AMQProtocolSession session = stateManager.getProtocolSession();
-
-        AMQChannel channel = session.getChannel(evt.getChannelId());
-
-        if (channel == null)
-        {
-            throw evt.getMethod().getChannelNotFoundException(evt.getChannelId());
-        }
-
-        channel.setLocalTransactional();
-
-        // AMQP version change: Hardwire the version to 0-8 (major=8, minor=0)
-        // TODO: Connect this to the session version obtained from ProtocolInitiation for this session.
-        // Be aware of possible changes to parameter order as versions change.
-        session.writeFrame(TxSelectOkBody.createAMQFrame(evt.getChannelId(), (byte) 8, (byte) 0));
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/jms/JmsConsumer.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/jms/JmsConsumer.java
deleted file mode 100644
index c08fae4e4e..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/jms/JmsConsumer.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.jms;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.server.protocol.AMQProtocolSession;
-
-public class JmsConsumer
-{
-    private int _prefetchValue;
-
-    private PrefetchUnits _prefetchUnits;
-
-    private boolean _noLocal;
-
-    private boolean _autoAck;
-
-    private boolean _exclusive;
-
-    private AMQProtocolSession _protocolSession;
-
-    public enum PrefetchUnits
-    {
-        OCTETS,
-        MESSAGES
-    }
-
-    public int getPrefetchValue()
-    {
-        return _prefetchValue;
-    }
-
-    public void setPrefetchValue(int prefetchValue)
-    {
-        _prefetchValue = prefetchValue;
-    }
-
-    public PrefetchUnits getPrefetchUnits()
-    {
-        return _prefetchUnits;
-    }
-
-    public void setPrefetchUnits(PrefetchUnits prefetchUnits)
-    {
-        _prefetchUnits = prefetchUnits;
-    }
-
-    public boolean isNoLocal()
-    {
-        return _noLocal;
-    }
-
-    public void setNoLocal(boolean noLocal)
-    {
-        _noLocal = noLocal;
-    }
-
-    public boolean isAutoAck()
-    {
-        return _autoAck;
-    }
-
-    public void setAutoAck(boolean autoAck)
-    {
-        _autoAck = autoAck;
-    }
-
-    public boolean isExclusive()
-    {
-        return _exclusive;
-    }
-
-    public void setExclusive(boolean exclusive)
-    {
-        _exclusive = exclusive;
-    }
-
-    public AMQProtocolSession getProtocolSession()
-    {
-        return _protocolSession;
-    }
-
-    public void setProtocolSession(AMQProtocolSession protocolSession)
-    {
-        _protocolSession = protocolSession;
-    }
-
-    public void deliverMessage() throws AMQException
-    {
-
-    }
-}
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
deleted file mode 100644
index a2c2bd62a2..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/management/AMQManagedObject.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.management;
-
-import javax.management.ListenerNotFoundException;
-import javax.management.MBeanInfo;
-import javax.management.MBeanNotificationInfo;
-import javax.management.NotCompliantMBeanException;
-import javax.management.NotificationBroadcaster;
-import javax.management.NotificationBroadcasterSupport;
-import javax.management.NotificationFilter;
-import javax.management.NotificationListener;
-
-/**
- * This class provides additinal feature of Notification Broadcaster to the
- * DefaultManagedObject.
- * @author  Bhupendra Bhardwaj
- * @version 0.1
- */
-public abstract class AMQManagedObject extends DefaultManagedObject
-                                       implements NotificationBroadcaster
-{
-    /**
-     * broadcaster support class
-     */
-    protected NotificationBroadcasterSupport _broadcaster = new NotificationBroadcasterSupport();
-
-    /**
-     * sequence number for notifications
-     */
-    protected long _notificationSequenceNumber = 0;
-
-    protected MBeanInfo _mbeanInfo;
-
-    protected AMQManagedObject(Class<?> managementInterface, String typeName)
-        throws NotCompliantMBeanException
-    {
-        super(managementInterface, typeName);
-        buildMBeanInfo();
-    }
-
-    @Override
-    public MBeanInfo getMBeanInfo()
-    {
-        return _mbeanInfo;
-    }
-    
-    private void buildMBeanInfo() throws NotCompliantMBeanException
-    {
-        _mbeanInfo = new MBeanInfo(this.getClass().getName(),
-                      MBeanIntrospector.getMBeanDescription(this.getClass()),
-                      MBeanIntrospector.getMBeanAttributesInfo(getManagementInterface()),
-                      MBeanIntrospector.getMBeanConstructorsInfo(this.getClass()),
-                      MBeanIntrospector.getMBeanOperationsInfo(getManagementInterface()),
-                      this.getNotificationInfo());
-    }
-
-
-
-    // notification broadcaster implementation
-
-    public void addNotificationListener(NotificationListener listener,
-                                        NotificationFilter filter,
-                                        Object handback)
-    {
-        _broadcaster.addNotificationListener(listener, filter, handback);
-    }
-
-    public void removeNotificationListener(NotificationListener listener)
-        throws ListenerNotFoundException
-    {
-        _broadcaster.removeNotificationListener(listener);
-    }
-
-    public MBeanNotificationInfo[] getNotificationInfo()
-    {
-        return null;
-    } 
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/management/DefaultManagedObject.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/management/DefaultManagedObject.java
deleted file mode 100644
index 31313cf024..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/management/DefaultManagedObject.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.management;
-
-import javax.management.JMException;
-import javax.management.MalformedObjectNameException;
-import javax.management.NotCompliantMBeanException;
-import javax.management.ObjectName;
-import javax.management.StandardMBean;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.server.registry.ApplicationRegistry;
-
-/**
- * Provides implementation of the boilerplate ManagedObject interface. Most managed objects should find it useful
- * to extend this class rather than implementing ManagedObject from scratch.
- *
- */
-public abstract class DefaultManagedObject extends StandardMBean implements ManagedObject
-{
-    private Class<?> _managementInterface;
-
-    private String _typeName;
-
-    protected DefaultManagedObject(Class<?> managementInterface, String typeName)
-        throws NotCompliantMBeanException
-    {
-        super(managementInterface);
-        _managementInterface = managementInterface;
-        _typeName = typeName;
-    }
-
-    public String getType()
-    {
-        return _typeName;
-    }
-
-    public Class<?> getManagementInterface()
-    {
-        return _managementInterface;
-    }
-
-    public ManagedObject getParentObject()
-    {
-        return null;
-    }
-
-    public void register() throws AMQException
-    {
-        try
-        {
-            getManagedObjectRegistry().registerObject(this);
-        }
-        catch (JMException e)
-        {
-            throw new AMQException(null, "Error registering managed object " + this + ": " + e, e);
-        }
-    }
-
-    protected ManagedObjectRegistry getManagedObjectRegistry()
-    {
-        return ApplicationRegistry.getInstance().getManagedObjectRegistry();
-    }
-
-    public void unregister() throws AMQException
-    {
-        try
-        {
-            getManagedObjectRegistry().unregisterObject(this);
-        }
-        catch (JMException e)
-        {
-            throw new AMQException(null, "Error unregistering managed object: " + this + ": " + e, e);
-        }
-    }
-
-    public String toString()
-    {
-        return getObjectInstanceName() + "[" + getType() + "]";
-    }
-    
-
-    /**
-     * Created the ObjectName as per the JMX Specs
-     * @return ObjectName
-     * @throws MalformedObjectNameException
-     */
-    public ObjectName getObjectName() throws MalformedObjectNameException
-    {
-        String name = getObjectInstanceName();
-        StringBuffer objectName = new StringBuffer(ManagedObject.DOMAIN);
-
-        objectName.append(":type=");
-        objectName.append(getHierarchicalType(this));
-
-        objectName.append(",");
-        objectName.append(getHierarchicalName(this));
-        objectName.append("name=").append(name);
-
-        return new ObjectName(objectName.toString());
-    }
-
-    protected ObjectName getObjectNameForSingleInstanceMBean() throws MalformedObjectNameException
-    {
-        StringBuffer objectName = new StringBuffer(ManagedObject.DOMAIN);
-
-        objectName.append(":type=");
-        objectName.append(getHierarchicalType(this));
-
-        String hierarchyName = getHierarchicalName(this);
-        if (hierarchyName != null)
-        {
-            objectName.append(",");
-            objectName.append(hierarchyName.substring(0, hierarchyName.lastIndexOf(",")));
-        }
-
-        return new ObjectName(objectName.toString());
-    }
-
-    protected String getHierarchicalType(ManagedObject obj)
-    {
-        if (obj.getParentObject() != null)
-        {
-            String parentType = getHierarchicalType(obj.getParentObject()).toString();
-            return parentType + "." + obj.getType();
-        }
-        else
-            return obj.getType();
-    }
-
-    protected String getHierarchicalName(ManagedObject obj)
-    {
-        if (obj.getParentObject() != null)
-        {
-            String parentName = obj.getParentObject().getType() + "=" +
-                                obj.getParentObject().getObjectInstanceName() + ","+
-                                getHierarchicalName(obj.getParentObject());
-
-            return parentName;
-        }
-        else
-            return "";
-    }
-
-    protected static StringBuffer jmxEncode(StringBuffer jmxName, int attrPos)
-    {
-        for (int i = attrPos; i < jmxName.length(); i++)
-        {
-            if (jmxName.charAt(i) == ',')
-            {
-                jmxName.setCharAt(i, ';');
-            }
-            else if (jmxName.charAt(i) == ':')
-            {
-                jmxName.setCharAt(i, '-');
-            }
-            else if (jmxName.charAt(i) == '?' ||
-                    jmxName.charAt(i) == '*' ||
-                    jmxName.charAt(i) == '\\')
-            {
-                jmxName.insert(i, '\\');
-                i++;
-            }
-            else if (jmxName.charAt(i) == '\n')
-            {
-                jmxName.insert(i, '\\');
-                i++;
-                jmxName.setCharAt(i, 'n');
-            }
-        }
-        return jmxName;
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/management/JMXManagedObjectRegistry.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/management/JMXManagedObjectRegistry.java
deleted file mode 100644
index 9dce752021..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/management/JMXManagedObjectRegistry.java
+++ /dev/null
@@ -1,283 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.management;
-
-import org.apache.log4j.Logger;
-import org.apache.qpid.AMQException;
-import org.apache.qpid.server.registry.ApplicationRegistry;
-import org.apache.qpid.server.registry.IApplicationRegistry;
-import org.apache.qpid.server.security.auth.database.Base64MD5PasswordFilePrincipalDatabase;
-import org.apache.qpid.server.security.auth.database.PlainPasswordFilePrincipalDatabase;
-import org.apache.qpid.server.security.auth.database.PrincipalDatabase;
-import org.apache.qpid.server.security.auth.sasl.crammd5.CRAMMD5HashedInitialiser;
-
-import javax.management.JMException;
-import javax.management.MBeanServer;
-import javax.management.MBeanServerFactory;
-import javax.management.remote.JMXConnectorServer;
-import javax.management.remote.JMXConnectorServerFactory;
-import javax.management.remote.JMXServiceURL;
-import javax.management.remote.MBeanServerForwarder;
-import javax.security.auth.callback.Callback;
-import javax.security.auth.callback.CallbackHandler;
-import javax.security.auth.callback.NameCallback;
-import javax.security.auth.callback.PasswordCallback;
-import javax.security.auth.callback.UnsupportedCallbackException;
-import javax.security.auth.login.AccountNotFoundException;
-import javax.security.sasl.AuthorizeCallback;
-import java.io.IOException;
-import java.lang.management.ManagementFactory;
-import java.rmi.RemoteException;
-import java.rmi.registry.LocateRegistry;
-import java.rmi.registry.Registry;
-import java.rmi.server.UnicastRemoteObject;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * This class starts up an MBeanserver. If out of the box agent is being used then there are no security features
- * implemented. To use the security features like user authentication, turn off the jmx options in the "QPID_OPTS" env
- * variable and use JMXMP connector server. If JMXMP connector is not available, then the standard JMXConnector will be
- * used, which again doesn't have user authentication.
- */
-public class JMXManagedObjectRegistry implements ManagedObjectRegistry
-{
-    private static final Logger _log = Logger.getLogger(JMXManagedObjectRegistry.class);
-
-    private final MBeanServer _mbeanServer;
-    private Registry _rmiRegistry;
-    private JMXServiceURL _jmxURL;
-
-    public static final String MANAGEMENT_PORT_CONFIG_PATH = "management.jmxport";
-    public static final int MANAGEMENT_PORT_DEFAULT = 8999;
-
-    public JMXManagedObjectRegistry() throws AMQException
-    {
-        _log.info("Initialising managed object registry using platform MBean server");
-        IApplicationRegistry appRegistry = ApplicationRegistry.getInstance();
-
-        // Retrieve the config parameters
-        boolean platformServer = appRegistry.getConfiguration().getBoolean("management.platform-mbeanserver", true);
-
-        _mbeanServer =
-                platformServer ? ManagementFactory.getPlatformMBeanServer()
-                : MBeanServerFactory.createMBeanServer(ManagedObject.DOMAIN);
-    }
-
-
-    public void start() throws IOException
-    {
-        // Check if the "QPID_OPTS" is set to use Out of the Box JMXAgent
-        if (areOutOfTheBoxJMXOptionsSet())
-        {
-            _log.info("JMX: Using the out of the box JMX Agent");
-            return;
-        }
-
-        IApplicationRegistry appRegistry = ApplicationRegistry.getInstance();
-
-        boolean security = appRegistry.getConfiguration().getBoolean("management.security-enabled", false);
-        int port = appRegistry.getConfiguration().getInt(MANAGEMENT_PORT_CONFIG_PATH, MANAGEMENT_PORT_DEFAULT);
-
-        if (security)
-        {
-            // For SASL using JMXMP
-            _jmxURL = new JMXServiceURL("jmxmp", null, port);
-
-            Map env = new HashMap();
-            Map<String, PrincipalDatabase> map = appRegistry.getDatabaseManager().getDatabases();
-            PrincipalDatabase db = null;
-
-            for (Map.Entry<String, PrincipalDatabase> entry : map.entrySet())
-            {
-                if (entry.getValue() instanceof Base64MD5PasswordFilePrincipalDatabase)
-                {
-                    db = entry.getValue();
-                    break;
-                }
-                else if (entry.getValue() instanceof PlainPasswordFilePrincipalDatabase)
-                {
-                    db = entry.getValue();
-                }
-            }
-
-            if (db instanceof Base64MD5PasswordFilePrincipalDatabase)
-            {
-                env.put("jmx.remote.profiles", "SASL/CRAM-MD5");
-                CRAMMD5HashedInitialiser initialiser = new CRAMMD5HashedInitialiser();
-                initialiser.initialise(db);
-                env.put("jmx.remote.sasl.callback.handler", initialiser.getCallbackHandler());
-            }
-            else if (db instanceof PlainPasswordFilePrincipalDatabase)
-            {
-                env.put("jmx.remote.profiles", "SASL/PLAIN");
-                env.put("jmx.remote.sasl.callback.handler", new UserCallbackHandler(db));
-            }
-
-            // Enable the SSL security and server authentication
-            /*
-           SslRMIClientSocketFactory csf = new SslRMIClientSocketFactory();
-           SslRMIServerSocketFactory ssf = new SslRMIServerSocketFactory();
-           env.put(RMIConnectorServer.RMI_CLIENT_SOCKET_FACTORY_ATTRIBUTE, csf);
-           env.put(RMIConnectorServer.RMI_SERVER_SOCKET_FACTORY_ATTRIBUTE, ssf);
-            */
-
-            JMXConnectorServer cs = JMXConnectorServerFactory.newJMXConnectorServer(_jmxURL, env, _mbeanServer);
-            MBeanServerForwarder mbsf = MBeanInvocationHandlerImpl.newProxyInstance();
-            cs.setMBeanServerForwarder(mbsf);
-            cs.start();
-            _log.warn("JMX: Started JMXConnector server  on port '" + port + "' with SASL");
-
-        }
-        else
-        {
-            startJMXConnectorServer(port);
-            _log.warn("JMX: Started JMXConnector server on port '" + port + "' with security disabled");
-        }
-    }
-
-    /**
-     * Starts up an RMIRegistry at configured port and attaches a JMXConnectorServer to it.
-     *
-     * @param port
-     *
-     * @throws IOException
-     */
-    private void startJMXConnectorServer(int port) throws IOException
-    {
-        startRMIRegistry(port);
-        _jmxURL = new JMXServiceURL("service:jmx:rmi:///jndi/rmi://localhost:" + port + "/jmxrmi");
-        JMXConnectorServer cs = JMXConnectorServerFactory.newJMXConnectorServer(_jmxURL, null, _mbeanServer);
-        cs.start();
-    }
-
-    public void registerObject(ManagedObject managedObject) throws JMException
-    {
-        _mbeanServer.registerMBean(managedObject, managedObject.getObjectName());
-    }
-
-    public void unregisterObject(ManagedObject managedObject) throws JMException
-    {
-        _mbeanServer.unregisterMBean(managedObject.getObjectName());
-    }
-
-    /**
-     * Checks is the "QPID_OPTS" env variable is set to use the out of the box JMXAgent.
-     *
-     * @return
-     */
-    private boolean areOutOfTheBoxJMXOptionsSet()
-    {
-        if (System.getProperty("com.sun.management.jmxremote") != null)
-        {
-            return true;
-        }
-
-        if (System.getProperty("com.sun.management.jmxremote.port") != null)
-        {
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Starts the rmi registry at given port
-     *
-     * @param port
-     *
-     * @throws RemoteException
-     */
-    private void startRMIRegistry(int port) throws RemoteException
-    {
-        System.setProperty("java.rmi.server.randomIDs", "true");
-        _rmiRegistry = LocateRegistry.createRegistry(port);
-    }
-
-    // stops the RMIRegistry, if it was running and bound to a port
-    public void close() throws RemoteException
-    {
-        if (_rmiRegistry != null)
-        {
-            // Stopping the RMI registry
-            UnicastRemoteObject.unexportObject(_rmiRegistry, true);
-        }
-    }
-
-    /** This class is used for SASL enabled JMXConnector for performing user authentication. */
-    private class UserCallbackHandler implements CallbackHandler
-    {
-        private final PrincipalDatabase _principalDatabase;
-
-        protected UserCallbackHandler(PrincipalDatabase database)
-        {
-            _principalDatabase = database;
-        }
-
-        public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException
-        {
-            // Retrieve callbacks
-            NameCallback ncb = null;
-            PasswordCallback pcb = null;
-            for (int i = 0; i < callbacks.length; i++)
-            {
-                if (callbacks[i] instanceof NameCallback)
-                {
-                    ncb = (NameCallback) callbacks[i];
-                }
-                else if (callbacks[i] instanceof PasswordCallback)
-                {
-                    pcb = (PasswordCallback) callbacks[i];
-                }
-                else if (callbacks[i] instanceof AuthorizeCallback)
-                {
-                    ((AuthorizeCallback) callbacks[i]).setAuthorized(true);
-                }
-                else
-                {
-                    throw new UnsupportedCallbackException(callbacks[i]);
-                }
-            }
-
-            boolean authorized = false;
-            // Process retrieval of password; can get password if username is available in NameCallback
-            if ((ncb != null) && (pcb != null))
-            {
-                String username = ncb.getDefaultName();
-                try
-                {
-                    authorized = _principalDatabase.verifyPassword(username, pcb.getPassword());
-                }
-                catch (AccountNotFoundException e)
-                {
-                    IOException ioe = new IOException("User not authorized.  " + e);
-                    ioe.initCause(e);
-                    throw ioe;
-                }
-            }
-
-            if (!authorized)
-            {
-                throw new IOException("User not authorized.");
-            }
-        }
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/management/MBeanAttribute.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/management/MBeanAttribute.java
deleted file mode 100644
index 7d42297699..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/management/MBeanAttribute.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- *
- *
- */
-
-package org.apache.qpid.server.management;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Annotation for MBean attributes. This should be used with getter or setter
- * methods of attributes.
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.METHOD)
-@Inherited
-public @interface MBeanAttribute
-{
-    String name();
-    String description();
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/management/MBeanConstructor.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/management/MBeanConstructor.java
deleted file mode 100644
index 9138e03085..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/management/MBeanConstructor.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- *
- *
- */
-
-package org.apache.qpid.server.management;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Annotation for MBean constructors.
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.CONSTRUCTOR)
-@Inherited
-public @interface MBeanConstructor
-{
-    String value();
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/management/MBeanDescription.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/management/MBeanDescription.java
deleted file mode 100644
index 448fed3280..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/management/MBeanDescription.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- *
- *
- */
-
-package org.apache.qpid.server.management;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Annotation for MBean class.
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.TYPE)
-@Inherited
-public @interface MBeanDescription {
-    String value();
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/management/MBeanIntrospector.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/management/MBeanIntrospector.java
deleted file mode 100644
index 0c2ec2aebd..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/management/MBeanIntrospector.java
+++ /dev/null
@@ -1,388 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.management;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.management.MBeanAttributeInfo;
-import javax.management.MBeanConstructorInfo;
-import javax.management.MBeanOperationInfo;
-import javax.management.MBeanParameterInfo;
-import javax.management.NotCompliantMBeanException;
-
-/**
- * This class is a utility class to introspect the MBean class and the management
- * interface class for various purposes.
- * @author  Bhupendra Bhardwaj
- * @version 0.1
- */
-class MBeanIntrospector {
-
-    private static final String _defaultAttributeDescription = "Management attribute";
-    private static final String _defaultOerationDescription = "Management operation";
-    private static final String _defaultConstructorDescription = "MBean constructor";
-    private static final String _defaultMbeanDescription = "Management interface of the MBean";
-
-    /**
-     * Introspects the management interface class for MBean attributes.
-     * @param interfaceClass
-     * @return MBeanAttributeInfo[]
-     * @throws NotCompliantMBeanException
-     */
-    static MBeanAttributeInfo[] getMBeanAttributesInfo(Class interfaceClass)
-        throws NotCompliantMBeanException
-    {
-        List<MBeanAttributeInfo> attributesList = new ArrayList<MBeanAttributeInfo>();
-
-        /**
-         * Using reflection, all methods of the managemetn interface will be analysed,
-         * and MBeanInfo will be created.
-         */
-        for (Method method : interfaceClass.getMethods())
-        {
-            String name = method.getName();
-            Class<?>  resultType = method.getReturnType();
-            MBeanAttributeInfo attributeInfo = null;
-
-            if (isAttributeGetterMethod(method))
-            {
-                String desc = getAttributeDescription(method);
-                attributeInfo = new MBeanAttributeInfo(name.substring(3),
-                                                resultType.getName(),
-                                                desc,
-                                                true,
-                                                false,
-                                                false);
-                int index = getIndexIfAlreadyExists(attributeInfo, attributesList);
-                if (index == -1)
-                {
-                    attributesList.add(attributeInfo);
-                }
-                else
-                {
-                    attributeInfo = new MBeanAttributeInfo(name.substring(3),
-                                                resultType.getName(),
-                                                desc,
-                                                true,
-                                                true,
-                                                false);
-                    attributesList.set(index, attributeInfo);
-                }
-            }
-            else if (isAttributeSetterMethod(method))
-            {
-                String desc = getAttributeDescription(method);
-                attributeInfo = new MBeanAttributeInfo(name.substring(3),
-                                                method.getParameterTypes()[0].getName(),
-                                                desc,
-                                                false,
-                                                true,
-                                                false);
-                int index = getIndexIfAlreadyExists(attributeInfo, attributesList);
-                if (index == -1)
-                {
-                    attributesList.add(attributeInfo);
-                }
-                else
-                {
-                    attributeInfo = new MBeanAttributeInfo(name.substring(3),
-                                                method.getParameterTypes()[0].getName(),
-                                                desc,
-                                                true,
-                                                true,
-                                                false);
-                    attributesList.set(index, attributeInfo);
-                }
-            }
-            else if (isAttributeBoolean(method))
-            {
-                attributeInfo = new MBeanAttributeInfo(name.substring(2),
-                                                resultType.getName(),
-                                                getAttributeDescription(method),
-                                                true,
-                                                false,
-                                                true);
-                attributesList.add(attributeInfo);
-            }
-        }
-
-        return attributesList.toArray(new MBeanAttributeInfo[0]);
-    }
-
-    /**
-     * Introspects the management interface class for management operations.
-     * @param interfaceClass
-     * @return MBeanOperationInfo[]
-     */
-    static MBeanOperationInfo[] getMBeanOperationsInfo(Class interfaceClass)
-    {
-        List<MBeanOperationInfo> operationsList = new ArrayList<MBeanOperationInfo>();
-
-        for (Method method : interfaceClass.getMethods())
-        {
-            if (!isAttributeGetterMethod(method) &&
-                !isAttributeSetterMethod(method) &&
-                !isAttributeBoolean(method))
-            {
-                operationsList.add(getOperationInfo(method));
-            }
-        }
-
-        return operationsList.toArray(new MBeanOperationInfo[0]);
-    }
-
-    /**
-     * Checks if the method is an attribute getter method.
-     * @param method
-     * @return true if the method is an attribute getter method.
-     */
-    private static boolean isAttributeGetterMethod(Method method)
-    {
-        if (!(method.getName().equals("get")) &&
-            method.getName().startsWith("get") &&
-            method.getParameterTypes().length == 0 &&
-            !method.getReturnType().equals(void.class))
-        {
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Checks if the method is an attribute setter method.
-     * @param method
-     * @return true if the method is an attribute setter method.
-     */
-    private static boolean isAttributeSetterMethod(Method method)
-    {
-        if (!(method.getName().equals("set")) &&
-            method.getName().startsWith("set") &&
-            method.getParameterTypes().length == 1 &&
-            method.getReturnType().equals(void.class))
-        {
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Checks if the attribute is a boolean and the method is a isX kind og method.
-     * @param method
-     * @return true if the method is an attribute isX type of method
-     */
-    private static boolean isAttributeBoolean(Method method)
-    {
-        if (!(method.getName().equals("is")) &&
-            method.getName().startsWith("is") &&
-            method.getParameterTypes().length == 0 &&
-            method.getReturnType().equals(boolean.class))
-        {
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Helper method to retrieve the attribute index from the list of attributes.
-     * @param attribute
-     * @param list
-     * @return attribute index no. -1 if attribtue doesn't exist
-     * @throws NotCompliantMBeanException
-     */
-    private static int getIndexIfAlreadyExists(MBeanAttributeInfo attribute,
-                                                    List<MBeanAttributeInfo> list)
-        throws NotCompliantMBeanException
-    {
-        String exceptionMsg = "Conflicting attribute methods for attribute " + attribute.getName();
-
-        for (MBeanAttributeInfo memberAttribute : list)
-        {
-            if (attribute.getName().equals(memberAttribute.getName()))
-            {
-                if (!attribute.getType().equals(memberAttribute.getType()))
-                {
-                    throw new NotCompliantMBeanException(exceptionMsg);
-                }
-                if (attribute.isReadable() && memberAttribute.isReadable())
-                {
-                    if (attribute.isIs() != memberAttribute.isIs())
-                    {
-                        throw new NotCompliantMBeanException(exceptionMsg);
-                    }
-                }
-
-                return list.indexOf(memberAttribute);
-            }
-        }
-
-        return -1;
-    }
-
-    /**
-     * Retrieves the attribute description from annotation
-     * @param attributeMethod
-     * @return attribute description
-     */
-    private static String getAttributeDescription(Method attributeMethod)
-    {
-        MBeanAttribute anno = attributeMethod.getAnnotation(MBeanAttribute.class);
-        if (anno != null)
-        {
-            return anno.description();
-        }
-        return _defaultAttributeDescription;
-    }
-
-    /**
-     * Introspects the method to retrieve the operation information.
-     * @param operation
-     * @return MBeanOperationInfo
-     */
-    private static MBeanOperationInfo getOperationInfo(Method operation)
-    {
-        MBeanOperationInfo operationInfo = null;
-        Class<?> returnType = operation.getReturnType();
-
-        MBeanParameterInfo[] paramsInfo = getParametersInfo(operation.getParameterAnnotations(),
-                                                            operation.getParameterTypes());
-
-        String operationDesc = _defaultOerationDescription;
-        int impact = MBeanOperationInfo.UNKNOWN;
-
-        if (operation.getAnnotation(MBeanOperation.class) != null)
-        {
-            operationDesc = operation.getAnnotation(MBeanOperation.class).description();
-            impact = operation.getAnnotation(MBeanOperation.class).impact();
-        }
-        operationInfo = new MBeanOperationInfo(operation.getName(),
-                                               operationDesc,
-                                               paramsInfo,
-                                               returnType.getName(),
-                                               impact);
-
-        return operationInfo;
-    }
-
-    /**
-     * Constructs the parameter info.
-     * @param paramsAnno
-     * @param paramTypes
-     * @return MBeanParameterInfo[]
-     */
-    private static MBeanParameterInfo[] getParametersInfo(Annotation[][] paramsAnno,
-                                                          Class<?>[] paramTypes)
-    {
-        int noOfParams = paramsAnno.length;
-
-        MBeanParameterInfo[] paramsInfo = new MBeanParameterInfo[noOfParams];
-
-        for (int i = 0; i < noOfParams; i++)
-        {
-            MBeanParameterInfo paramInfo = null;
-            String type = paramTypes[i].getName();
-            for (Annotation anno : paramsAnno[i])
-            {
-                String name,desc;
-                if (MBeanOperationParameter.class.isInstance(anno))
-                {
-                    name = MBeanOperationParameter.class.cast(anno).name();
-                    desc = MBeanOperationParameter.class.cast(anno).description();
-                    paramInfo = new MBeanParameterInfo(name, type, desc);
-                }
-            }
-
-
-            if (paramInfo == null)
-            {
-                paramInfo = new MBeanParameterInfo("p " + (i + 1), type, "parameter " + (i + 1));
-            }
-            if (paramInfo != null)
-                paramsInfo[i] = paramInfo;
-        }
-
-        return paramsInfo;
-    }
-
-    /**
-     * Introspects the MBean class for constructors
-     * @param implClass
-     * @return MBeanConstructorInfo[]
-     */
-    static MBeanConstructorInfo[] getMBeanConstructorsInfo(Class implClass)
-    {
-        List<MBeanConstructorInfo> constructors = new ArrayList<MBeanConstructorInfo>();
-
-        for (Constructor cons : implClass.getConstructors())
-        {
-            MBeanConstructorInfo constructorInfo = getMBeanConstructorInfo(cons);
-            //MBeanConstructorInfo constructorInfo = new MBeanConstructorInfo("desc", cons);
-            if (constructorInfo != null)
-                constructors.add(constructorInfo);
-        }
-
-        return constructors.toArray(new MBeanConstructorInfo[0]);
-    }
-
-    /**
-     * Retrieves the constructor info from given constructor.
-     * @param cons
-     * @return MBeanConstructorInfo
-     */
-    private static MBeanConstructorInfo getMBeanConstructorInfo(Constructor cons)
-    {
-        String desc = null;
-        Annotation anno = cons.getAnnotation(MBeanConstructor.class);
-        if (anno != null && MBeanConstructor.class.isInstance(anno))
-        {
-            desc = MBeanConstructor.class.cast(anno).value();
-        }
-
-        //MBeanParameterInfo[] paramsInfo = getParametersInfo(cons.getParameterAnnotations(),
-        //                                                    cons.getParameterTypes());
-
-        return new MBeanConstructorInfo(cons.getName(),
-                                        desc != null ? _defaultConstructorDescription : desc ,
-                                        null);
-    }
-
-    /**
-     * Retrieves the description from the annotations of given class
-     * @param annotatedClass
-     * @return class description
-     */
-    static String getMBeanDescription(Class annotatedClass)
-    {
-        Annotation anno = annotatedClass.getAnnotation(MBeanDescription.class);
-        if (anno != null && MBeanDescription.class.isInstance(anno))
-        {
-            return MBeanDescription.class.cast(anno).value();
-        }
-        return _defaultMbeanDescription;
-    }
-
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/management/MBeanInvocationHandlerImpl.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/management/MBeanInvocationHandlerImpl.java
deleted file mode 100644
index 4fb260472d..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/management/MBeanInvocationHandlerImpl.java
+++ /dev/null
@@ -1,239 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.management;
-
-import org.apache.qpid.server.security.access.UserManagement;
-import org.apache.log4j.Logger;
-
-import javax.management.remote.MBeanServerForwarder;
-import javax.management.remote.JMXPrincipal;
-import javax.management.MBeanServer;
-import javax.management.ObjectName;
-import javax.management.MBeanInfo;
-import javax.management.MBeanOperationInfo;
-import javax.management.JMException;
-import javax.security.auth.Subject;
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Proxy;
-import java.lang.reflect.Method;
-import java.security.AccessController;
-import java.security.Principal;
-import java.security.AccessControlContext;
-import java.util.Set;
-import java.util.Properties;
-
-/**
- * This class can be used by the JMXConnectorServer as an InvocationHandler for the mbean operations. This implements
- * the logic for allowing the users to invoke MBean operations and implements the restrictions for readOnly, readWrite
- * and admin users.
- */
-public class MBeanInvocationHandlerImpl implements InvocationHandler
-{
-    private static final Logger _logger = Logger.getLogger(MBeanInvocationHandlerImpl.class);
-
-    public final static String ADMIN = "admin";
-    public final static String READWRITE = "readwrite";
-    public final static String READONLY = "readonly";
-    private final static String DELEGATE = "JMImplementation:type=MBeanServerDelegate";
-    private MBeanServer mbs;
-    private static Properties _userRoles = new Properties();
-
-    public static MBeanServerForwarder newProxyInstance()
-    {
-        final InvocationHandler handler = new MBeanInvocationHandlerImpl();
-        final Class[] interfaces = new Class[]{MBeanServerForwarder.class};
-
-        Object proxy = Proxy.newProxyInstance(MBeanServerForwarder.class.getClassLoader(), interfaces, handler);
-        return MBeanServerForwarder.class.cast(proxy);
-    }
-
-    public Object invoke(Object proxy, Method method, Object[] args) throws Throwable
-    {
-        final String methodName = method.getName();
-
-        if (methodName.equals("getMBeanServer"))
-        {
-            return mbs;
-        }
-
-        if (methodName.equals("setMBeanServer"))
-        {
-            if (args[0] == null)
-            {
-                throw new IllegalArgumentException("Null MBeanServer");
-            }
-            if (mbs != null)
-            {
-                throw new IllegalArgumentException("MBeanServer object already initialized");
-            }
-            mbs = (MBeanServer) args[0];
-            return null;
-        }
-
-        // Retrieve Subject from current AccessControlContext
-        AccessControlContext acc = AccessController.getContext();
-        Subject subject = Subject.getSubject(acc);
-
-        // Allow operations performed locally on behalf of the connector server itself
-        if (subject == null)
-        {
-            return method.invoke(mbs, args);
-        }
-
-        if (args == null || DELEGATE.equals(args[0]))
-        {
-            return method.invoke(mbs, args);
-        }
-
-        // Restrict access to "createMBean" and "unregisterMBean" to any user
-        if (methodName.equals("createMBean") || methodName.equals("unregisterMBean"))
-        {
-            _logger.debug("User trying to create or unregister an MBean");
-            throw new SecurityException("Access denied");
-        }
-
-        // Retrieve JMXPrincipal from Subject
-        Set<JMXPrincipal> principals = subject.getPrincipals(JMXPrincipal.class);
-        if (principals == null || principals.isEmpty())
-        {
-            throw new SecurityException("Access denied");
-        }
-
-        Principal principal = principals.iterator().next();
-        String identity = principal.getName();
-
-        if (isAdminMethod(args))
-        {
-            if (isAdmin(identity))
-            {
-                return method.invoke(mbs, args);
-            }
-            else
-            {
-                throw new SecurityException("Access denied");
-            }
-        }
-
-        // Following users can perform any operation other than "createMBean" and "unregisterMBean"
-        if (isAllowedToModify(identity))
-        {
-            return method.invoke(mbs, args);
-        }
-
-        // These users can only call "getAttribute" on the MBeanServerDelegate MBean
-        // Here we can add other fine grained permissions like specific method for a particular mbean
-        if (isReadOnlyUser(identity) && isReadOnlyMethod(method, args))
-        {
-            return method.invoke(mbs, args);
-        }
-
-        throw new SecurityException("Access denied");
-    }
-
-    private boolean isAdminMethod(Object[] args)
-    {
-        if (args[0] instanceof ObjectName)
-        {
-            ObjectName object = (ObjectName) args[0];
-            return UserManagement.TYPE.equals(object.getKeyProperty("type"));
-        }
-
-        return false;
-    }
-
-    // Initialises the user roles
-    public static void setAccessRights(Properties accessRights)
-    {
-        _userRoles = accessRights;
-    }
-
-    private boolean isAdmin(String userName)
-    {
-        if (ADMIN.equals(_userRoles.getProperty(userName)))
-        {
-            return true;
-        }
-        return false;
-    }
-
-    private boolean isAllowedToModify(String userName)
-    {
-        if (ADMIN.equals(_userRoles.getProperty(userName))
-            || READWRITE.equals(_userRoles.getProperty(userName)))
-        {
-            return true;
-        }
-        return false;
-    }
-
-    private boolean isReadOnlyUser(String userName)
-    {
-        if (READONLY.equals(_userRoles.getProperty(userName)))
-        {
-            return true;
-        }
-        return false;
-    }
-
-    private boolean isReadOnlyMethod(Method method, Object[] args)
-    {
-        String methodName = method.getName();
-        if (methodName.startsWith("query") || methodName.startsWith("get"))
-        {
-            return true;
-        }
-        else if (methodName.startsWith("set"))
-        {
-            return false;
-        }
-
-        if ((args[0] instanceof ObjectName) && (methodName.equals("invoke")))
-        {
-            String mbeanMethod = (args.length > 1) ? (String) args[1] : null;
-            if (mbeanMethod == null)
-            {
-                return false;
-            }
-
-            try
-            {
-                MBeanInfo mbeanInfo = mbs.getMBeanInfo((ObjectName) args[0]);
-                if (mbeanInfo != null)
-                {
-                    MBeanOperationInfo[] opInfos = mbeanInfo.getOperations();
-                    for (MBeanOperationInfo opInfo : opInfos)
-                    {
-                        if (opInfo.getName().equals(mbeanMethod) && (opInfo.getImpact() == MBeanOperationInfo.INFO))
-                        {
-                            return true;
-                        }
-                    }
-                }
-            }
-            catch (JMException ex)
-            {
-                ex.printStackTrace();
-            }
-        }
-
-        return false;
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/management/MBeanOperation.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/management/MBeanOperation.java
deleted file mode 100644
index a2dca3e51d..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/management/MBeanOperation.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- *
- *
- */
-
-package org.apache.qpid.server.management;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import javax.management.MBeanOperationInfo;
-
-/**
- * Annotation for MBean operations.
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.METHOD)
-@Inherited
-public @interface MBeanOperation
-{
-    String name();
-    String description();
-    int impact() default MBeanOperationInfo.INFO;
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/management/MBeanOperationParameter.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/management/MBeanOperationParameter.java
deleted file mode 100644
index aba5ec70d8..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/management/MBeanOperationParameter.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- *
- *
- */
-
-package org.apache.qpid.server.management;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Annotation for MBean operation parameters.
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.PARAMETER)
-public @interface MBeanOperationParameter {
-    String name();
-    String description();
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/management/Managable.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/management/Managable.java
deleted file mode 100644
index 166a2a376d..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/management/Managable.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.management;
-
-/**
- * Any object that can return a related MBean should implement this interface.
- *
- * This enables other classes to get the managed object, which in turn is useful when
- * constructing relationships between managed objects without having to maintain
- * separate data structures containing MBeans.
- *
- */
-public interface Managable
-{
-    ManagedObject getManagedObject();
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/management/ManagedBroker.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/management/ManagedBroker.java
deleted file mode 100644
index 45e2e91ed7..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/management/ManagedBroker.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-package org.apache.qpid.server.management;
-
-import java.io.IOException;
-
-import javax.management.JMException;
-import javax.management.MBeanOperationInfo;
-
-import org.apache.qpid.server.exchange.ManagedExchange;
-import org.apache.qpid.server.queue.ManagedQueue;
-
-/**
- * The ManagedBroker is the management interface to expose management
- * features of the Broker.
- *
- * @author   Bhupendra Bhardwaj
- * @version  0.1
- */
-public interface ManagedBroker
-{
-    static final String TYPE = "VirtualHostManager";
-
-    /**
-     * Creates a new Exchange.
-     * @param name
-     * @param type
-     * @param durable
-     * @param passive
-     * @throws IOException
-     * @throws JMException
-     */
-    @MBeanOperation(name="createNewExchange", description="Creates a new Exchange", impact= MBeanOperationInfo.ACTION)
-    void createNewExchange(@MBeanOperationParameter(name="name", description="Name of the new exchange")String name,
-                           @MBeanOperationParameter(name="ExchangeType", description="Type of the exchange")String type,
-                           @MBeanOperationParameter(name="durable", description="true if the Exchang should be durable")boolean durable)
-        throws IOException, JMException;
-
-    /**
-     * unregisters all the channels, queuebindings etc and unregisters
-     * this exchange from managed objects.
-     * @param exchange
-     * @throws IOException
-     * @throws JMException
-     */
-    @MBeanOperation(name="unregisterExchange",
-                    description="Unregisters all the related channels and queuebindings of this exchange",
-                    impact= MBeanOperationInfo.ACTION)
-    void unregisterExchange(@MBeanOperationParameter(name= ManagedExchange.TYPE, description="Exchange Name")String exchange)
-        throws IOException, JMException;
-
-    /**
-     * Create a new Queue on the Broker server
-     * @param queueName
-     * @param durable
-     * @param owner
-     * @param autoDelete
-     * @throws IOException
-     * @throws JMException
-     */
-    @MBeanOperation(name="createNewQueue", description="Create a new Queue on the Broker server", impact= MBeanOperationInfo.ACTION)
-    void createNewQueue(@MBeanOperationParameter(name="queue name", description="Name of the new queue")String queueName,
-                        @MBeanOperationParameter(name="owner", description="Owner name")String owner,
-                        @MBeanOperationParameter(name="durable", description="true if the queue should be durable")boolean durable)
-        throws IOException, JMException;
-
-    /**
-     * Unregisters the Queue bindings, removes the subscriptions and unregisters
-     * from the managed objects.
-     * @param queueName
-     * @throws IOException
-     * @throws JMException
-     */
-    @MBeanOperation(name="deleteQueue",
-                         description="Unregisters the Queue bindings, removes the subscriptions and deletes the queue",
-                         impact= MBeanOperationInfo.ACTION)
-    void deleteQueue(@MBeanOperationParameter(name= ManagedQueue.TYPE, description="Queue Name")String queueName)
-        throws IOException, JMException;
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/management/ManagedObject.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/management/ManagedObject.java
deleted file mode 100644
index 42ea8921a4..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/management/ManagedObject.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.management;
-
-import javax.management.MalformedObjectNameException;
-import javax.management.ObjectName;
-
-import org.apache.qpid.AMQException;
-
-/**
- * This should be implemented by all Managable objects.
- */
-public interface ManagedObject
-{
-    static final String DOMAIN = "org.apache.qpid";
-
-    /**
-     * @return the name that uniquely identifies this object instance. It must be
-     * unique only among objects of this type at this level in the hierarchy so
-     * the uniqueness should not be too difficult to ensure.
-     */
-    String getObjectInstanceName();
-
-    String getType();
-
-    Class<?> getManagementInterface();
-
-    ManagedObject getParentObject();
-
-    void register() throws AMQException;
-
-    void unregister() throws AMQException;
-
-    /**
-     * Returns the ObjectName required for the mbeanserver registration.
-     * @return ObjectName
-     * @throws MalformedObjectNameException
-     */
-    ObjectName getObjectName() throws MalformedObjectNameException;
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/management/ManagedObjectRegistry.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/management/ManagedObjectRegistry.java
deleted file mode 100644
index d8d87ef881..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/management/ManagedObjectRegistry.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.management;
-
-import javax.management.JMException;
-import java.rmi.RemoteException;
-import java.io.IOException;
-
-/**
- * Handles the registration (and unregistration and so on) of managed objects.
- *
- * Managed objects are responsible for exposting attributes, operations and notifications. They will expose
- * these outside the JVM therefore it is important not to use implementation objects directly as managed objects.
- * Instead, creating inner classes and exposing those is an effective way of exposing internal state in a
- * controlled way.
- *
- * Although we do not explictly use them while targetting Java 5, the enhanced MXBean approach in Java 6 will
- * be the obvious choice for managed objects.
- *
- */
-public interface ManagedObjectRegistry
-{
-    void start() throws IOException;
-
-    void registerObject(ManagedObject managedObject) throws JMException;
-
-    void unregisterObject(ManagedObject managedObject) throws JMException;
-
-    void close() throws RemoteException;
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/management/ManagementConfiguration.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/management/ManagementConfiguration.java
deleted file mode 100644
index 042f626e8b..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/management/ManagementConfiguration.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.management;
-
-import org.apache.qpid.configuration.Configured;
-
-public class ManagementConfiguration
-{
-    @Configured(path = "management.enabled",
-                defaultValue = "true")
-    public boolean enabled;
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/management/NoopManagedObjectRegistry.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/management/NoopManagedObjectRegistry.java
deleted file mode 100644
index b4fbed6948..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/management/NoopManagedObjectRegistry.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.management;
-
-import javax.management.JMException;
-
-import org.apache.log4j.Logger;
-
-import java.rmi.RemoteException;
-
-/**
- * This managed object registry does not actually register MBeans. This can be used in tests when management is
- * not required or when management has been disabled.
- *
- */
-public class NoopManagedObjectRegistry implements ManagedObjectRegistry
-{
-    private static final Logger _log = Logger.getLogger(NoopManagedObjectRegistry.class);
-
-    public NoopManagedObjectRegistry()
-    {
-        _log.info("Management is disabled");
-    }
-
-    public void start()
-    {
-        //no-op
-    }
-
-    public void registerObject(ManagedObject managedObject) throws JMException
-    {
-    }
-
-    public void unregisterObject(ManagedObject managedObject) throws JMException
-    {
-    }
-
-    public void close() throws RemoteException
-    {
-        
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/messageStore/JDBCStore.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/messageStore/JDBCStore.java
deleted file mode 100644
index 8c13473488..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/messageStore/JDBCStore.java
+++ /dev/null
@@ -1,1861 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.qpid.server.messageStore;
-
-import org.apache.commons.configuration.Configuration;
-import org.apache.log4j.Logger;
-import org.apache.mina.common.ByteBuffer;
-import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.framing.ContentHeaderBody;
-import org.apache.qpid.framing.FieldTable;
-import org.apache.qpid.framing.abstraction.MessagePublishInfo;
-import org.apache.qpid.server.exception.InternalErrorException;
-import org.apache.qpid.server.exception.InvalidXidException;
-import org.apache.qpid.server.exception.MessageAlreadyStagedException;
-import org.apache.qpid.server.exception.MessageDoesntExistException;
-import org.apache.qpid.server.exception.QueueAlreadyExistsException;
-import org.apache.qpid.server.exception.QueueDoesntExistException;
-import org.apache.qpid.server.exception.UnknownXidException;
-import org.apache.qpid.server.exchange.Exchange;
-import org.apache.qpid.server.queue.AMQMessage;
-import org.apache.qpid.server.queue.AMQQueue;
-import org.apache.qpid.server.queue.MessageHandleFactory;
-import org.apache.qpid.server.store.StoreContext;
-import org.apache.qpid.server.txn.JDBCAbstractRecord;
-import org.apache.qpid.server.txn.JDBCDequeueRecord;
-import org.apache.qpid.server.txn.JDBCEnqueueRecord;
-import org.apache.qpid.server.txn.JDBCTransaction;
-import org.apache.qpid.server.txn.JDBCTransactionManager;
-import org.apache.qpid.server.txn.Transaction;
-import org.apache.qpid.server.txn.TransactionManager;
-import org.apache.qpid.server.txn.TransactionRecord;
-import org.apache.qpid.server.txn.TransactionalContext;
-import org.apache.qpid.server.txn.XidImpl;
-import org.apache.qpid.server.virtualhost.VirtualHost;
-
-import javax.transaction.xa.Xid;
-import java.sql.Blob;
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-
-/**
- * Created by Arnaud Simon
- * Date: 15-May-2007
- * Time: 09:59:12
- */
-public class JDBCStore implements MessageStore
-{
-    //========================================================================
-    // Static Constants
-    //========================================================================
-    // The logger for this class
-    private static final Logger _log = Logger.getLogger(JDBCStore.class);
-    // the database connection pool
-    public static ConnectionPool _connectionPool = null;
-    // the prepared statements
-    //==== IMPORTANT: remember to update if we add more prepared statements!
-    private static final int CREATE_EXCHANGE = 0;
-    private static final int DELETE_EXCHANGE = 1;
-    private static final int BIND_QUEUE = 2;
-    private static final int UNBIND_QUEUE = 3;
-    private static final int CREATE_QUEUE = 4;
-    private static final int DELETE_QUEUE = 5;
-    private static final int STAGE_MESSAGE = 6;
-    private static final int UPDATE_MESSAGE_PAYLOAD = 7;
-    private static final int SELECT_MESSAGE_PAYLOAD = 8;
-    private static final int DELETE_MESSAGE = 9;
-    private static final int ENQUEUE = 10;
-    private static final int DEQUEUE = 11;
-    private static final int GET_ALL_QUEUES = 12;
-    private static final int GET_ALL_MESSAGES = 13;
-    private static final int SAVE_RECORD = 14;
-    private static final int SAVE_XID = 15;
-    private static final int DELETE_RECORD = 16;
-    private static final int DELETE_XID = 17;
-    private static final int UPDATE_QMR = 18;
-    private static final int GET_CONTENT_HEADER = 19;
-    private static final int GET_MESSAGE_INFO = 20;
-    //==== size:
-    private static final int STATEMENT_SIZE = 21;
-    //========================================================================
-    // field properties
-    //========================================================================
-    //The default URL
-    protected String _connectionURL = "jdbc:derby:derbyDB;create=true";
-    // The default driver
-    private String _driver = "org.apache.derby.jdbc.EmbeddedDriver";
-    // The pool max size
-    private int _maxSize = 40;
-    // The tables
-    // the table containing the messages
-    private String _tableNameMessage = "MessageTable";
-    private String _tableNameQueue = "QueueTable";
-    private String _tableNameQueueMessageRelation = "QeueMessageRelation";
-    private String _tableNameExchange = "Exchange";
-    private String _tableNameExchangeQueueRelation = "ExchangeQueueRelation";
-    private String _tableNameTransaction = "TransactionTable";
-    private String _tableNameRecord = "RecordTable";
-
-    // The transaction maanger
-    private JDBCTransactionManager _tm;
-    // the message ID
-    private long _messageID = 0;
-    // the virtual host
-    private VirtualHost _virtualHost;
-    // indicate whether this store is recovering
-    private boolean _recovering = false;
-    // the recovered queues
-    private HashMap<Integer, AMQQueue> _queueMap;
-
-    //========================================================================
-    // Interface MessageStore
-    //========================================================================
-    public void configure(VirtualHost virtualHost, TransactionManager tm, String base, Configuration config)
-            throws
-            InternalErrorException,
-            IllegalArgumentException
-    {
-        _log.info("Configuring Derby message store");
-        // the virtual host
-        _virtualHost = virtualHost;
-        // Specify that the tables must be dropped.
-        // If true then this means that recovery is not possible.
-        boolean dropTables = true;
-        if (config != null)
-        {
-            dropTables = config.getBoolean(base + "dropTables", false);
-            _driver = config.getString(base + "driver", _driver);
-            _connectionURL = config.getString(base + "connectionURL", _connectionURL);
-            _maxSize = config.getInt(base + "connectionPoolSize", 20);
-        }
-        if (dropTables)
-        {
-            _log.info("Dropping table of Derby message store");
-        }
-        if (!setupStore(dropTables))
-        {
-            _log.error("Error configuration of Derby store failed");
-            throw new InternalErrorException("Error configuration of Derby store failed");
-        }
-        // recovery
-        _recovering = true;
-        _queueMap = recover(); //==> recover the queues and the messages
-        // recreate the excahnges and bind the queues
-        recoverExchanges(_queueMap);
-        _recovering = false;
-        _tm = (JDBCTransactionManager) tm;
-        _tm.configure(this, "txn", config);
-        _queueMap.clear();
-        _queueMap = null;
-    }
-
-    public void close()
-            throws
-            InternalErrorException
-    {
-        // nothing has to be done
-    }
-
-    public void createExchange(Exchange exchange)
-            throws
-            InternalErrorException
-    {
-        if (!_recovering)
-        {
-            MyConnection connection = null;
-            try
-            {
-                connection = (MyConnection) _connectionPool.acquireInstance();
-                PreparedStatement pstmt = connection.getStatements()[CREATE_EXCHANGE];
-                if (pstmt == null)
-                {
-                    pstmt = connection.getConnection().prepareStatement("INSERT INTO " + _tableNameExchange +
-                                                                        " (Name,Type) VALUES (?,?)");
-                    connection.getStatements()[CREATE_EXCHANGE] = pstmt;
-                }
-                pstmt.setString(1, exchange.getName().asString());
-                pstmt.setString(2, exchange.getType().asString());
-                pstmt.executeUpdate();
-            }
-            catch (Exception e)
-            {
-                throw new InternalErrorException("Cannot create Exchange: " + exchange, e);
-            }
-            finally
-            {
-                if (connection != null)
-                {
-                    try
-                    {
-                        connection.getConnection().commit();
-                        _connectionPool.releaseInstance(connection);
-                    }
-                    catch (SQLException e)
-                    {
-                        // we did not manage to commit this connection
-                        // it is better to release it
-                        _connectionPool.releaseDeadInstance();
-                        throw new InternalErrorException("Cannot create Exchange: " + exchange, e);
-                    }
-                }
-            }
-        }
-    }
-
-    public void removeExchange(Exchange exchange)
-            throws
-            InternalErrorException
-    {
-        if (!_recovering)
-        {
-            MyConnection connection = null;
-            try
-            {
-                connection = (MyConnection) _connectionPool.acquireInstance();
-                PreparedStatement pstmt = connection.getStatements()[DELETE_EXCHANGE];
-                if (pstmt == null)
-                {
-                    pstmt = connection.getConnection().prepareStatement("DELETE FROM " + _tableNameExchange +
-                                                                        " WHERE Name = ?");
-                    connection.getStatements()[DELETE_EXCHANGE] = pstmt;
-                }
-                pstmt.setString(1, exchange.getName().asString());
-                pstmt.executeUpdate();
-            }
-            catch (Exception e)
-            {
-                throw new InternalErrorException("Cannot remove Exchange: " + exchange, e);
-            }
-            finally
-            {
-                if (connection != null)
-                {
-                    try
-                    {
-                        connection.getConnection().commit();
-                        _connectionPool.releaseInstance(connection);
-                    }
-                    catch (SQLException e)
-                    {
-                        // we did not manage to commit this connection
-                        // it is better to release it
-                        _connectionPool.releaseDeadInstance();
-                        throw new InternalErrorException("Cannot remove Exchange: " + exchange, e);
-                    }
-                }
-            }
-        }
-    }
-
-    public void bindQueue(Exchange exchange, AMQShortString routingKey, StorableQueue queue, FieldTable args)
-            throws
-            InternalErrorException
-    {
-        if (!_recovering)
-        {
-            MyConnection connection = null;
-            try
-            {
-                connection = (MyConnection) _connectionPool.acquireInstance();
-                PreparedStatement pstmt = connection.getStatements()[BIND_QUEUE];
-                if (pstmt == null)
-                {
-                    pstmt = connection.getConnection().prepareStatement("INSERT INTO " + _tableNameExchangeQueueRelation +
-                                                                        " (QueueID,Name,RoutingKey,fieldTable) VALUES (?,?,?,?)");
-                    connection.getStatements()[BIND_QUEUE] = pstmt;
-                }
-                pstmt.setInt(1, queue.getQueueID());
-                pstmt.setString(2, exchange.getName().asString());
-                pstmt.setString(3, routingKey.asString());
-                if (args != null)
-                {
-                    pstmt.setBytes(4, args.getDataAsBytes());
-                }
-                else
-                {
-                    pstmt.setBytes(4, null);
-                }
-                pstmt.executeUpdate();
-            }
-            catch (Exception e)
-            {
-                throw new InternalErrorException("Cannot create Exchange: " + exchange, e);
-            }
-            finally
-            {
-                if (connection != null)
-                {
-                    try
-                    {
-                        connection.getConnection().commit();
-                        _connectionPool.releaseInstance(connection);
-                    }
-                    catch (SQLException e)
-                    {
-                        // we did not manage to commit this connection
-                        // it is better to release it
-                        _connectionPool.releaseDeadInstance();
-                        throw new InternalErrorException("Cannot create Exchange: " + exchange, e);
-                    }
-                }
-            }
-        }
-    }
-
-    public void unbindQueue(Exchange exchange, AMQShortString routingKey, StorableQueue queue, FieldTable args)
-            throws
-            InternalErrorException
-    {
-        MyConnection connection = null;
-        try
-        {
-            connection = (MyConnection) _connectionPool.acquireInstance();
-            PreparedStatement pstmt = connection.getStatements()[UNBIND_QUEUE];
-            if (pstmt == null)
-            {
-                pstmt = connection.getConnection().prepareStatement("DELETE FROM " + _tableNameExchangeQueueRelation +
-                                                                    " WHERE QueueID = ? AND NAME = ? AND RoutingKey = ?");
-                connection.getStatements()[UNBIND_QUEUE] = pstmt;
-            }
-            pstmt.setInt(1, queue.getQueueID());
-            pstmt.setString(2, exchange.getName().asString());
-            pstmt.setString(3, routingKey.asString());
-            pstmt.executeUpdate();
-        }
-        catch (Exception e)
-        {
-            throw new InternalErrorException("Cannot remove Exchange: " + exchange, e);
-        }
-        finally
-        {
-            if (connection != null)
-            {
-                try
-                {
-                    connection.getConnection().commit();
-                    _connectionPool.releaseInstance(connection);
-                }
-                catch (SQLException e)
-                {
-                    // we did not manage to commit this connection
-                    // it is better to release it
-                    _connectionPool.releaseDeadInstance();
-                    throw new InternalErrorException("Cannot remove Exchange: " + exchange, e);
-                }
-            }
-        }
-    }
-
-    public void createQueue(StorableQueue queue)
-            throws
-            InternalErrorException,
-            QueueAlreadyExistsException
-    {
-        MyConnection connection = null;
-        try
-        {
-            connection = (MyConnection) _connectionPool.acquireInstance();
-            PreparedStatement pstmt = connection.getStatements()[CREATE_QUEUE];
-            if (pstmt == null)
-            {
-                pstmt = connection.getConnection().prepareStatement("INSERT INTO " + _tableNameQueue +
-                                                                    " (QueueID,Name,Owner) VALUES (?,?,?)");
-                connection.getStatements()[CREATE_QUEUE] = pstmt;
-            }
-            pstmt.setInt(1, queue.getQueueID());
-            pstmt.setString(2, queue.getName().asString());
-            if (queue.getOwner() != null)
-            {
-                pstmt.setString(3, queue.getOwner().asString());
-            }
-            else
-            {
-                pstmt.setString(3, null);
-            }
-            pstmt.executeUpdate();
-        }
-        catch (Exception e)
-        {
-            throw new InternalErrorException("Cannot create Queue: " + queue, e);
-        }
-        finally
-        {
-            if (connection != null)
-            {
-                try
-                {
-                    connection.getConnection().commit();
-                    _connectionPool.releaseInstance(connection);
-                }
-                catch (SQLException e)
-                {
-                    // we did not manage to commit this connection
-                    // it is better to release it
-                    _connectionPool.releaseDeadInstance();
-                    throw new InternalErrorException("Cannot create Queue: " + queue, e);
-                }
-            }
-        }
-    }
-
-    public void destroyQueue(StorableQueue queue)
-            throws
-            InternalErrorException,
-            QueueDoesntExistException
-    {
-        MyConnection connection = null;
-        try
-        {
-            connection = (MyConnection) _connectionPool.acquireInstance();
-            PreparedStatement pstmt = connection.getStatements()[DELETE_QUEUE];
-            if (pstmt == null)
-            {
-                pstmt = connection.getConnection().prepareStatement("DELETE FROM " + _tableNameQueue +
-                                                                    " WHERE QueueID = ?");
-                connection.getStatements()[DELETE_QUEUE] = pstmt;
-            }
-            pstmt.setInt(1, queue.getQueueID());
-            pstmt.executeUpdate();
-        }
-        catch (Exception e)
-        {
-            throw new InternalErrorException("Cannot remove Queue: " + queue, e);
-        }
-        finally
-        {
-            if (connection != null)
-            {
-                try
-                {
-                    connection.getConnection().commit();
-                    _connectionPool.releaseInstance(connection);
-                }
-                catch (SQLException e)
-                {
-                    // we did not manage to commit this connection
-                    // it is better to release it
-                    _connectionPool.releaseDeadInstance();
-                    throw new InternalErrorException("Cannot remove Queue: " + queue, e);
-                }
-            }
-        }
-    }
-
-    public void stage(StorableMessage m)
-            throws
-            InternalErrorException,
-            MessageAlreadyStagedException
-    {
-        if (m.isStaged() || m.isEnqueued())
-        {
-            _log.error("Message with Id " + m.getMessageId() + " is already staged");
-            throw new MessageAlreadyStagedException("Message eith Id " + m.getMessageId() + " is already staged");
-        }
-        MyConnection connection = null;
-        try
-        {
-            connection = (MyConnection) _connectionPool.acquireInstance();
-            stage(connection, m);
-        }
-        catch (Exception e)
-        {
-            throw new InternalErrorException("Cannot stage Message: " + m, e);
-        }
-        finally
-        {
-            if (connection != null)
-            {
-                try
-                {
-                    connection.getConnection().commit();
-                    _connectionPool.releaseInstance(connection);
-                }
-                catch (SQLException e)
-                {
-                    // we did not manage to commit this connection
-                    // it is better to release it
-                    _connectionPool.releaseDeadInstance();
-                    throw new InternalErrorException("Cannot stage Message: " + m, e);
-                }
-            }
-        }
-    }
-
-    public void appendContent(StorableMessage m, byte[] data, int offset, int size)
-            throws
-            InternalErrorException,
-            MessageDoesntExistException
-    {
-        // The message must have been staged
-        if (!m.isStaged())
-        {
-            _log.error("Cannot append content of message Id "
-                       + m.getMessageId() + " as it has not been staged");
-            throw new MessageDoesntExistException("Cannot append content of message Id "
-                                                  + m.getMessageId() + " as it has not been staged");
-        }
-        MyConnection connection = null;
-        try
-        {
-            connection = (MyConnection) _connectionPool.acquireInstance();
-            appendContent(connection, m, data, offset, size);
-        }
-        catch (Exception e)
-        {
-            throw new InternalErrorException("Cannot stage Message: " + m, e);
-        }
-        finally
-        {
-            if (connection != null)
-            {
-                try
-                {
-                    connection.getConnection().commit();
-                    _connectionPool.releaseInstance(connection);
-                }
-                catch (SQLException e)
-                {
-                    // we did not manage to commit this connection
-                    // it is better to release it
-                    _connectionPool.releaseDeadInstance();
-                    throw new InternalErrorException("Cannot stage Message: " + m, e);
-                }
-            }
-        }
-    }
-
-    public byte[] loadContent(StorableMessage m, int offset, int size)
-            throws
-            InternalErrorException,
-            MessageDoesntExistException
-    {
-        MyConnection connection = null;
-        try
-        {
-            byte[] result;
-            connection = (MyConnection) _connectionPool.acquireInstance();
-            PreparedStatement pstmt = connection.getStatements()[SELECT_MESSAGE_PAYLOAD];
-            if (pstmt == null)
-            {
-                pstmt = connection.getConnection().prepareStatement("SELECT Payload FROM " + _tableNameMessage +
-                                                                    " WHERE MessageID = ? ");
-                connection.getStatements()[SELECT_MESSAGE_PAYLOAD] = pstmt;
-            }
-            pstmt.setLong(1, m.getMessageId());
-            ResultSet rs = pstmt.executeQuery();
-            if (!rs.next())
-            {
-                throw new MessageDoesntExistException("Cannot load content of message Id "
-                                                      + m.getMessageId() + " as it has not been found");
-            }
-            Blob myBlob = rs.getBlob(1);
-
-            if (myBlob.length() > 0)
-            {
-                if (size == 0)
-                {
-                    result = myBlob.getBytes(offset, (int) myBlob.length());
-                }
-                else
-                {
-                    result = myBlob.getBytes(offset, size);
-                }
-            }
-            else
-            {
-                throw new MessageDoesntExistException("Cannot load content of message Id "
-                                                      + m.getMessageId() + " as it has not been found");
-            }
-            rs.close();
-            return result;
-        }
-        catch (Exception e)
-        {
-            throw new InternalErrorException("Cannot load Message: " + m, e);
-        }
-        finally
-        {
-            if (connection != null)
-            {
-                try
-                {
-                    connection.getConnection().commit();
-                    _connectionPool.releaseInstance(connection);
-                }
-                catch (SQLException e)
-                {
-                    // we did not manage to commit this connection
-                    // it is better to release it
-                    _connectionPool.releaseDeadInstance();
-                    throw new InternalErrorException("Cannot load Message: " + m, e);
-                }
-            }
-        }
-    }
-
-    public void destroy(StorableMessage m)
-            throws
-            InternalErrorException,
-            MessageDoesntExistException
-    {
-        MyConnection connection = null;
-        try
-        {
-            connection = (MyConnection) _connectionPool.acquireInstance();
-            destroy(connection, m);
-        }
-        catch (Exception e)
-        {
-            throw new InternalErrorException("Cannot destroy message: " + m, e);
-        }
-        finally
-        {
-            if (connection != null)
-            {
-                try
-                {
-                    connection.getConnection().commit();
-                    _connectionPool.releaseInstance(connection);
-                }
-                catch (SQLException e)
-                {
-                    // we did not manage to commit this connection
-                    // it is better to release it
-                    _connectionPool.releaseDeadInstance();
-                    throw new InternalErrorException("Cannot destroy message: " + m, e);
-                }
-            }
-        }
-    }
-
-    public void enqueue(Xid xid, StorableMessage m, StorableQueue queue)
-            throws
-            InternalErrorException,
-            QueueDoesntExistException,
-            InvalidXidException,
-            UnknownXidException,
-            MessageDoesntExistException
-    {
-        MyConnection connection = null;
-        // Get the current tx
-        JDBCTransaction tx = getTx(xid);
-        // If this operation is transacted then we need to add a record
-        if (tx != null && !tx.isPrepared())
-        {
-            // add an enqueue record
-            tx.addRecord(new JDBCEnqueueRecord(m, queue));
-        }
-        else
-        {
-            try
-            {
-                if (tx != null)
-                {
-                    connection = tx.getConnection();
-                }
-                else
-                {
-                    connection = (MyConnection) _connectionPool.acquireInstance();
-                }
-                if (!m.isStaged() && !m.isEnqueued())
-                {
-                    //This is the first time this message is enqueued and it has not been staged.
-                    stage(connection, m);
-                    appendContent(connection, m, m.getData(), 0, m.getData().length);
-                }
-                PreparedStatement pstmt = connection.getStatements()[ENQUEUE];
-                if (pstmt == null)
-                {
-                    pstmt = connection.getConnection().prepareStatement("INSERT INTO " + _tableNameQueueMessageRelation +
-                                                                        " (QueueID,MessageID,Prepared) VALUES (?,?,0)");
-                    connection.getStatements()[ENQUEUE] = pstmt;
-                }
-                pstmt.setInt(1, queue.getQueueID());
-                pstmt.setLong(2, m.getMessageId());
-                pstmt.executeUpdate();
-                m.enqueue(queue);
-                queue.enqueue(m);
-            }
-            catch (Exception e)
-            {
-                throw new InternalErrorException("Cannot enqueue message : " + m + " in queue: " + queue, e);
-            }
-            finally
-            {
-                if (tx == null && connection != null)
-                {
-                    try
-                    {
-                        connection.getConnection().commit();
-                        _connectionPool.releaseInstance(connection);
-                    }
-                    catch (SQLException e)
-                    {
-                        // we did not manage to commit this connection
-                        // it is better to release it
-                        _connectionPool.releaseDeadInstance();
-                        throw new InternalErrorException("Cannot enqueue message : " + m + " in queue: " + queue, e);
-                    }
-                }
-            }
-        }
-    }
-
-    public void dequeue(Xid xid, StorableMessage m, StorableQueue queue)
-            throws
-            InternalErrorException,
-            QueueDoesntExistException,
-            InvalidXidException,
-            UnknownXidException
-    {
-        MyConnection connection = null;
-        // Get the current tx
-        JDBCTransaction tx = getTx(xid);
-        // If this operation is transacted then we need to add a record
-        if (tx != null && !tx.isPrepared())
-        {
-            // add an dequeue record
-            tx.addRecord(new JDBCDequeueRecord(m, queue));
-        }
-        else
-        {
-            try
-            {
-                if (tx != null)
-                {
-                    connection = tx.getConnection();
-                }
-                else
-                {
-                    connection = (MyConnection) _connectionPool.acquireInstance();
-                }
-                PreparedStatement pstmt = connection.getStatements()[DEQUEUE];
-                if (pstmt == null)
-                {
-                    pstmt = connection.getConnection().prepareStatement("DELETE FROM " + _tableNameQueueMessageRelation +
-                                                                        " WHERE QueueID = ? AND MessageID = ?");
-                    connection.getStatements()[DEQUEUE] = pstmt;
-                }
-                pstmt.setInt(1, queue.getQueueID());
-                pstmt.setLong(2, m.getMessageId());
-                pstmt.executeUpdate();
-                m.dequeue(queue);
-                if (!m.isEnqueued())
-                {
-                    // delete this message from persistence store
-                    destroy(connection, m);
-                }
-                queue.dequeue(m);
-            }
-            catch (Exception e)
-            {
-                throw new InternalErrorException("Cannot enqueue message : " + m + " in queue: " + queue, e);
-            }
-            finally
-            {
-                if (tx == null && connection != null)
-                {
-                    try
-                    {
-                        connection.getConnection().commit();
-                        _connectionPool.releaseInstance(connection);
-                    }
-                    catch (SQLException e)
-                    {
-                        // we did not manage to commit this connection
-                        // it is better to release it
-                        _connectionPool.releaseDeadInstance();
-                        throw new InternalErrorException("Cannot enqueue message : " + m + " in queue: " + queue, e);
-                    }
-                }
-            }
-        }
-    }
-
-    public Collection<StorableQueue> getAllQueues()
-            throws
-            InternalErrorException
-    {
-        MyConnection connection = null;
-        List<StorableQueue> result = new ArrayList<StorableQueue>();
-        try
-        {
-            connection = (MyConnection) _connectionPool.acquireInstance();
-            PreparedStatement pstmt = connection.getStatements()[GET_ALL_QUEUES];
-            if (pstmt == null)
-            {
-                pstmt = connection.getConnection().prepareStatement("SELECT * FROM " + _tableNameQueue);
-                connection.getStatements()[GET_ALL_QUEUES] = pstmt;
-            }
-            ResultSet rs = pstmt.executeQuery();
-            while (rs.next())
-            {
-                //the queue owner may be null
-                AMQShortString queueOwner = null;
-                if (rs.getString(3) != null)
-                {
-                    queueOwner = new AMQShortString(rs.getString(3));
-                }
-                result.add(new AMQQueue(new AMQShortString(rs.getString(2)), true, queueOwner,
-                                        false, _virtualHost));
-            }
-            rs.close();
-            return result;
-        }
-        catch (Exception e)
-        {
-            throw new InternalErrorException("Cannot get all queues", e);
-        }
-        finally
-        {
-            if (connection != null)
-            {
-                try
-                {
-                    connection.getConnection().commit();
-                    _connectionPool.releaseInstance(connection);
-                }
-                catch (SQLException e)
-                {
-                    // we did not manage to commit this connection
-                    // it is better to release it
-                    _connectionPool.releaseDeadInstance();
-                    throw new InternalErrorException("Cannot get all queues", e);
-                }
-            }
-        }
-    }
-
-    public Collection<StorableMessage> getAllMessages(StorableQueue queue)
-            throws
-            InternalErrorException
-    {
-        MyConnection connection = null;
-        try
-        {
-            connection = (MyConnection) _connectionPool.acquireInstance();
-            return getAllMessages(connection, queue);
-        }
-        catch (Exception e)
-        {
-            throw new InternalErrorException("Cannot get all queues", e);
-        }
-        finally
-        {
-            if (connection != null)
-            {
-                try
-                {
-                    connection.getConnection().commit();
-                    _connectionPool.releaseInstance(connection);
-                }
-                catch (SQLException e)
-                {
-                    // we did not manage to commit this connection
-                    // it is better to release it
-                    _connectionPool.releaseDeadInstance();
-                    throw new InternalErrorException("Cannot get all queues", e);
-                }
-            }
-        }
-    }
-
-    public HashMap<Xid, Transaction> getAllInddoubt()
-            throws
-            InternalErrorException
-    {
-        MyConnection connection = null;
-        HashMap<Xid, Transaction> result = new HashMap<Xid, Transaction>();
-        try
-        {
-            //TransactionalContext txnContext = new NonTransactionalContext(this, new StoreContext(), null, null, null);
-            MessageHandleFactory messageHandleFactory = new MessageHandleFactory();
-            // re-create all the tx
-            connection = (MyConnection) _connectionPool.acquireInstance();
-            Statement stmt = connection.getConnection().createStatement();
-            ResultSet rs = stmt.executeQuery("SELECT * FROM " + _tableNameTransaction);
-            JDBCTransaction foundTx;
-            Xid foundXid;
-            long foundXIDID;
-            while (rs.next())
-            {
-                // set the XID_ID
-                foundXIDID = rs.getLong(1);
-                if (foundXIDID > JDBCTransaction._xidId)
-                {
-                    JDBCTransaction._xidId = foundXIDID;
-                }
-                foundTx = new JDBCTransaction();
-                foundXid = new XidImpl(rs.getBlob(3).getBytes(1, (int) rs.getBlob(3).length()),
-                                       rs.getInt(2), rs.getBlob(4).getBytes(1, (int) rs.getBlob(4).length()));
-                // get all the records
-                Statement stmtr = connection.getConnection().createStatement();
-                ResultSet rsr = stmtr.executeQuery("SELECT * FROM " + _tableNameRecord +
-                                                   " WHERE XID_ID = " + rs.getLong(1));
-                int foundType;
-                AMQQueue foundQueue;
-                StorableMessage foundMessage;
-                TransactionRecord foundRecord;
-                while (rsr.next())
-                {
-                    // those messages were not recovered before so they need to be recreated
-                    foundType = rsr.getInt(2);
-                    foundQueue = _queueMap.get(new Integer(rsr.getInt(4)));
-
-                    //DTX MessageStore - this -> null , txContext -> null
-                    foundMessage = new AMQMessage(rs.getLong(3), null, messageHandleFactory, null);
-                    if (foundType == JDBCAbstractRecord.TYPE_DEQUEUE)
-                    {
-                        foundRecord = new JDBCDequeueRecord(foundMessage, foundQueue);
-                    }
-                    else
-                    {
-                        foundRecord = new JDBCEnqueueRecord(foundMessage, foundQueue);
-                    }
-                    foundTx.addRecord(foundRecord);
-                }
-                rsr.close();
-                // add this tx to the map
-                result.put(foundXid, foundTx);
-            }
-            rs.close();
-            return result;
-        }
-        catch (Exception e)
-        {
-            throw new InternalErrorException("Cannot recover: ", e);
-        }
-        finally
-        {
-            if (connection != null)
-            {
-                try
-                {
-                    connection.getConnection().commit();
-                    _connectionPool.releaseInstance(connection);
-                }
-                catch (SQLException e)
-                {
-                    // we did not manage to commit this connection
-                    // it is better to release it
-                    _connectionPool.releaseDeadInstance();
-                    throw new InternalErrorException("Cannot recover: ", e);
-                }
-            }
-        }
-    }
-
-
-    public long getNewMessageId()
-    {
-        return _messageID++;
-    }
-
-    //========================================================================
-    // Public methods
-    //========================================================================
-
-    public MyConnection getConnection()
-            throws
-            Exception
-    {
-        return (MyConnection) _connectionPool.acquireInstance();
-    }
-
-    public void commitConnection(MyConnection connection)
-            throws
-            InternalErrorException
-    {
-        try
-        {
-            connection.getConnection().commit();
-            _connectionPool.releaseInstance(connection);
-        }
-        catch (SQLException e)
-        {
-            // we did not manage to commit this connection
-            // it is better to release it
-            _connectionPool.releaseDeadInstance();
-            throw new InternalErrorException("Cannot commit connection =", e);
-        }
-    }
-
-    public void rollbackConnection(MyConnection connection)
-            throws
-            InternalErrorException
-    {
-        try
-        {
-            connection.getConnection().rollback();
-            _connectionPool.releaseInstance(connection);
-        }
-        catch (SQLException e)
-        {
-            // we did not manage to rollback this connection
-            // it is better to release it
-            _connectionPool.releaseDeadInstance();
-            throw new InternalErrorException("Cannot rollback connection", e);
-        }
-    }
-
-    public void appendContent(MyConnection connection, StorableMessage m, byte[] data, int offset, int size)
-            throws
-            SQLException,
-            MessageDoesntExistException
-    {
-        PreparedStatement pstmt = connection.getStatements()[SELECT_MESSAGE_PAYLOAD];
-        if (pstmt == null)
-        {
-            pstmt = connection.getConnection().prepareStatement("SELECT Payload FROM " + _tableNameMessage +
-                                                                " WHERE MessageID = ? ");
-            connection.getStatements()[SELECT_MESSAGE_PAYLOAD] = pstmt;
-        }
-        pstmt.setLong(1, m.getMessageId());
-        ResultSet rs = pstmt.executeQuery();
-        if (!rs.next())
-        {
-            throw new MessageDoesntExistException("Cannot append content of message Id "
-                                                  + m.getMessageId() + " as it has not been found");
-        }
-        Blob myBlob = rs.getBlob(1);
-        byte[] oldPayload;
-        if (myBlob != null && myBlob.length() > 0)
-        {
-            oldPayload = myBlob.getBytes(1, (int) myBlob.length());
-        }
-        else
-        {
-            oldPayload = new byte[0];
-        }
-        rs.close();
-        byte[] newPayload = new byte[oldPayload.length + size];
-        ByteBuffer buffer = ByteBuffer.wrap(newPayload);
-        buffer.put(oldPayload);
-        buffer.put(data, offset, size);
-        PreparedStatement pstmtUpdate = connection.getStatements()[UPDATE_MESSAGE_PAYLOAD];
-        if (pstmtUpdate == null)
-        {
-            pstmtUpdate = connection.getConnection().prepareStatement("UPDATE " + _tableNameMessage +
-                                                                      " SET Payload = ? WHERE MessageID = ?");
-            connection.getStatements()[UPDATE_MESSAGE_PAYLOAD] = pstmtUpdate;
-        }
-        pstmtUpdate.setBytes(1, newPayload);
-        pstmtUpdate.setLong(2, m.getMessageId());
-        pstmtUpdate.executeUpdate();
-    }
-
-    public void stage(MyConnection connection, StorableMessage m)
-            throws
-            Exception
-    {
-        PreparedStatement pstmt = connection.getStatements()[STAGE_MESSAGE];
-        if (pstmt == null)
-        {
-            pstmt = connection.getConnection().prepareStatement("INSERT INTO " + _tableNameMessage +
-                                                                " (MessageID,Header,ExchangeName,RoutingKey,Mandatory,Is_Immediate) VALUES (?,?,?,?,?,?)");
-            connection.getStatements()[STAGE_MESSAGE] = pstmt;
-        }
-        pstmt.setLong(1, m.getMessageId());
-        pstmt.setBytes(2, m.getHeaderBody());
-        pstmt.setString(3, ((AMQMessage) m).getMessagePublishInfo().getExchange().asString());
-        pstmt.setString(4, ((AMQMessage) m).getMessagePublishInfo().getRoutingKey().asString());
-        pstmt.setBoolean(5, ((AMQMessage) m).getMessagePublishInfo().isMandatory());
-        pstmt.setBoolean(6, ((AMQMessage) m).getMessagePublishInfo().isImmediate());
-        pstmt.executeUpdate();
-        m.staged();
-    }
-
-    public void saveRecord(MyConnection connection, JDBCTransaction tx, JDBCAbstractRecord record)
-            throws
-            InternalErrorException
-    {
-        try
-        {
-            PreparedStatement pstmt = connection.getStatements()[SAVE_RECORD];
-            if (pstmt == null)
-            {
-                pstmt = connection.getConnection().prepareStatement("INSERT INTO " + _tableNameRecord +
-                                                                    " (XID_ID,Type,MessageID,QueueID) VALUES (?,?,?,?)");
-                connection.getStatements()[SAVE_RECORD] = pstmt;
-            }
-            pstmt.setLong(1, tx.getXidID());
-            pstmt.setInt(2, record.getType());
-            pstmt.setLong(3, record.getMessageID());
-            pstmt.setLong(4, record.getQueueID());
-            pstmt.executeUpdate();
-        }
-        catch (Exception e)
-        {
-            throw new InternalErrorException("Cannot save record: " + record, e);
-        }
-    }
-
-    public void saveXID(MyConnection connection, JDBCTransaction tx, Xid xid)
-            throws
-            InternalErrorException
-    {
-        try
-        {
-            PreparedStatement pstmt = connection.getStatements()[SAVE_XID];
-            if (pstmt == null)
-            {
-                pstmt = connection.getConnection().prepareStatement("INSERT INTO " + _tableNameTransaction +
-                                                                    " (XID_ID,FormatId, BranchQualifier,GlobalTransactionId) VALUES (?,?,?,?)");
-                connection.getStatements()[SAVE_XID] = pstmt;
-            }
-            pstmt.setLong(1, tx.getXidID());
-            pstmt.setInt(2, xid.getFormatId());
-            pstmt.setBytes(3, xid.getBranchQualifier());
-            pstmt.setBytes(4, xid.getGlobalTransactionId());
-            pstmt.executeUpdate();
-        }
-        catch (Exception e)
-        {
-            throw new InternalErrorException("Cannot save xid: " + xid, e);
-        }
-    }
-
-    public void deleteRecords(MyConnection connection, JDBCTransaction tx)
-            throws
-            InternalErrorException
-    {
-        try
-        {
-            PreparedStatement pstmt = connection.getStatements()[DELETE_RECORD];
-            if (pstmt == null)
-            {
-                pstmt = connection.getConnection().prepareStatement("DELETE FROM " + _tableNameRecord +
-                                                                    " WHERE XID_ID = ?");
-                connection.getStatements()[DELETE_RECORD] = pstmt;
-            }
-            pstmt.setLong(1, tx.getXidID());
-            pstmt.executeUpdate();
-        }
-        catch (Exception e)
-        {
-            throw new InternalErrorException("Cannot delete record: " + tx.getXidID(), e);
-        }
-    }
-
-    public void deleteXID(MyConnection connection, JDBCTransaction tx)
-            throws
-            InternalErrorException
-    {
-        try
-        {
-            PreparedStatement pstmt = connection.getStatements()[DELETE_XID];
-            if (pstmt == null)
-            {
-                pstmt = connection.getConnection().prepareStatement("DELETE FROM " + _tableNameTransaction +
-                                                                    " WHERE XID_ID = ?");
-                connection.getStatements()[DELETE_XID] = pstmt;
-            }
-            pstmt.setLong(1, tx.getXidID());
-            pstmt.executeUpdate();
-        }
-        catch (Exception e)
-        {
-            throw new InternalErrorException("Cannot delete xid: " + tx.getXidID(), e);
-        }
-    }
-
-    public void prepareDequeu(Xid xid, StorableMessage m, StorableQueue queue)
-            throws
-            UnknownXidException,
-            InternalErrorException
-    {
-        JDBCTransaction tx = getTx(xid);
-        if (tx == null)
-        {
-            throw new UnknownXidException(xid, null);
-        }
-        updateQueueMessageRelation(tx.getConnection(), queue.getQueueID(), m.getMessageId(), 1);
-
-    }
-
-    public void rollbackDequeu(Xid xid, StorableMessage m, StorableQueue queue)
-            throws
-            UnknownXidException,
-            InternalErrorException
-    {
-        JDBCTransaction tx = getTx(xid);
-        if (tx == null)
-        {
-            throw new UnknownXidException(xid, null);
-        }
-        updateQueueMessageRelation(tx.getConnection(), queue.getQueueID(), m.getMessageId(), 0);
-    }
-
-    //========================================================================
-    // Private methods
-    //========================================================================
-
-
-    private void updateQueueMessageRelation(MyConnection connection,
-                                            int queueID, long messageId, int prepared)
-            throws
-            InternalErrorException
-    {
-        try
-        {
-            PreparedStatement pstmt = connection.getStatements()[UPDATE_QMR];
-            if (pstmt == null)
-            {
-                pstmt = connection.getConnection().prepareStatement("UPDATE " + _tableNameQueueMessageRelation +
-                                                                    " SET Prepared = ? WHERE MessageID = ? AND QueueID = ?");
-                connection.getStatements()[UPDATE_QMR] = pstmt;
-            }
-            pstmt.setInt(1, prepared);
-            pstmt.setLong(2, messageId);
-            pstmt.setInt(3, queueID);
-            pstmt.executeUpdate();
-        }
-        catch (Exception e)
-        {
-            throw new InternalErrorException("Cannot update QMR", e);
-        }
-
-    }
-
-    public MessagePublishInfo getMessagePublishInfo(StorableMessage m)
-            throws
-            InternalErrorException
-    {
-        MyConnection connection = null;
-        MessagePublishInfo result;
-        try
-        {
-            connection = (MyConnection) _connectionPool.acquireInstance();
-            PreparedStatement pstmt = connection.getStatements()[GET_MESSAGE_INFO];
-            if (pstmt == null)
-            {
-                pstmt = connection.getConnection().prepareStatement("SELECT ExchangeName, RoutingKey," +
-                                                                    " Mandatory, Is_Immediate from " + _tableNameMessage +
-                                                                    " WHERE MessageID = ?");
-                connection.getStatements()[GET_MESSAGE_INFO] = pstmt;
-            }
-            pstmt.setLong(1, m.getMessageId());
-            ResultSet rs = pstmt.executeQuery();
-            if (rs.next())
-            {
-                final AMQShortString exchange = new AMQShortString(rs.getString(1));
-                final AMQShortString routingKey = new AMQShortString(rs.getString(2));
-                final boolean mandatory = rs.getBoolean(3);
-                final boolean immediate = rs.getBoolean(4);
-                result = new MessagePublishInfo()
-                {
-
-                    public AMQShortString getExchange()
-                    {
-                        return exchange;
-                    }
-
-                    public boolean isImmediate()
-                    {
-                        return immediate;
-                    }
-
-                    public boolean isMandatory()
-                    {
-                        return mandatory;
-                    }
-
-                    public AMQShortString getRoutingKey()
-                    {
-                        return routingKey;
-                    }
-                };
-            }
-            else
-            {
-                throw new InternalErrorException("Cannot get MessagePublishInfo of message: " + m);
-            }
-            rs.close();
-            return result;
-        }
-        catch (Exception e)
-        {
-            throw new InternalErrorException("Cannot get MessagePublishInfo of message: " + m, e);
-        }
-        finally
-        {
-            if (connection != null)
-            {
-                try
-                {
-                    connection.getConnection().commit();
-                    _connectionPool.releaseInstance(connection);
-                }
-                catch (SQLException e)
-                {
-                    // we did not manage to commit this connection
-                    // it is better to release it
-                    _connectionPool.releaseDeadInstance();
-                    throw new InternalErrorException("Cannot get MessagePublishInfo of message: " + m, e);
-                }
-            }
-        }
-    }
-
-    public ContentHeaderBody getContentHeaderBody(StorableMessage m)
-            throws
-            InternalErrorException
-    {
-        MyConnection connection = null;
-        ContentHeaderBody result;
-        try
-        {
-            connection = (MyConnection) _connectionPool.acquireInstance();
-            PreparedStatement pstmt = connection.getStatements()[GET_CONTENT_HEADER];
-            if (pstmt == null)
-            {
-                pstmt = connection.getConnection().prepareStatement("SELECT Header from " + _tableNameMessage +
-                                                                    " WHERE MessageID = ?");
-                connection.getStatements()[GET_CONTENT_HEADER] = pstmt;
-            }
-            pstmt.setLong(1, m.getMessageId());
-            ResultSet rs = pstmt.executeQuery();
-            if (rs.next())
-            {
-                result = new ContentHeaderBody(ByteBuffer.wrap(rs.getBlob(1).getBytes(1, (int) rs.getBlob(1).length())), 0);
-            }
-            else
-            {
-                throw new InternalErrorException("Cannot get Content Header of message: " + m);
-            }
-            rs.close();
-            return result;
-        }
-        catch (Exception e)
-        {
-            throw new InternalErrorException("Cannot get Content Header of message: " + m, e);
-        }
-        finally
-        {
-            if (connection != null)
-            {
-                try
-                {
-                    connection.getConnection().commit();
-                    _connectionPool.releaseInstance(connection);
-                }
-                catch (SQLException e)
-                {
-                    // we did not manage to commit this connection
-                    // it is better to release it
-                    _connectionPool.releaseDeadInstance();
-                    throw new InternalErrorException("Cannot get Content Header of message: " + m, e);
-                }
-            }
-        }
-    }
-
-    private List<StorableMessage> getAllMessages(MyConnection connection, StorableQueue queue)
-            throws
-            SQLException,
-            AMQException
-    {
-        List<StorableMessage> result = new ArrayList<StorableMessage>();
-//        TransactionalContext txnContext = new NonTransactionalContext(this, new StoreContext(), null, null, null);
-        MessageHandleFactory messageHandleFactory = new MessageHandleFactory();
-        PreparedStatement pstmt = connection.getStatements()[GET_ALL_MESSAGES];
-        if (pstmt == null)
-        {
-            pstmt = connection.getConnection().prepareStatement("SELECT " + _tableNameMessage + ".MessageID, Header FROM " +
-                                                                _tableNameMessage +
-                                                                " INNER JOIN " +
-                                                                _tableNameQueueMessageRelation +
-                                                                " ON " +
-                                                                _tableNameMessage + ".MessageID = " + _tableNameQueueMessageRelation + ".MessageID" +
-                                                                " WHERE " +
-                                                                _tableNameQueueMessageRelation + ".QueueID = ?" +
-                                                                " AND " +
-                                                                _tableNameQueueMessageRelation + ".Prepared = 0");
-            connection.getStatements()[GET_ALL_MESSAGES] = pstmt;
-        }
-        pstmt.setInt(1, queue.getQueueID());
-        ResultSet rs = pstmt.executeQuery();
-        AMQMessage foundMessage;
-        // ContentHeaderBody hb;
-        while (rs.next())
-        {
-
-            //DTX MessageStore - this -> null , txContext -> null
-            foundMessage = new AMQMessage(rs.getLong(1), null, messageHandleFactory, null);
-            
-            result.add(foundMessage);
-        }
-        rs.close();
-        return result;
-    }
-
-    private HashMap<Integer, AMQQueue> recover()
-            throws
-            InternalErrorException
-    {
-        MyConnection connection = null;
-        HashMap<Integer, AMQQueue> result = new HashMap<Integer, AMQQueue>();
-        try
-        {
-            // re-create all the queues
-            connection = (MyConnection) _connectionPool.acquireInstance();
-            Statement stmt = connection.getConnection().createStatement();
-            ResultSet rs = stmt.executeQuery("SELECT * FROM " + _tableNameQueue);
-            AMQQueue foundQueue;
-            List<StorableMessage> foundMessages;
-            StoreContext context = new StoreContext();
-            while (rs.next())
-            {
-                AMQShortString owner = null;
-                if (rs.getString(3) != null)
-                {
-                    owner = new AMQShortString(rs.getString(3));
-                }
-                foundQueue = new AMQQueue(new AMQShortString(rs.getString(2)),
-                                          true, owner, false, _virtualHost);
-                // get all the Messages of that queue
-                foundMessages = getAllMessages(connection, foundQueue);
-                // enqueue those messages
-                if (_log.isDebugEnabled())
-                {
-                    _log.debug("Recovering " + foundMessages.size() + " messages for queue " + foundQueue.getName());
-                }
-                for (StorableMessage foundMessage : foundMessages)
-                {
-                    foundMessage.staged();
-                    foundMessage.enqueue(foundQueue);
-                    foundQueue.enqueue(foundMessage);
-                    foundQueue.process(context, (AMQMessage) foundMessage, false);
-                }
-                // add the queue in the result map
-                result.put(foundQueue.getQueueID(), foundQueue);
-                // add it in the registry
-                _virtualHost.getQueueRegistry().registerQueue(foundQueue);
-            }
-            rs.close();
-            return result;
-        }
-        catch (Exception e)
-        {
-            throw new InternalErrorException("Cannot recover: ", e);
-        }
-        finally
-        {
-            if (connection != null)
-            {
-                try
-                {
-                    connection.getConnection().commit();
-                    _connectionPool.releaseInstance(connection);
-                }
-                catch (SQLException e)
-                {
-                    // we did not manage to commit this connection
-                    // it is better to release it
-                    _connectionPool.releaseDeadInstance();
-                    throw new InternalErrorException("Cannot recover: ", e);
-                }
-            }
-        }
-    }
-
-    private void recoverExchanges(HashMap<Integer, AMQQueue> queueMap)
-            throws
-            InternalErrorException
-    {
-        MyConnection connection = null;
-        try
-        {
-            // re-create all the exchanges
-            connection = (MyConnection) _connectionPool.acquireInstance();
-            Statement stmt = connection.getConnection().createStatement();
-            ResultSet rs = stmt.executeQuery("SELECT * FROM " + _tableNameExchange);
-            Exchange foundExchange;
-            AMQQueue foundQueue;
-            while (rs.next())
-            {
-                foundExchange = _virtualHost.getExchangeFactory().createExchange(
-                        new AMQShortString(rs.getString(1)), new AMQShortString(rs.getString(2)), true, false, 0);
-                // get all the bindings
-                Statement stmtb = connection.getConnection().createStatement();
-                ResultSet rsb = stmtb.executeQuery("SELECT * FROM " + _tableNameExchangeQueueRelation +
-                                                   " WHERE Name = '" + rs.getString(1) + "'");
-                while (rsb.next())
-                {
-                    foundQueue = queueMap.get(new Integer(rsb.getInt(1)));
-                    if (foundQueue != null)
-                    {
-                        // the field table
-                        FieldTable ft = null;
-                        if (rsb.getBlob(4) != null)
-                        {
-                            long length = rsb.getBlob(4).length();
-                            ByteBuffer buffer = ByteBuffer.wrap(rsb.getBlob(4).getBytes(1, (int) length));
-                            ft = new FieldTable(buffer, length);
-                        }
-                        foundQueue.bind(new AMQShortString(rsb.getString(3)), ft, foundExchange);
-                    }
-                }
-                rsb.close();
-                // register this exchange
-                _virtualHost.getExchangeRegistry().registerExchange(foundExchange);
-            }
-            rs.close();
-        }
-        catch (Exception e)
-        {
-            throw new InternalErrorException("Cannot recover: ", e);
-        }
-        finally
-        {
-            if (connection != null)
-            {
-                try
-                {
-                    connection.getConnection().commit();
-                    _connectionPool.releaseInstance(connection);
-                }
-                catch (SQLException e)
-                {
-                    // we did not manage to commit this connection
-                    // it is better to release it
-                    _connectionPool.releaseDeadInstance();
-                    throw new InternalErrorException("Cannot recover: ", e);
-                }
-            }
-        }
-    }
-
-    private void destroy(MyConnection connection, StorableMessage m)
-            throws
-            SQLException
-    {
-        PreparedStatement pstmt = connection.getStatements()[DELETE_MESSAGE];
-        if (pstmt == null)
-        {
-            pstmt = connection.getConnection().prepareStatement("DELETE FROM " + _tableNameMessage +
-                                                                " WHERE MessageID = ?");
-            connection.getStatements()[DELETE_MESSAGE] = pstmt;
-        }
-        pstmt.setLong(1, m.getMessageId());
-        pstmt.executeUpdate();
-    }
-
-    private JDBCTransaction getTx(Xid xid)
-            throws
-            UnknownXidException
-    {
-        JDBCTransaction tx = null;
-        if (xid != null)
-        {
-            tx = _tm.getTransaction(xid);
-        }
-        return tx;
-    }
-
-    /**
-     * setupConnections - Initialize the connections
-     *
-     * @return true if ok
-     */
-    private synchronized boolean setupConnections()
-    {
-        try
-        {
-            if (_connectionPool == null)
-            {
-                // In an embedded environment, loading the driver also starts Derby.
-                Class.forName(_driver).newInstance();
-                _connectionPool = new ConnectionPool(_maxSize);
-            }
-        }
-        catch (Exception e)
-        {
-            _log.warn("Setup connections trouble", e);
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Try to create the connection and table.
-     * If this fails, then we will exit.
-     */
-    protected synchronized boolean setupStore(boolean dropTables)
-    {
-        if (!setupConnections())
-        {
-            return false;
-        }
-        MyConnection myconnection = null;
-        try
-        {
-            myconnection = (MyConnection) _connectionPool.acquireInstance();
-            Statement stmt = myconnection._connection.createStatement();
-            /*
-            * TODO Need some management interface to delete the table!
-            */
-            if (dropTables)
-            {
-                try
-                {
-                    stmt.executeUpdate("DROP TABLE " + _tableNameMessage);
-                    myconnection._connection.commit();
-                }
-                catch (SQLException ex)
-                {
-                    // don't want to print error - chances are it
-                    // just reports that the table does not exist
-                    // ex.printStackTrace();
-                }
-                try
-                {
-                    stmt.executeUpdate("DROP TABLE " + _tableNameQueue);
-                    myconnection._connection.commit();
-                }
-                catch (SQLException ex)
-                {
-                    // ex.printStackTrace();
-                }
-                try
-                {
-                    stmt.executeUpdate("DROP TABLE " + _tableNameQueueMessageRelation);
-                    myconnection._connection.commit();
-                }
-                catch (SQLException ex)
-                {
-                    // ex.printStackTrace();
-                }
-                try
-                {
-                    stmt.executeUpdate("DROP TABLE " + _tableNameExchange);
-                    myconnection._connection.commit();
-                }
-                catch (SQLException ex)
-                {
-                    // ex.printStackTrace();
-                }
-                try
-                {
-                    stmt.executeUpdate("DROP TABLE " + _tableNameExchangeQueueRelation);
-                    myconnection._connection.commit();
-                }
-                catch (SQLException ex)
-                {
-                    // ex.printStackTrace();
-                }
-                try
-                {
-                    stmt.executeUpdate("DROP TABLE " + _tableNameRecord);
-                    myconnection._connection.commit();
-                }
-                catch (SQLException ex)
-                {
-                    // ex.printStackTrace();
-                }
-                try
-                {
-                    stmt.executeUpdate("DROP TABLE " + _tableNameTransaction);
-                    myconnection._connection.commit();
-                }
-                catch (SQLException ex)
-                {
-                    // ex.printStackTrace();
-                }
-            }
-            // create the table for messages
-            try
-            {
-                stmt.executeUpdate("CREATE TABLE " + _tableNameMessage + " (MessageID FLOAT NOT NULL, Header BLOB," +
-                                   " Payload BLOB, ExchangeName VARCHAR(1024), RoutingKey VARCHAR(1024)," +
-                                   " Mandatory INTEGER, Is_Immediate INTEGER, PRIMARY KEY(MessageID))");
-                myconnection._connection.commit();
-            }
-            catch (SQLException ex)
-            {
-                // ex.printStackTrace();
-                // assume this is reporting that the table already exists:
-            }
-            // create the table for queues
-            try
-            {
-                stmt.executeUpdate("CREATE TABLE " + _tableNameQueue + " (QueueID INTEGER NOT NULL, " +
-                                   "Name VARCHAR(1024) NOT NULL, Owner VARCHAR(1024), PRIMARY KEY(QueueID))");
-                myconnection._connection.commit();
-            }
-            catch (SQLException ex)
-            {
-                //ex.printStackTrace();
-                // assume this is reporting that the table already exists:
-            }
-            // create the table for queue to message mapping
-            try
-            {
-                stmt.executeUpdate("CREATE TABLE " + _tableNameQueueMessageRelation + " (QueueID INTEGER NOT NULL, " +
-                                   "MessageID FLOAT NOT NULL, Prepared INTEGER)");
-                myconnection._connection.commit();
-            }
-            catch (SQLException ex)
-            {
-                //ex.printStackTrace();
-                // assume this is reporting that the table already exists:
-            }
-            try
-            {
-                stmt.executeUpdate("CREATE TABLE " + _tableNameExchange + " (Name VARCHAR(1024) NOT NULL, " +
-                                   "Type VARCHAR(1024) NOT NULL, PRIMARY KEY(Name))");
-                myconnection._connection.commit();
-            }
-            catch (SQLException ex)
-            {
-                //ex.printStackTrace();
-                // assume this is reporting that the table already exists:
-            }
-            try
-            {
-                stmt.executeUpdate("CREATE TABLE " + _tableNameExchangeQueueRelation + " (QueueID INTEGER NOT NULL, " +
-                                   "Name VARCHAR(1024) NOT NULL, RoutingKey VARCHAR(1024), FieldTable BLOB )");
-                myconnection._connection.commit();
-            }
-            catch (SQLException ex)
-            {
-                //ex.printStackTrace();
-                // assume this is reporting that the table already exists:
-            }
-            try
-            {
-                stmt.executeUpdate("CREATE TABLE " + _tableNameRecord + " (XID_ID FLOAT, Type INTEGER, MessageID FLOAT, " +
-                                   "QueueID INTEGER, PRIMARY KEY(Type, MessageID, QueueID))");
-                // we could alter the table with QueueID as foreign key
-                myconnection._connection.commit();
-            }
-            catch (SQLException ex)
-            {
-                //ex.printStackTrace();
-                // assume this is reporting that the table already exists:
-            }
-            try
-            {
-                stmt.executeUpdate("CREATE TABLE " + _tableNameTransaction + " (XID_ID FLOAT, FormatId INTEGER, " +
-                                   "BranchQualifier BLOB, GlobalTransactionId BLOB, PRIMARY KEY(XID_ID))");
-                myconnection._connection.commit();
-            }
-            catch (SQLException ex)
-            {
-                // ex.printStackTrace();
-                // assume this is reporting that the table already exists:
-            }
-        }
-        catch (Throwable e)
-        {
-            _log.warn("Setup Store trouble: ", e);
-            return false;
-        }
-        finally
-        {
-            if (myconnection != null)
-            {
-                _connectionPool.releaseInstance(myconnection);
-            }
-        }
-        return true;
-    }
-    //========================================================================================
-    //============== the connection pool =====================================================
-    //========================================================================================
-
-    private class ConnectionPool extends Pool
-    {
-
-        /**
-         * Create a pool of specified size. Negative or null pool sizes are
-         * disallowed.
-         *
-         * @param poolSize The size of the pool to create. Should be 1 or
-         *                 greater.
-         * @throws Exception If the pool size is less than 1.
-         */
-        public ConnectionPool(int poolSize)
-                throws
-                Exception
-        {
-            super(poolSize);
-        }
-
-        /**
-         * @return An instance of the pooled object.
-         * @throws Exception In case of internal error.
-         */
-        protected MyConnection createInstance()
-                throws
-                Exception
-        {
-            try
-            {
-                // standard way to obtain a Connection object is to call the method DriverManager.getConnection,
-                // which takes a String containing a connection URL (uniform resource locator).
-                Connection conn = DriverManager.getConnection(_connectionURL);
-                //conn.setAutoCommit(true);
-                PreparedStatement[] st = new PreparedStatement[STATEMENT_SIZE];
-                for (int j = 0; j < STATEMENT_SIZE; j++)
-                {
-                    st[j] = null;
-                }
-                return new MyConnection(conn, st);
-            }
-            catch (SQLException e)
-            {
-                throw new Exception("sqlException when creating connection to " + _connectionURL, e);
-            }
-        }
-    }
-
-    public class MyConnection
-    {
-        // the connection
-        private Connection _connection = null;
-        // its associated prepared statements
-        private PreparedStatement[] _preparedStatements = null;
-
-        MyConnection(Connection con, PreparedStatement[] st)
-        {
-            _connection = con;
-            _preparedStatements = st;
-        }
-
-        public Connection getConnection()
-        {
-            return _connection;
-        }
-
-        public PreparedStatement[] getStatements()
-        {
-            return _preparedStatements;
-        }
-
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/messageStore/MemoryMessageStore.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/messageStore/MemoryMessageStore.java
deleted file mode 100644
index 8954ffc4d7..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/messageStore/MemoryMessageStore.java
+++ /dev/null
@@ -1,273 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.qpid.server.messageStore;
-
-import java.io.ByteArrayOutputStream;
-import java.nio.ByteBuffer;
-import java.util.*;
-
-import javax.transaction.xa.Xid;
-
-import org.apache.commons.configuration.Configuration;
-
-import org.apache.log4j.Logger;
-
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.framing.FieldTable;
-import org.apache.qpid.framing.ContentHeaderBody;
-import org.apache.qpid.framing.abstraction.MessagePublishInfo;
-import org.apache.qpid.server.exception.*;
-import org.apache.qpid.server.exchange.Exchange;
-import org.apache.qpid.server.txn.MemoryDequeueRecord;
-import org.apache.qpid.server.txn.MemoryEnqueueRecord;
-import org.apache.qpid.server.txn.TransactionManager;
-import org.apache.qpid.server.txn.TransactionRecord;
-import org.apache.qpid.server.virtualhost.VirtualHost;
-
-/**
- * This a simple in-memory implementation of a message store i.e. nothing is persisted
- * <p/>
- * Created by Arnaud Simon
- * Date: 26-Apr-2007
- * Time: 08:23:45
- */
-public class MemoryMessageStore implements MessageStore
-{
-    // ========================================================================
-    // Static Constants
-    // ========================================================================
-    // The logger for this class
-    private static final Logger _log = Logger.getLogger(MemoryMessageStore.class);
-
-    // The table of message with its corresponding stream containing the message body
-    private Map<StorableMessage, ByteArrayOutputStream> _stagedMessages;
-    // The queue/messages association
-    protected Map<StorableQueue, List<StorableMessage>> _queueMap;
-    // the message ID
-    private long _messageID = 0;
-    // The transaction manager
-    private TransactionManager _txm;
-
-    // ========================================================================
-    // Interface MessageStore
-    // ========================================================================
-
-    public void removeExchange(Exchange exchange) throws InternalErrorException
-    {
-        // do nothing this is inmemory
-    }
-
-    public void unbindQueue(Exchange exchange, AMQShortString routingKey, StorableQueue queue, FieldTable args)
-        throws InternalErrorException
-    {
-        // do nothing this is inmemory
-    }
-
-    public void createExchange(Exchange exchange) throws InternalErrorException
-    {
-        // do nothing this is inmemory
-    }
-
-    public void bindQueue(Exchange exchange, AMQShortString routingKey, StorableQueue queue, FieldTable args)
-        throws InternalErrorException
-    {
-        // do nothing this is inmemory
-    }
-
-    public void configure(VirtualHost virtualHost, TransactionManager tm, String base, Configuration config)
-        throws InternalErrorException, IllegalArgumentException
-    {
-        _log.info("Configuring memory message store");
-        // Initialise the maps
-        _stagedMessages = new HashMap<StorableMessage, ByteArrayOutputStream>();
-        _queueMap = new HashMap<StorableQueue, List<StorableMessage>>();
-        _txm = tm;
-        _txm.configure(this, "txn", config);
-    }
-
-    public void close() throws InternalErrorException
-    {
-        _log.info("Closing memory message store");
-        _stagedMessages.clear();
-        _queueMap.clear();
-    }
-
-    public void createQueue(StorableQueue queue) throws InternalErrorException, QueueAlreadyExistsException
-    {
-        if (_queueMap.containsKey(queue))
-        {
-            throw new QueueAlreadyExistsException("queue " + queue + " already exists");
-        }
-        // add this queue into the map
-        _queueMap.put(queue, new LinkedList<StorableMessage>());
-    }
-
-    public void destroyQueue(StorableQueue queue) throws InternalErrorException, QueueDoesntExistException
-    {
-        if (!_queueMap.containsKey(queue))
-        {
-            throw new QueueDoesntExistException("queue " + queue + " does not exist");
-        }
-        // remove this queue from the map
-        _queueMap.remove(queue);
-    }
-
-    public void stage(StorableMessage m) throws InternalErrorException, MessageAlreadyStagedException
-    {
-        if (_stagedMessages.containsKey(m))
-        {
-            throw new MessageAlreadyStagedException("message " + m + " already staged");
-        }
-
-        _stagedMessages.put(m, new ByteArrayOutputStream());
-        m.staged();
-    }
-
-    public void appendContent(StorableMessage m, byte[] data, int offset, int size)
-        throws InternalErrorException, MessageDoesntExistException
-    {
-        if (!_stagedMessages.containsKey(m))
-        {
-            throw new MessageDoesntExistException("message " + m + " has not been staged");
-        }
-
-        _stagedMessages.get(m).write(data, offset, size);
-    }
-
-    public byte[] loadContent(StorableMessage m, int offset, int size)
-        throws InternalErrorException, MessageDoesntExistException
-    {
-        if (!_stagedMessages.containsKey(m))
-        {
-            throw new MessageDoesntExistException("message " + m + " has not been staged");
-        }
-
-        byte[] result = new byte[size];
-        ByteBuffer buf = ByteBuffer.allocate(size);
-        buf.put(_stagedMessages.get(m).toByteArray(), offset, size);
-        buf.get(result);
-
-        return result;
-    }
-
-    public void destroy(StorableMessage m) throws InternalErrorException, MessageDoesntExistException
-    {
-        if (!_stagedMessages.containsKey(m))
-        {
-            throw new MessageDoesntExistException("message " + m + " has not been staged");
-        }
-
-        _stagedMessages.remove(m);
-    }
-
-    public void enqueue(Xid xid, StorableMessage m, StorableQueue queue)
-        throws InternalErrorException, QueueDoesntExistException, InvalidXidException, UnknownXidException,
-            MessageDoesntExistException
-    {
-        if (xid != null)
-        {
-            // this is a tx operation
-            TransactionRecord enqueueRecord = new MemoryEnqueueRecord(m, queue);
-            _txm.getTransaction(xid).addRecord(enqueueRecord);
-        }
-        else
-        {
-            if (!_stagedMessages.containsKey(m))
-            {
-                try
-                {
-                    stage(m);
-                }
-                catch (MessageAlreadyStagedException e)
-                {
-                    throw new InternalErrorException(e.getMessage(), e);
-                }
-
-                appendContent(m, m.getData(), 0, m.getPayloadSize());
-            }
-
-            if (!_queueMap.containsKey(queue))
-            {
-                throw new QueueDoesntExistException("queue " + queue + " dos not exist");
-            }
-
-            _queueMap.get(queue).add(m);
-            m.enqueue(queue);
-        }
-    }
-
-    public void dequeue(Xid xid, StorableMessage m, StorableQueue queue)
-        throws InternalErrorException, QueueDoesntExistException, InvalidXidException, UnknownXidException
-    {
-        if (xid != null)
-        {
-            // this is a tx operation
-            TransactionRecord dequeueRecord = new MemoryDequeueRecord(m, queue);
-            _txm.getTransaction(xid).addRecord(dequeueRecord);
-        }
-        else
-        {
-            if (!_queueMap.containsKey(queue))
-            {
-                throw new QueueDoesntExistException("queue " + queue + " dos not exist");
-            }
-
-            m.dequeue(queue);
-            _queueMap.get(queue).remove(m);
-            if (!m.isEnqueued())
-            {
-                // we can delete this message
-                _stagedMessages.remove(m);
-            }
-        }
-    }
-
-    public Collection<StorableQueue> getAllQueues() throws InternalErrorException
-    {
-        return _queueMap.keySet();
-    }
-
-    public Collection<StorableMessage> getAllMessages(StorableQueue queue) throws InternalErrorException
-    {
-        return _queueMap.get(queue);
-    }
-
-    public long getNewMessageId()
-    {
-        return _messageID++;
-    }
-
-
-    public ContentHeaderBody getContentHeaderBody(StorableMessage m)
-            throws
-            InternalErrorException,
-            MessageDoesntExistException
-    {
-        // do nothing this is only used during recovery
-        return null;
-    }
-
-    public MessagePublishInfo getMessagePublishInfo(StorableMessage m)
-            throws
-            InternalErrorException,
-            MessageDoesntExistException
-    {
-       // do nothing this is only used during recovery
-        return null;
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/messageStore/MessageStore.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/messageStore/MessageStore.java
deleted file mode 100644
index f5dc160fc6..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/messageStore/MessageStore.java
+++ /dev/null
@@ -1,308 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.qpid.server.messageStore;
-
-import org.apache.commons.configuration.Configuration;
-import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.framing.ContentHeaderBody;
-import org.apache.qpid.framing.FieldTable;
-import org.apache.qpid.framing.abstraction.MessagePublishInfo;
-import org.apache.qpid.server.exception.InternalErrorException;
-import org.apache.qpid.server.exception.InvalidXidException;
-import org.apache.qpid.server.exception.MessageAlreadyStagedException;
-import org.apache.qpid.server.exception.MessageDoesntExistException;
-import org.apache.qpid.server.exception.QueueAlreadyExistsException;
-import org.apache.qpid.server.exception.QueueDoesntExistException;
-import org.apache.qpid.server.exception.UnknownXidException;
-import org.apache.qpid.server.exchange.Exchange;
-import org.apache.qpid.server.store.StoreContext;
-import org.apache.qpid.server.txn.TransactionManager;
-import org.apache.qpid.server.virtualhost.VirtualHost;
-
-import javax.transaction.xa.Xid;
-import java.util.Collection;
-
-/**
- * Created by Arnaud Simon
- * Date: 29-Mar-2007
- * Time: 17:34:02
- */
-public interface MessageStore
-{
-    /**
-     * Create a new exchange
-     *
-     * @param exchange the exchange to be persisted
-     * @throws InternalErrorException If an error occurs
-     */
-    public void createExchange(Exchange exchange)
-            throws
-            InternalErrorException;
-
-    /**
-     * Remove an exchange
-     *
-     * @param exchange The exchange to be removed
-     * @throws InternalErrorException If an error occurs
-     */
-    public void removeExchange(Exchange exchange)
-            throws
-            InternalErrorException;
-
-    /**
-     * Bind a queue with an exchange given a routing key
-     *
-     * @param exchange   The exchange to bind the queue with
-     * @param routingKey The routing key
-     * @param queue      The queue to be bound
-     * @param args       Args
-     * @throws InternalErrorException If an error occurs
-     */
-    public void bindQueue(Exchange exchange,
-                          AMQShortString routingKey,
-                          StorableQueue queue, FieldTable args)
-            throws
-            InternalErrorException;
-
-    /**
-     * Unbind a queue from an exchange
-     *
-     * @param exchange   The exchange the queue was bound to
-     * @param routingKey The routing queue
-     * @param queue      The queue to unbind
-     * @param args       args
-     * @throws InternalErrorException If an error occurs
-     */
-    public void unbindQueue(Exchange exchange,
-                            AMQShortString routingKey,
-                            StorableQueue queue, FieldTable args)
-            throws
-            InternalErrorException;
-
-    /**
-     * Called after instantiation in order to configure the message store. A particular implementation can define
-     * whatever parameters it wants.
-     *
-     * @param virtualHost The virtual host using by this store
-     * @param tm          The transaction manager implementation
-     * @param base        The base element identifier from which all configuration items are relative. For example, if the base
-     *                    element is "store", the all elements used by concrete classes will be "store.foo" etc.
-     * @param config      The apache commons configuration object
-     * @throws InternalErrorException   If an error occurs that means the store is unable to configure itself
-     * @throws IllegalArgumentException If the configuration arguments are illegal
-     */
-    void configure(VirtualHost virtualHost, TransactionManager tm, String base, Configuration config)
-            throws
-            InternalErrorException,
-            IllegalArgumentException;
-
-    /**
-     * Called to close and cleanup any resources used by the message store.
-     *
-     * @throws InternalErrorException if close fails
-     */
-    void close()
-            throws
-            InternalErrorException;
-
-    /**
-     * Create a queue
-     *
-     * @param queue the queue to be created
-     * @throws InternalErrorException      In case of internal message store problem
-     * @throws QueueAlreadyExistsException If the queue already exists in the store
-     */
-    public void createQueue(StorableQueue queue)
-            throws
-            InternalErrorException,
-            QueueAlreadyExistsException;
-
-    /**
-     * Destroy a queue
-     *
-     * @param queue The queue to be destroyed
-     * @throws InternalErrorException    In case of internal message store problem
-     * @throws QueueDoesntExistException If the queue does not exist in the store
-     */
-    public void destroyQueue(StorableQueue queue)
-            throws
-            InternalErrorException,
-            QueueDoesntExistException;
-
-    /**
-     * Stage the message before effective enqueue
-     *
-     * @param m The message to stage
-     * @throws InternalErrorException        In case of internal message store problem
-     * @throws MessageAlreadyStagedException If the message is already staged
-     */
-    public void stage(StorableMessage m)
-            throws
-            InternalErrorException,
-            MessageAlreadyStagedException;
-
-
-    /**
-     * Append more data with a previously staged message
-     *
-     * @param m      The message to which data must be appended
-     * @param data   Data to happen to the message
-     * @param offset The number of bytes from the beginning of the payload
-     * @param size   The number of bytes to be written
-     * @throws InternalErrorException      In case of internal message store problem
-     * @throws MessageDoesntExistException If the message has not been staged
-     */
-    public void appendContent(StorableMessage m, byte[] data, int offset, int size)
-            throws
-            InternalErrorException,
-            MessageDoesntExistException;
-
-    /**
-     * Get the content of previously staged or enqueued message.
-     * The message headers are also set.
-     *
-     * @param m      The message for which the content must be loaded
-     * @param offset The number of bytes from the beginning of the payload
-     * @param size   The number of bytes to be loaded
-     * @return The message content
-     * @throws InternalErrorException      In case of internal message store problem
-     * @throws MessageDoesntExistException If the message does not exist
-     */
-    public byte[] loadContent(StorableMessage m, int offset, int size)
-            throws
-            InternalErrorException,
-            MessageDoesntExistException;
-
-    /**
-     * Get the content header of this message
-     *
-     * @param m      The message 
-     * @return The message content
-     * @throws InternalErrorException      In case of internal message store problem
-     * @throws MessageDoesntExistException If the message does not exist
-     */
-    public ContentHeaderBody getContentHeaderBody(StorableMessage m)
-            throws
-            InternalErrorException,
-            MessageDoesntExistException;
-
-    /**
-     * Get the MessagePublishInfo of this message
-     *
-     * @param m      The message
-     * @return The message content
-     * @throws InternalErrorException      In case of internal message store problem
-     * @throws MessageDoesntExistException If the message does not exist
-     */
-    public MessagePublishInfo getMessagePublishInfo(StorableMessage m)
-            throws
-            InternalErrorException,
-            MessageDoesntExistException;
-
-    /**
-     * Destroy a previously staged message
-     *
-     * @param m the message to be destroyed
-     * @throws InternalErrorException      In case of internal message store problem
-     * @throws MessageDoesntExistException If the message does not exist in the store
-     */
-    public void destroy(StorableMessage m)
-            throws
-            InternalErrorException,
-            MessageDoesntExistException;
-
-    /**
-     * Enqueue a message under the scope of the transaction branch
-     * identified by xid when specified.
-     * <p> This operation is propagated to the queue and the message.
-     * <p> A message that has been previously staged is assumed to have had
-     * its payload already added (see appendContent)
-     *
-     * @param xid   The xid of the transaction branch under which the message must be enqueued.
-     *              <p> It he xid is null then the message is enqueued outside the scope of any transaction.
-     * @param m     The message to be enqueued
-     * @param queue The queue into which the message must be enqueued
-     * @throws InternalErrorException      In case of internal message store problem
-     * @throws QueueDoesntExistException   If the queue does not exist in the store
-     * @throws InvalidXidException         The transaction branch is invalid
-     * @throws UnknownXidException         The transaction branch is unknown
-     * @throws MessageDoesntExistException If the Message does not exist
-     */
-    public void enqueue(Xid xid, StorableMessage m, StorableQueue queue)
-            throws
-            InternalErrorException,
-            QueueDoesntExistException,
-            InvalidXidException,
-            UnknownXidException,
-            MessageDoesntExistException;
-
-    /**
-     * Dequeue a message under the scope of the transaction branch identified by xid
-     * if specified.
-     * <p> This operation is propagated to the queue and the message.
-     *
-     * @param xid   The xid of the transaction branch under which the message must be dequeued.
-     *              <p> It he xid is null then the message is dequeued outside the scope of any transaction.
-     * @param m     The message to be dequeued
-     * @param queue The queue from which the message must be dequeued
-     * @throws InternalErrorException    In case of internal message store problem
-     * @throws QueueDoesntExistException If the queue does not exist in the store
-     * @throws InvalidXidException       The transaction branch is invalid
-     * @throws UnknownXidException       The transaction branch is unknown
-     */
-    public void dequeue(Xid xid, StorableMessage m, StorableQueue queue)
-            throws
-            InternalErrorException,
-            QueueDoesntExistException,
-            InvalidXidException,
-            UnknownXidException;
-
-    //=========================================================
-    // Recovery specific methods
-    //=========================================================
-
-    /**
-     * List all the persistent queues
-     *
-     * @return All the persistent queues
-     * @throws InternalErrorException In case of internal message store problem
-     */
-    public Collection<StorableQueue> getAllQueues()
-            throws
-            InternalErrorException;
-
-    /**
-     * All enqueued messages of a given queue
-     *
-     * @param queue The queue where the message are retrieved from
-     * @return The list all enqueued messages of a given queue
-     * @throws InternalErrorException In case of internal message store problem
-     */
-    public Collection<StorableMessage> getAllMessages(StorableQueue queue)
-            throws
-            InternalErrorException;
-
-    /**
-     * Get a new message ID
-     *
-     * @return A new message ID
-     */
-    public long getNewMessageId();
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/messageStore/Pool.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/messageStore/Pool.java
deleted file mode 100644
index 49af218b7a..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/messageStore/Pool.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.qpid.server.messageStore;
-
-import java.util.ArrayList;
-
-/**
- * Created by Arnaud Simon
- * Date: 15-May-2007
- * Time: 10:11:49
- */
-public abstract class Pool
-{
-    // The maximum size of the pool.
-    private int _maxPoolSize = -1;
-    // The current size of the pool.
-    private int _currentPoolSize = 0;
-    // The pool objects.
-    private volatile ArrayList<Object> _poolObjects = new ArrayList<Object>();
-    //The current number of created instances.
-    private int _instanceCount = 0;
-
-    /**
-     * Create a pool of specified size. Negative or null pool sizes are
-     * disallowed.
-     *
-     * @param poolSize      The size of the pool to create. Should be 1 or
-     *                      greater.
-     * @throws Exception    If the pool size is less than 1.
-     */
-    public Pool(int poolSize) throws Exception
-    {
-        if (poolSize <= 0)
-        {
-            throw new Exception("pool size is less than 1: " + poolSize);
-        }
-        _maxPoolSize = poolSize;
-    }
-
-    /**
-     * Return the maximum size of this pool.
-     *
-     * @return  The maximum size of this pool.
-     */
-    public final int maxSize()
-    {
-        return _maxPoolSize;
-    }
-
-    /**
-     * Return the current number of created instances.
-     *
-     * @return The current number of created instances in this pool.
-     */
-    public final int numberOfInstances()
-    {
-        return _instanceCount;
-    }
-
-    /**
-     * Extending classes MUST define how to create an instance of the object
-     * that they pool.
-     *
-     * @return              An instance of the pooled object.
-     * @throws Exception    In case of internal error.
-     */
-    abstract protected Object createInstance() throws Exception;
-
-    /**
-     * Remove the next available object from the pool or wait for one to become
-     * available.
-     *
-     * @return           The next available instance.
-     * @throws Exception If the call is interrupted
-     */
-    public final synchronized Object acquireInstance() throws Exception
-    {
-        while (_currentPoolSize == _maxPoolSize)
-        {
-            try
-            {
-                this.wait();
-            }
-            catch (InterruptedException e)
-            {
-                  throw new Exception("pool wait threw interrupted exception", e);
-            }
-        }
-        if (_poolObjects.size() == 0)
-        {
-            _poolObjects.add(createInstance());
-            _instanceCount++;
-        }
-        _currentPoolSize++;
-        return _poolObjects.remove(0);
-    }
-
-    /**
-     * Return an object back into this pool.
-     *
-     * @param object    The returning object.
-     */
-    public synchronized void releaseInstance(Object object)
-    {
-        _poolObjects.add(object);
-        _currentPoolSize--;
-        this.notify();
-    }
-
-    /**
-     * Return a dead object back into this pool.
-     *
-     */
-    public synchronized void releaseDeadInstance()
-    {
-       _instanceCount--;
-       _currentPoolSize--;
-        this.notify();
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/messageStore/StorableMessage.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/messageStore/StorableMessage.java
deleted file mode 100644
index b228bb3027..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/messageStore/StorableMessage.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- */

-package org.apache.qpid.server.messageStore;

-

-/**

- * A storable message can be persisted in the message store.

- *

- * Created by Arnaud Simon

- * Date: 03-Apr-2007

- * Time: 08:56:48

- */

-public interface StorableMessage

-{

-    /**

-     * The message ID is used by the store to identify a message.

-     *

-     * @return The message identifier

-     */

-    public long getMessageId();

-

-    /**

-     * Get the message header body that is saved when the message is staged.

-     *

-     * @return The message header body

-     */

-    public byte[] getHeaderBody();

-

-    /**

-     * Get the message header body size in bytes.

-     *

-     * @return The message header body size

-     */

-    public int getHeaderSize();

-

-    /**

-     * Get the message payload. This is required when the message is

-     * enqueued without any prior staging.

-     * <p> When the message is staged, the payload  can be partial or even empty.

-     *

-     * @return The message payload

-     */

-    public byte[] getData();

-

-    /**

-     * Get the message payload size in bytes.

-     *

-     * @return The message payload size in bytes

-     */

-    public int getPayloadSize();

-

-    /**

-     * Specify whether this message has been enqueued

-     * 

-     * @return true if this message is enqueued, false otherwise

-     */

-    public boolean isEnqueued();

-

-    /**

-     * This is called by the message store when this message is enqueued in the message store.

-     *

-     * @param queue The storable queue into which the message is enqueued

-     */

-    public void enqueue(StorableQueue queue);

-

-    /**

-     *  This is called by the message store when this message is dequeued.

-     *

-     * @param queue The storable queue out of which the message is dequeued

-     */

-    public void dequeue(StorableQueue queue);

-

-    /**

-     * A message can be enqueued in several queues.

-     * The queue position represents the index of the provided queue within the ordered

-     * list of queues the message has been enqueued.

-     * <p>For example:

-     * <p> If the message is successively enqueued in queue Q1, Q2 and Q3 then

-     * the position of Q1 is 0, position of Q2 is 1 and position of Q3 is 2.

-     * <p> If the message is dequeud form Q2 then position of Q1 is stil 0 but position

-     * of Q3 becomes 1.

-     *

-     * @param queue The storable queue for which the position should be determined

-     *

-     * @return The position of the specified storable queue

-     */

-    public int getQueuePosition(StorableQueue queue);

-

-    /**

-     * Indicates whether this message has been staged.

-     * 

-     * @return True if the message has been staged, false otherwise

-     */

-    public boolean isStaged();

-

-    /**

-     * Call by the message store when this message is staged. 

-     */

-    public void staged();

-

-}

diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/messageStore/StorableQueue.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/messageStore/StorableQueue.java
deleted file mode 100644
index 10a9a3b8b8..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/messageStore/StorableQueue.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- */

-package org.apache.qpid.server.messageStore;

-

-import org.apache.qpid.framing.AMQShortString;

-

-/**

- * A storable queue can store storable messages and can be persisted in the store.

- * Created by Arnaud Simon

- * Date: 03-Apr-2007

- * Time: 08:52:18

- */

-public interface StorableQueue

-{

-    /**

-     * Get This queue unique id.

-     *

-     * @return The queue ID

-     */

-    public int getQueueID();

-

-    /**

-     * Set the queue ID.

-     *

-     * @param id This queue ID

-     */

-    public void setQueueID(int id);

-

-    /**

-     * Get this queue owner.

-     *

-     * @return This queue owner

-     */

-    public AMQShortString getOwner();

-

-    /**

-     * Get this queue name.

-     *

-     * @return the name of this queue

-     */

-    public AMQShortString getName();

-

-    /**

-     * Signifies to this queue that a message is dequeued.

-     * This operation is called by the store.

-     *

-     * @param m The dequeued message

-     */

-    public void dequeue(StorableMessage m);

-

-    /**

-     * Signifies to this queue that a message is enqueued.

-     * This operation is called by the store.

-     *

-     * @param m The enqueued message

-     */

-    public void enqueue(StorableMessage m);

-        

-}

diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/output/ProtocolOutputConverter.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/output/ProtocolOutputConverter.java
deleted file mode 100644
index e01c5aabbf..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/output/ProtocolOutputConverter.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*

- *

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- *

- *   http://www.apache.org/licenses/LICENSE-2.0

- *

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- *

- */

-

-/*

- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.

- * Supported AMQP versions:

- *   8-0

- */

-package org.apache.qpid.server.output;

-

-import org.apache.qpid.server.queue.AMQMessage;

-import org.apache.qpid.server.protocol.AMQProtocolSession;

-import org.apache.qpid.framing.AMQShortString;

-import org.apache.qpid.framing.AMQDataBlock;

-import org.apache.qpid.AMQException;

-

-public interface ProtocolOutputConverter

-{

-    void confirmConsumerAutoClose(int channelId, AMQShortString consumerTag);

-

-    interface Factory

-    {

-        ProtocolOutputConverter newInstance(AMQProtocolSession session);

-    }

-

-    void writeDeliver(AMQMessage message, int channelId, long deliveryTag, AMQShortString consumerTag)

-            throws AMQException;

-

-    void writeGetOk(AMQMessage message, int channelId, long deliveryTag, int queueSize) throws AMQException;

-

-    byte getProtocolMinorVersion();

-

-    byte getProtocolMajorVersion();

-

-    void writeReturn(AMQMessage message, int channelId, int replyCode, AMQShortString replyText)

-                    throws AMQException;

-

-    void writeFrame(AMQDataBlock block);

-}

diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/output/ProtocolOutputConverterRegistry.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/output/ProtocolOutputConverterRegistry.java
deleted file mode 100644
index 8366c426dd..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/output/ProtocolOutputConverterRegistry.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*

- *

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- *

- *   http://www.apache.org/licenses/LICENSE-2.0

- *

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- *

- */

-

-/*

- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.

- * Supported AMQP versions:

- *   8-0

- */

-package org.apache.qpid.server.output;

-

-import org.apache.qpid.server.output.ProtocolOutputConverter.Factory;

-import org.apache.qpid.server.output.amqp0_8.ProtocolOutputConverterImpl;

-import org.apache.qpid.server.protocol.AMQProtocolSession;

-

-import java.util.Map;

-import java.util.HashMap;

-

-public class ProtocolOutputConverterRegistry

-{

-

-    private static final Map<Byte, Map<Byte, Factory>> _registry =

-            new HashMap<Byte, Map<Byte, Factory>>();

-

-

-    static

-    {

-        register((byte) 8, (byte) 0, ProtocolOutputConverterImpl.getInstanceFactory());

-    }

-

-    private static void register(byte major, byte minor, Factory converter)

-    {

-        if(!_registry.containsKey(major))

-        {

-            _registry.put(major, new HashMap<Byte, Factory>());

-        }

-        _registry.get(major).put(minor, converter);

-    }

-

-

-    public static ProtocolOutputConverter getConverter(AMQProtocolSession session)

-    {

-        return _registry.get(session.getProtocolMajorVersion()).get(session.getProtocolMinorVersion()).newInstance(session);

-    }

-}

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
deleted file mode 100644
index 8462ed9557..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/output/amqp0_8/ProtocolOutputConverterImpl.java
+++ /dev/null
@@ -1,282 +0,0 @@
-/*

- *

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- *

- *   http://www.apache.org/licenses/LICENSE-2.0

- *

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- *

- */

-

-/*

- * This file is auto-generated by Qpid Gentools v.0.1 - do not modify.

- * Supported AMQP versions:

- *   8-0

- */

-package org.apache.qpid.server.output.amqp0_8;

-

-import org.apache.qpid.server.protocol.AMQProtocolSession;

-import org.apache.qpid.server.queue.AMQMessage;

-import org.apache.qpid.server.queue.AMQMessageHandle;

-import org.apache.qpid.server.store.StoreContext;

-import org.apache.qpid.server.output.ProtocolOutputConverter;

-import org.apache.qpid.framing.*;

-import org.apache.qpid.framing.abstraction.ContentChunk;

-import org.apache.qpid.framing.abstraction.MessagePublishInfo;

-import org.apache.qpid.AMQException;

-

-import org.apache.mina.common.ByteBuffer;

-

-import java.util.Iterator;

-

-public class ProtocolOutputConverterImpl implements ProtocolOutputConverter

-{

-

-    public static Factory getInstanceFactory()

-    {

-        return new Factory()

-        {

-    

-            public ProtocolOutputConverter newInstance(AMQProtocolSession session)

-            {

-                return new ProtocolOutputConverterImpl(session);

-            }

-        };

-    }

-

-    private final AMQProtocolSession _protocolSession;

-

-    private ProtocolOutputConverterImpl(AMQProtocolSession session)

-    {

-        _protocolSession = session;

-    }

-

-

-    public AMQProtocolSession getProtocolSession()

-    {

-        return _protocolSession;

-    }

-

-    public void writeDeliver(AMQMessage message, int channelId, long deliveryTag, AMQShortString consumerTag)

-            throws AMQException

-    {

-        ByteBuffer deliver = createEncodedDeliverFrame(message, channelId, deliveryTag, consumerTag);

-        AMQDataBlock contentHeader = ContentHeaderBody.createAMQFrame(channelId,

-                                                                      message.getContentHeaderBody());

-

-        final AMQMessageHandle messageHandle = message.getMessageHandle();

-        final StoreContext storeContext = message.getStoreContext();

-        final Long messageId = message.getMessageId();

-

-        final int bodyCount = messageHandle.getBodyCount(storeContext,messageId);

-

-        if(bodyCount == 0)

-        {

-            SmallCompositeAMQDataBlock compositeBlock = new SmallCompositeAMQDataBlock(deliver,

-                                                                             contentHeader);

-

-            writeFrame(compositeBlock);

-        }

-        else

-        {

-

-

-            //

-            // Optimise the case where we have a single content body. In that case we create a composite block

-            // so that we can writeDeliver out the deliver, header and body with a single network writeDeliver.

-            //

-            ContentChunk cb = messageHandle.getContentChunk(storeContext,messageId, 0);

-

-            AMQDataBlock firstContentBody = new AMQFrame(channelId, getProtocolSession().getRegistry().getProtocolVersionMethodConverter().convertToBody(cb));

-            AMQDataBlock[] headerAndFirstContent = new AMQDataBlock[]{contentHeader, firstContentBody};

-            CompositeAMQDataBlock compositeBlock = new CompositeAMQDataBlock(deliver, headerAndFirstContent);

-            writeFrame(compositeBlock);

-

-            //

-            // Now start writing out the other content bodies

-            //

-            for(int i = 1; i < bodyCount; i++)

-            {

-                cb = messageHandle.getContentChunk(storeContext,messageId, i);

-                writeFrame(new AMQFrame(channelId, getProtocolSession().getRegistry().getProtocolVersionMethodConverter().convertToBody(cb)));

-            }

-

-

-        }

-

-

-    }

-

-

-    public void writeGetOk(AMQMessage message, int channelId, long deliveryTag, int queueSize) throws AMQException

-    {

-

-        final AMQMessageHandle messageHandle = message.getMessageHandle();

-        final StoreContext storeContext = message.getStoreContext();

-        final long messageId = message.getMessageId();

-

-        ByteBuffer deliver = createEncodedGetOkFrame(message, channelId, deliveryTag, queueSize);

-

-

-        AMQDataBlock contentHeader = ContentHeaderBody.createAMQFrame(channelId,

-                                                                      message.getContentHeaderBody());

-

-        final int bodyCount = messageHandle.getBodyCount(storeContext,messageId);

-        if(bodyCount == 0)

-        {

-            SmallCompositeAMQDataBlock compositeBlock = new SmallCompositeAMQDataBlock(deliver,

-                                                                             contentHeader);

-            writeFrame(compositeBlock);

-        }

-        else

-        {

-

-

-            //

-            // Optimise the case where we have a single content body. In that case we create a composite block

-            // so that we can writeDeliver out the deliver, header and body with a single network writeDeliver.

-            //

-            ContentChunk cb = messageHandle.getContentChunk(storeContext,messageId, 0);

-

-            AMQDataBlock firstContentBody = new AMQFrame(channelId, getProtocolSession().getRegistry().getProtocolVersionMethodConverter().convertToBody(cb));

-            AMQDataBlock[] headerAndFirstContent = new AMQDataBlock[]{contentHeader, firstContentBody};

-            CompositeAMQDataBlock compositeBlock = new CompositeAMQDataBlock(deliver, headerAndFirstContent);

-            writeFrame(compositeBlock);

-

-            //

-            // Now start writing out the other content bodies

-            //

-            for(int i = 1; i < bodyCount; i++)

-            {

-                cb = messageHandle.getContentChunk(storeContext, messageId, i);

-                writeFrame(new AMQFrame(channelId, getProtocolSession().getRegistry().getProtocolVersionMethodConverter().convertToBody(cb)));

-            }

-

-

-        }

-

-

-    }

-

-

-    private ByteBuffer createEncodedDeliverFrame(AMQMessage message, int channelId, long deliveryTag, AMQShortString consumerTag)

-            throws AMQException

-    {

-        final MessagePublishInfo pb = message.getMessagePublishInfo();

-        final AMQMessageHandle messageHandle = message.getMessageHandle();

-

-        AMQFrame deliverFrame = BasicDeliverBody.createAMQFrame(channelId, getProtocolMajorVersion(),

-                                                                getProtocolMinorVersion(),

-                                                                consumerTag,

-                                                                deliveryTag, pb.getExchange(), messageHandle.isRedelivered(),

-                                                                pb.getRoutingKey());

-

-

-        return deliverFrame.toByteBuffer();

-    }

-

-    private ByteBuffer createEncodedGetOkFrame(AMQMessage message, int channelId, long deliveryTag, int queueSize)

-            throws AMQException

-    {

-        final MessagePublishInfo pb = message.getMessagePublishInfo();

-        final AMQMessageHandle messageHandle = message.getMessageHandle();

-

-        AMQFrame getOkFrame = BasicGetOkBody.createAMQFrame(channelId,

-                                                            getProtocolMajorVersion(),

-                                                            getProtocolMinorVersion(),

-                                                                deliveryTag, pb.getExchange(),

-                                                                queueSize,

-                                                                messageHandle.isRedelivered(),

-                                                                pb.getRoutingKey());

-

-        return getOkFrame.toByteBuffer();

-    }

-

-    public byte getProtocolMinorVersion()

-    {

-        return getProtocolSession().getProtocolMinorVersion();

-    }

-

-    public byte getProtocolMajorVersion()

-    {

-        return getProtocolSession().getProtocolMajorVersion();

-    }

-

-    private ByteBuffer createEncodedReturnFrame(AMQMessage message, int channelId, int replyCode, AMQShortString replyText) throws AMQException

-    {

-        AMQFrame returnFrame = BasicReturnBody.createAMQFrame(channelId,

-                                                              getProtocolMajorVersion(),

-                                                              getProtocolMinorVersion(),

-                                                              message.getMessagePublishInfo().getExchange(),

-                                                              replyCode, replyText,

-                                                              message.getMessagePublishInfo().getRoutingKey());

-

-        return returnFrame.toByteBuffer();

-    }

-

-    public void writeReturn(AMQMessage message, int channelId, int replyCode, AMQShortString replyText)

-            throws AMQException

-    {

-        ByteBuffer returnFrame = createEncodedReturnFrame(message, channelId, replyCode, replyText);

-

-        AMQDataBlock contentHeader = ContentHeaderBody.createAMQFrame(channelId,

-                                                                      message.getContentHeaderBody());

-

-        Iterator<AMQDataBlock> bodyFrameIterator = message.getBodyFrameIterator(getProtocolSession(), channelId);

-        //

-        // Optimise the case where we have a single content body. In that case we create a composite block

-        // so that we can writeDeliver out the deliver, header and body with a single network writeDeliver.

-        //

-        if (bodyFrameIterator.hasNext())

-        {

-            AMQDataBlock firstContentBody = bodyFrameIterator.next();

-            AMQDataBlock[] headerAndFirstContent = new AMQDataBlock[]{contentHeader, firstContentBody};

-            CompositeAMQDataBlock compositeBlock = new CompositeAMQDataBlock(returnFrame, headerAndFirstContent);

-            writeFrame(compositeBlock);

-        }

-        else

-        {

-            CompositeAMQDataBlock compositeBlock = new CompositeAMQDataBlock(returnFrame,

-                                                                             new AMQDataBlock[]{contentHeader});

-

-            writeFrame(compositeBlock);

-        }

-

-        //

-        // Now start writing out the other content bodies

-        // TODO: MINA needs to be fixed so the the pending writes buffer is not unbounded

-        //

-        while (bodyFrameIterator.hasNext())

-        {

-            writeFrame(bodyFrameIterator.next());

-        }

-    }

-

-

-    public void writeFrame(AMQDataBlock block)

-    {

-        getProtocolSession().writeFrame(block);

-    }

-

-

-    public void confirmConsumerAutoClose(int channelId, AMQShortString consumerTag)

-    {

-

-        writeFrame(BasicCancelOkBody.createAMQFrame(channelId,

-                   getProtocolMajorVersion(),

-                   getProtocolMinorVersion(),

-                   consumerTag    // consumerTag

-        ));

-    }

-}

diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQMinaProtocolSession.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQMinaProtocolSession.java
deleted file mode 100644
index c9f5e42286..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQMinaProtocolSession.java
+++ /dev/null
@@ -1,773 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.protocol;
-
-import org.apache.log4j.Logger;
-
-import org.apache.mina.common.IdleStatus;
-import org.apache.mina.common.IoServiceConfig;
-import org.apache.mina.common.IoSession;
-import org.apache.mina.transport.vmpipe.VmPipeAddress;
-
-import org.apache.qpid.AMQChannelException;
-import org.apache.qpid.AMQConnectionException;
-import org.apache.qpid.AMQException;
-import org.apache.qpid.codec.AMQCodecFactory;
-import org.apache.qpid.codec.AMQDecoder;
-import org.apache.qpid.common.ClientProperties;
-import org.apache.qpid.framing.*;
-import org.apache.qpid.pool.ReadWriteThreadModel;
-import org.apache.qpid.protocol.AMQConstant;
-import org.apache.qpid.protocol.AMQMethodEvent;
-import org.apache.qpid.protocol.AMQMethodListener;
-import org.apache.qpid.server.AMQChannel;
-import org.apache.qpid.server.management.Managable;
-import org.apache.qpid.server.management.ManagedObject;
-import org.apache.qpid.server.output.ProtocolOutputConverter;
-import org.apache.qpid.server.output.ProtocolOutputConverterRegistry;
-import org.apache.qpid.server.registry.ApplicationRegistry;
-import org.apache.qpid.server.state.AMQState;
-import org.apache.qpid.server.state.AMQStateManager;
-import org.apache.qpid.server.virtualhost.VirtualHost;
-import org.apache.qpid.server.virtualhost.VirtualHostRegistry;
-
-import javax.management.JMException;
-import javax.security.sasl.SaslServer;
-
-import java.net.InetSocketAddress;
-import java.net.SocketAddress;
-import java.security.Principal;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.concurrent.CopyOnWriteArraySet;
-
-public class AMQMinaProtocolSession implements AMQProtocolSession, Managable
-{
-    private static final Logger _logger = Logger.getLogger(AMQProtocolSession.class);
-
-    private static final String CLIENT_PROPERTIES_INSTANCE = ClientProperties.instance.toString();
-
-    // to save boxing the channelId and looking up in a map... cache in an array the low numbered
-    // channels.  This value must be of the form 2^x - 1.
-    private static final int CHANNEL_CACHE_SIZE = 0xff;
-
-    private final IoSession _minaProtocolSession;
-
-    private AMQShortString _contextKey;
-
-    private AMQShortString _clientVersion = null;
-
-    private VirtualHost _virtualHost;
-
-    private final Map<Integer, AMQChannel> _channelMap = new HashMap<Integer, AMQChannel>();
-
-    private final AMQChannel[] _cachedChannels = new AMQChannel[CHANNEL_CACHE_SIZE + 1];
-
-    private final CopyOnWriteArraySet<AMQMethodListener> _frameListeners = new CopyOnWriteArraySet<AMQMethodListener>();
-
-    private final AMQStateManager _stateManager;
-
-    private AMQCodecFactory _codecFactory;
-
-    private AMQProtocolSessionMBean _managedObject;
-
-    private SaslServer _saslServer;
-
-    private Object _lastReceived;
-
-    private Object _lastSent;
-
-    private boolean _closed;
-    // maximum number of channels this session should have
-    private long _maxNoOfChannels = 1000;
-
-    /* AMQP Version for this session */
-    private ProtocolVersion _protocolVersion = ProtocolVersion.getLatestSupportedVersion();
-
-    private FieldTable _clientProperties;
-    private final List<Task> _taskList = new CopyOnWriteArrayList<Task>();
-    private VersionSpecificRegistry _registry = MainRegistry.getVersionSpecificRegistry(_protocolVersion);
-    private List<Integer> _closingChannelsList = new ArrayList<Integer>();
-    private ProtocolOutputConverter _protocolOutputConverter;
-    private Principal _authorizedID;
-
-    public ManagedObject getManagedObject()
-    {
-        return _managedObject;
-    }
-
-    public AMQMinaProtocolSession(IoSession session, VirtualHostRegistry virtualHostRegistry, AMQCodecFactory codecFactory)
-        throws AMQException
-    {
-        _stateManager = new AMQStateManager(virtualHostRegistry, this);
-        _minaProtocolSession = session;
-        session.setAttachment(this);
-
-        _codecFactory = codecFactory;
-
-        try
-        {
-            IoServiceConfig config = session.getServiceConfig();
-            ReadWriteThreadModel threadModel = (ReadWriteThreadModel) config.getThreadModel();
-            threadModel.getAsynchronousReadFilter().createNewJobForSession(session);
-            threadModel.getAsynchronousWriteFilter().createNewJobForSession(session);
-        }
-        catch (RuntimeException e)
-        {
-            e.printStackTrace();
-            // throw e;
-
-        }
-
-        // this(session, queueRegistry, exchangeRegistry, codecFactory, new AMQStateManager());
-    }
-
-    public AMQMinaProtocolSession(IoSession session, VirtualHostRegistry virtualHostRegistry, AMQCodecFactory codecFactory,
-        AMQStateManager stateManager) throws AMQException
-    {
-        _stateManager = stateManager;
-        _minaProtocolSession = session;
-        session.setAttachment(this);
-
-        _codecFactory = codecFactory;
-
-    }
-
-    private AMQProtocolSessionMBean createMBean() throws AMQException
-    {
-        try
-        {
-            return new AMQProtocolSessionMBean(this);
-        }
-        catch (JMException ex)
-        {
-            _logger.error("AMQProtocolSession MBean creation has failed ", ex);
-            throw new AMQException(null, "AMQProtocolSession MBean creation has failed ", ex);
-        }
-    }
-
-    public IoSession getIOSession()
-    {
-        return _minaProtocolSession;
-    }
-
-    public static AMQProtocolSession getAMQProtocolSession(IoSession minaProtocolSession)
-    {
-        return (AMQProtocolSession) minaProtocolSession.getAttachment();
-    }
-
-    public void dataBlockReceived(AMQDataBlock message) throws Exception
-    {
-        _lastReceived = message;
-        if (message instanceof ProtocolInitiation)
-        {
-            protocolInitiationReceived((ProtocolInitiation) message);
-
-        }
-        else if (message instanceof AMQFrame)
-        {
-            AMQFrame frame = (AMQFrame) message;
-            frameReceived(frame);
-
-        }
-        else
-        {
-            throw new UnknnownMessageTypeException(message, null);
-        }
-    }
-
-    private void frameReceived(AMQFrame frame) throws AMQException
-    {
-        int channelId = frame.getChannel();
-        AMQBody body = frame.getBodyFrame();
-
-        if (_logger.isDebugEnabled())
-        {
-            _logger.debug("Frame Received: " + frame);
-        }
-
-        if (body instanceof AMQMethodBody)
-        {
-            methodFrameReceived(channelId, (AMQMethodBody) body);
-        }
-        else if (body instanceof ContentHeaderBody)
-        {
-            contentHeaderReceived(channelId, (ContentHeaderBody) body);
-        }
-        else if (body instanceof ContentBody)
-        {
-            contentBodyReceived(channelId, (ContentBody) body);
-        }
-        else if (body instanceof HeartbeatBody)
-        {
-            // NO OP
-        }
-        else
-        {
-            _logger.warn("Unrecognised frame " + frame.getClass().getName());
-        }
-    }
-
-    private void protocolInitiationReceived(ProtocolInitiation pi)
-    {
-        // this ensures the codec never checks for a PI message again
-        ((AMQDecoder) _codecFactory.getDecoder()).setExpectProtocolInitiation(false);
-        try
-        {
-            pi.checkVersion(); // Fails if not correct
-
-            // This sets the protocol version (and hence framing classes) for this session.
-            setProtocolVersion(pi._protocolMajor, pi._protocolMinor);
-
-            String mechanisms = ApplicationRegistry.getInstance().getAuthenticationManager().getMechanisms();
-
-            String locales = "en_US";
-
-            // Interfacing with generated code - be aware of possible changes to parameter order as versions change.
-            AMQFrame response =
-                ConnectionStartBody.createAMQFrame((short) 0, getProtocolMajorVersion(), getProtocolMinorVersion(), // AMQP version (major, minor)
-                    locales.getBytes(), // locales
-                    mechanisms.getBytes(), // mechanisms
-                    null, // serverProperties
-                    (short) getProtocolMajorVersion(), // versionMajor
-                    (short) getProtocolMinorVersion()); // versionMinor
-            _minaProtocolSession.write(response);
-        }
-        catch (AMQException e)
-        {
-            _logger.error("Received incorrect protocol initiation", e);
-
-            _minaProtocolSession.write(new ProtocolInitiation(ProtocolVersion.getLatestSupportedVersion()));
-
-            // TODO: Close connection (but how to wait until message is sent?)
-            // ritchiem 2006-12-04 will this not do?
-            // WriteFuture future = _minaProtocolSession.write(new ProtocolInitiation(pv[i][PROTOCOLgetProtocolMajorVersion()], pv[i][PROTOCOLgetProtocolMinorVersion()]));
-            // future.join();
-            // close connection
-
-        }
-    }
-
-    private void methodFrameReceived(int channelId, AMQMethodBody methodBody)
-    {
-
-        final AMQMethodEvent<AMQMethodBody> evt = new AMQMethodEvent<AMQMethodBody>(channelId, methodBody);
-
-        // Check that this channel is not closing
-        if (channelAwaitingClosure(channelId))
-        {
-            if ((evt.getMethod() instanceof ChannelCloseOkBody))
-            {
-                if (_logger.isInfoEnabled())
-                {
-                    _logger.info("Channel[" + channelId + "] awaiting closure - processing close-ok");
-                }
-            }
-            else
-            {
-                if (_logger.isInfoEnabled())
-                {
-                    _logger.info("Channel[" + channelId + "] awaiting closure ignoring");
-                }
-
-                return;
-            }
-        }
-
-        try
-        {
-            try
-            {
-
-                boolean wasAnyoneInterested = _stateManager.methodReceived(evt);
-
-                if (!_frameListeners.isEmpty())
-                {
-                    for (AMQMethodListener listener : _frameListeners)
-                    {
-                        wasAnyoneInterested = listener.methodReceived(evt) || wasAnyoneInterested;
-                    }
-                }
-
-                if (!wasAnyoneInterested)
-                {
-                    throw new AMQNoMethodHandlerException(evt, null);
-                }
-            }
-            catch (AMQChannelException e)
-            {
-                if (getChannel(channelId) != null)
-                {
-                    if (_logger.isInfoEnabled())
-                    {
-                        _logger.info("Closing channel due to: " + e.getMessage());
-                    }
-
-                    writeFrame(e.getCloseFrame(channelId));
-                    closeChannel(channelId);
-                }
-                else
-                {
-                    if (_logger.isDebugEnabled())
-                    {
-                        _logger.debug("ChannelException occured on non-existent channel:" + e.getMessage());
-                    }
-
-                    if (_logger.isInfoEnabled())
-                    {
-                        _logger.info("Closing connection due to: " + e.getMessage());
-                    }
-
-                    closeSession();
-
-                    AMQConnectionException ce =
-                        evt.getMethod().getConnectionException(AMQConstant.CHANNEL_ERROR,
-                            AMQConstant.CHANNEL_ERROR.getName().toString());
-
-                    _stateManager.changeState(AMQState.CONNECTION_CLOSING);
-                    writeFrame(ce.getCloseFrame(channelId));
-                }
-            }
-            catch (AMQConnectionException e)
-            {
-                if (_logger.isInfoEnabled())
-                {
-                    _logger.info("Closing connection due to: " + e.getMessage());
-                }
-
-                closeSession();
-                _stateManager.changeState(AMQState.CONNECTION_CLOSING);
-                writeFrame(e.getCloseFrame(channelId));
-            }
-        }
-        catch (Exception e)
-        {
-            _stateManager.error(e);
-            for (AMQMethodListener listener : _frameListeners)
-            {
-                listener.error(e);
-            }
-
-            _minaProtocolSession.close();
-        }
-    }
-
-    private void contentHeaderReceived(int channelId, ContentHeaderBody body) throws AMQException
-    {
-
-        AMQChannel channel = getAndAssertChannel(channelId);
-
-        channel.publishContentHeader(body, this);
-
-    }
-
-    private void contentBodyReceived(int channelId, ContentBody body) throws AMQException
-    {
-        AMQChannel channel = getAndAssertChannel(channelId);
-
-        channel.publishContentBody(body, this);
-    }
-
-    /**
-     * Convenience method that writes a frame to the protocol session. Equivalent to calling
-     * getProtocolSession().write().
-     *
-     * @param frame the frame to write
-     */
-    public void writeFrame(AMQDataBlock frame)
-    {
-        _lastSent = frame;
-        _minaProtocolSession.write(frame);
-    }
-
-    public AMQShortString getContextKey()
-    {
-        return _contextKey;
-    }
-
-    public void setContextKey(AMQShortString contextKey)
-    {
-        _contextKey = contextKey;
-    }
-
-    public List<AMQChannel> getChannels()
-    {
-        return new ArrayList<AMQChannel>(_channelMap.values());
-    }
-
-    public AMQChannel getAndAssertChannel(int channelId) throws AMQException
-    {
-        AMQChannel channel = getChannel(channelId);
-        if (channel == null)
-        {
-            throw new AMQException(AMQConstant.NOT_FOUND, "Channel not found with id:" + channelId, null);
-        }
-
-        return channel;
-    }
-
-    public AMQChannel getChannel(int channelId) throws AMQException
-    {
-        final AMQChannel channel =
-            ((channelId & CHANNEL_CACHE_SIZE) == channelId) ? _cachedChannels[channelId] : _channelMap.get(channelId);
-        if ((channel == null) || channel.isClosing())
-        {
-            return null;
-        }
-        else
-        {
-            return channel;
-        }
-    }
-
-    public boolean channelAwaitingClosure(int channelId)
-    {
-        return _closingChannelsList.contains(channelId);
-    }
-
-    public void addChannel(AMQChannel channel) throws AMQException
-    {
-        if (_closed)
-        {
-            throw new AMQException(null, "Session is closed", null);
-        }
-
-        final int channelId = channel.getChannelId();
-
-        if (_closingChannelsList.contains(channelId))
-        {
-            throw new AMQException(null, "Session is marked awaiting channel close", null);
-        }
-
-        if (_channelMap.size() == _maxNoOfChannels)
-        {
-            String errorMessage =
-                toString() + ": maximum number of channels has been reached (" + _maxNoOfChannels
-                + "); can't create channel";
-            _logger.error(errorMessage);
-            throw new AMQException(AMQConstant.NOT_ALLOWED, errorMessage, null);
-        }
-        else
-        {
-            _channelMap.put(channel.getChannelId(), channel);
-        }
-
-        if (((channelId & CHANNEL_CACHE_SIZE) == channelId))
-        {
-            _cachedChannels[channelId] = channel;
-        }
-
-        checkForNotification();
-    }
-
-    private void checkForNotification()
-    {
-        int channelsCount = _channelMap.size();
-        if (channelsCount >= _maxNoOfChannels)
-        {
-            _managedObject.notifyClients("Channel count (" + channelsCount + ") has reached the threshold value");
-        }
-    }
-
-    public Long getMaximumNumberOfChannels()
-    {
-        return _maxNoOfChannels;
-    }
-
-    public void setMaximumNumberOfChannels(Long value)
-    {
-        _maxNoOfChannels = value;
-    }
-
-    public void commitTransactions(AMQChannel channel) throws AMQException
-    {
-        if ((channel != null) && channel.isTransactional())
-        {
-            channel.commit();
-        }
-    }
-
-    public void rollbackTransactions(AMQChannel channel) throws AMQException
-    {
-        if ((channel != null) && channel.isTransactional())
-        {
-            channel.rollback();
-        }
-    }
-
-    /**
-     * Close a specific channel. This will remove any resources used by the channel, including: <ul><li>any queue
-     * subscriptions (this may in turn remove queues if they are auto delete</li> </ul>
-     *
-     * @param channelId id of the channel to close
-     *
-     * @throws AMQException             if an error occurs closing the channel
-     * @throws IllegalArgumentException if the channel id is not valid
-     */
-    public void closeChannel(int channelId) throws AMQException
-    {
-        final AMQChannel channel = getChannel(channelId);
-        if (channel == null)
-        {
-            throw new IllegalArgumentException("Unknown channel id");
-        }
-        else
-        {
-            try
-            {
-                channel.close(this);
-                markChannelawaitingCloseOk(channelId);
-            }
-            finally
-            {
-                removeChannel(channelId);
-            }
-        }
-    }
-
-    public void closeChannelOk(int channelId)
-    {
-        _closingChannelsList.remove(new Integer(channelId));
-    }
-
-    private void markChannelawaitingCloseOk(int channelId)
-    {
-        _closingChannelsList.add(channelId);
-    }
-
-    /**
-     * In our current implementation this is used by the clustering code.
-     *
-     * @param channelId The channel to remove
-     */
-    public void removeChannel(int channelId)
-    {
-        _channelMap.remove(channelId);
-        if ((channelId & CHANNEL_CACHE_SIZE) == channelId)
-        {
-            _cachedChannels[channelId] = null;
-        }
-    }
-
-    /**
-     * Initialise heartbeats on the session.
-     *
-     * @param delay delay in seconds (not ms)
-     */
-    public void initHeartbeats(int delay)
-    {
-        if (delay > 0)
-        {
-            _minaProtocolSession.setIdleTime(IdleStatus.WRITER_IDLE, delay);
-            _minaProtocolSession.setIdleTime(IdleStatus.READER_IDLE, HeartbeatConfig.getInstance().getTimeout(delay));
-        }
-    }
-
-    /**
-     * Closes all channels that were opened by this protocol session. This frees up all resources used by the channel.
-     *
-     * @throws AMQException if an error occurs while closing any channel
-     */
-    private void closeAllChannels() throws AMQException
-    {
-        for (AMQChannel channel : _channelMap.values())
-        {
-            channel.close(this);
-        }
-
-        _channelMap.clear();
-        for (int i = 0; i <= CHANNEL_CACHE_SIZE; i++)
-        {
-            _cachedChannels[i] = null;
-        }
-    }
-
-    /** This must be called when the session is _closed in order to free up any resources managed by the session. */
-    public void closeSession() throws AMQException
-    {
-        if (!_closed)
-        {
-            _closed = true;
-            closeAllChannels();
-            if (_managedObject != null)
-            {
-                _managedObject.unregister();
-            }
-
-            for (Task task : _taskList)
-            {
-                task.doTask(this);
-            }
-        }
-    }
-
-    public String toString()
-    {
-        return "AMQProtocolSession(" + _minaProtocolSession.getRemoteAddress() + ")";
-    }
-
-    public String dump()
-    {
-        return this + " last_sent=" + _lastSent + " last_received=" + _lastReceived;
-    }
-
-    /** @return an object that can be used to identity */
-    public Object getKey()
-    {
-        return _minaProtocolSession.getRemoteAddress();
-    }
-
-    /**
-     * Get the fully qualified domain name of the local address to which this session is bound. Since some servers may
-     * be bound to multiple addresses this could vary depending on the acceptor this session was created from.
-     *
-     * @return a String FQDN
-     */
-    public String getLocalFQDN()
-    {
-        SocketAddress address = _minaProtocolSession.getLocalAddress();
-        // we use the vmpipe address in some tests hence the need for this rather ugly test. The host
-        // information is used by SASL primary.
-        if (address instanceof InetSocketAddress)
-        {
-            return ((InetSocketAddress) address).getHostName();
-        }
-        else if (address instanceof VmPipeAddress)
-        {
-            return "vmpipe:" + ((VmPipeAddress) address).getPort();
-        }
-        else
-        {
-            throw new IllegalArgumentException("Unsupported socket address class: " + address);
-        }
-    }
-
-    public SaslServer getSaslServer()
-    {
-        return _saslServer;
-    }
-
-    public void setSaslServer(SaslServer saslServer)
-    {
-        _saslServer = saslServer;
-    }
-
-    public FieldTable getClientProperties()
-    {
-        return _clientProperties;
-    }
-
-    public void setClientProperties(FieldTable clientProperties)
-    {
-        _clientProperties = clientProperties;
-        if (_clientProperties != null)
-        {
-            if (_clientProperties.getString(CLIENT_PROPERTIES_INSTANCE) != null)
-            {
-                setContextKey(new AMQShortString(_clientProperties.getString(CLIENT_PROPERTIES_INSTANCE)));
-            }
-
-            if (_clientProperties.getString(ClientProperties.version.toString()) != null)
-            {
-                _clientVersion = new AMQShortString(_clientProperties.getString(ClientProperties.version.toString()));
-            }
-        }
-    }
-
-    private void setProtocolVersion(byte major, byte minor)
-    {
-        _protocolVersion = new ProtocolVersion(major, minor);
-
-        _registry = MainRegistry.getVersionSpecificRegistry(_protocolVersion);
-
-        _protocolOutputConverter = ProtocolOutputConverterRegistry.getConverter(this);
-    }
-
-    public byte getProtocolMajorVersion()
-    {
-        return _protocolVersion.getMajorVersion();
-    }
-
-    public byte getProtocolMinorVersion()
-    {
-        return _protocolVersion.getMinorVersion();
-    }
-
-    public boolean isProtocolVersion(byte major, byte minor)
-    {
-        return (getProtocolMajorVersion() == major) && (getProtocolMinorVersion() == minor);
-    }
-
-    public VersionSpecificRegistry getRegistry()
-    {
-        return _registry;
-    }
-
-    public Object getClientIdentifier()
-    {
-        return _minaProtocolSession.getRemoteAddress();
-    }
-
-    public VirtualHost getVirtualHost()
-    {
-        return _virtualHost;
-    }
-
-    public void setVirtualHost(VirtualHost virtualHost) throws AMQException
-    {
-        _virtualHost = virtualHost;
-        _managedObject = createMBean();
-        _managedObject.register();
-    }
-
-    public void addSessionCloseTask(Task task)
-    {
-        _taskList.add(task);
-    }
-
-    public void removeSessionCloseTask(Task task)
-    {
-        _taskList.remove(task);
-    }
-
-    public ProtocolOutputConverter getProtocolOutputConverter()
-    {
-        return _protocolOutputConverter;
-    }
-
-    public void setAuthorizedID(Principal authorizedID)
-    {
-        _authorizedID = authorizedID;
-    }
-
-    public Principal getAuthorizedID()
-    {
-        return _authorizedID;
-    }
-
-    public String getClientVersion()
-    {
-        return (_clientVersion == null) ? null : _clientVersion.toString();
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQNoMethodHandlerException.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQNoMethodHandlerException.java
deleted file mode 100644
index ee6e090e24..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQNoMethodHandlerException.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*

- *

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- *

- *   http://www.apache.org/licenses/LICENSE-2.0

- *

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- *

- */

-package org.apache.qpid.server.protocol;

-

-import org.apache.qpid.AMQException;

-import org.apache.qpid.framing.AMQMethodBody;

-import org.apache.qpid.protocol.AMQMethodEvent;

-

-/**

- * AMQNoMethodHandlerException represents the case where no method handler exists to handle an AQMP method.

- *

- * <p/><table id="crc"><caption>CRC Card</caption>

- * <tr><th> Responsibilities <th> Collaborations

- * <tr><td> Represents failure to handle an AMQP method.

- * </table>

- *

- * @todo Not an AMQP exception as no status code.

- *

- * @todo Missing method handler. Unlikely to ever happen, and if it does its a coding error. Consider replacing with a

- *       Runtime.

- */

-public class AMQNoMethodHandlerException extends AMQException

-{

-    public AMQNoMethodHandlerException(AMQMethodEvent<AMQMethodBody> evt, Throwable cause)

-    {

-        super(null, "AMQMethodEvent " + evt + " was not processed by any listener on Broker.", cause);

-    }

-}

diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQPFastProtocolHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQPFastProtocolHandler.java
deleted file mode 100644
index 0c80414a3e..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQPFastProtocolHandler.java
+++ /dev/null
@@ -1,243 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.protocol;
-
-import java.io.IOException;
-import java.net.InetSocketAddress;
-import org.apache.log4j.Logger;
-import org.apache.mina.common.ByteBuffer;
-import org.apache.mina.common.IdleStatus;
-import org.apache.mina.common.IoHandlerAdapter;
-import org.apache.mina.common.IoSession;
-import org.apache.mina.filter.SSLFilter;
-import org.apache.mina.filter.codec.ProtocolCodecFilter;
-import org.apache.mina.util.SessionUtil;
-import org.apache.qpid.AMQException;
-import org.apache.qpid.codec.AMQCodecFactory;
-import org.apache.qpid.framing.AMQDataBlock;
-import org.apache.qpid.framing.AMQProtocolHeaderException;
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.framing.ConnectionCloseBody;
-import org.apache.qpid.framing.HeartbeatBody;
-import org.apache.qpid.framing.ProtocolInitiation;
-import org.apache.qpid.framing.ProtocolVersion;
-import org.apache.qpid.server.registry.ApplicationRegistry;
-import org.apache.qpid.server.registry.IApplicationRegistry;
-import org.apache.qpid.server.transport.ConnectorConfiguration;
-import org.apache.qpid.ssl.SSLContextFactory;
-
-import java.io.IOException;
-import java.net.InetSocketAddress;
-
-/**
- * The protocol handler handles "protocol events" for all connections. The state
- * associated with an individual connection is accessed through the protocol session.
- *
- * We delegate all frame (message) processing to the AMQProtocolSession which wraps
- * the state for the connection.
- *
- */
-public class AMQPFastProtocolHandler extends IoHandlerAdapter
-{
-    private static final Logger _logger = Logger.getLogger(AMQPFastProtocolHandler.class);
-
-    private final IApplicationRegistry _applicationRegistry;
-
-    public AMQPFastProtocolHandler(Integer applicationRegistryInstance)
-    {
-        this(ApplicationRegistry.getInstance(applicationRegistryInstance));
-    }
-
-    public AMQPFastProtocolHandler(IApplicationRegistry applicationRegistry)
-    {
-        _applicationRegistry = applicationRegistry;
-        _logger.debug("AMQPFastProtocolHandler created");
-    }
-
-    protected AMQPFastProtocolHandler(AMQPFastProtocolHandler handler)
-    {
-        this(handler._applicationRegistry);
-    }
-
-    public void sessionCreated(IoSession protocolSession) throws Exception
-    {
-        SessionUtil.initialize(protocolSession);
-        final AMQCodecFactory codecFactory = new AMQCodecFactory(true);
-
-        createSession(protocolSession, _applicationRegistry, codecFactory);
-        _logger.info("Protocol session created for:" + protocolSession.getRemoteAddress());
-
-        final ProtocolCodecFilter pcf = new ProtocolCodecFilter(codecFactory);
-
-        ConnectorConfiguration connectorConfig = ApplicationRegistry.getInstance().
-                getConfiguredObject(ConnectorConfiguration.class);
-        if (connectorConfig.enableExecutorPool)
-        {
-            if (connectorConfig.enableSSL && isSSLClient(connectorConfig, protocolSession))
-            {
-                String keystorePath = connectorConfig.keystorePath;
-                String keystorePassword = connectorConfig.keystorePassword;
-                String certType = connectorConfig.certType;
-                SSLContextFactory sslContextFactory = new SSLContextFactory(keystorePath, keystorePassword, certType);
-                protocolSession.getFilterChain().addAfter("AsynchronousReadFilter", "sslFilter",
-                                                          new SSLFilter(sslContextFactory.buildServerContext()));
-            }
-
-            protocolSession.getFilterChain().addBefore("AsynchronousWriteFilter", "protocolFilter", pcf);
-        }
-        else
-        {
-            protocolSession.getFilterChain().addLast("protocolFilter", pcf);
-            if (connectorConfig.enableSSL && isSSLClient(connectorConfig, protocolSession))
-            {
-                String keystorePath = connectorConfig.keystorePath;
-                String keystorePassword = connectorConfig.keystorePassword;
-                String certType = connectorConfig.certType;
-                SSLContextFactory sslContextFactory = new SSLContextFactory(keystorePath, keystorePassword, certType);
-                protocolSession.getFilterChain().addBefore("protocolFilter", "sslFilter",
-                    new SSLFilter(sslContextFactory.buildServerContext()));
-            }
-
-        }
-    }
-
-    /**
-     * Separated into its own, protected, method to allow easier reuse
-     */
-    protected void createSession(IoSession session, IApplicationRegistry applicationRegistry, AMQCodecFactory codec) throws AMQException
-    {
-        new AMQMinaProtocolSession(session, applicationRegistry.getVirtualHostRegistry(), codec);
-    }
-
-    public void sessionOpened(IoSession protocolSession) throws Exception
-    {
-        _logger.info("Session opened for:" + protocolSession.getRemoteAddress());
-    }
-
-    public void sessionClosed(IoSession protocolSession) throws Exception
-    {
-        _logger.info("Protocol Session closed for:" + protocolSession.getRemoteAddress());
-        final AMQProtocolSession amqProtocolSession = AMQMinaProtocolSession.getAMQProtocolSession(protocolSession);
-        //fixme  -- this can be null
-        if (amqProtocolSession != null)
-        {
-            amqProtocolSession.closeSession();
-        }
-    }
-
-    public void sessionIdle(IoSession session, IdleStatus status) throws Exception
-    {
-        _logger.debug("Protocol Session [" + this + "] idle: " + status + " :for:" + session.getRemoteAddress());
-        if (IdleStatus.WRITER_IDLE.equals(status))
-        {
-            //write heartbeat frame:
-            session.write(HeartbeatBody.FRAME);
-        }
-        else if (IdleStatus.READER_IDLE.equals(status))
-        {
-            //failover:
-            throw new IOException("Timed out while waiting for heartbeat from peer.");
-        }
-
-    }
-
-    public void exceptionCaught(IoSession protocolSession, Throwable throwable) throws Exception
-    {
-        AMQProtocolSession session = AMQMinaProtocolSession.getAMQProtocolSession(protocolSession);
-        if (throwable instanceof AMQProtocolHeaderException)
-        {
-
-            protocolSession.write(new ProtocolInitiation(ProtocolVersion.getLatestSupportedVersion()));
-
-            protocolSession.close();
-
-            _logger.error("Error in protocol initiation " + session + ":" + protocolSession.getRemoteAddress() + " :" + throwable.getMessage(), throwable);
-        }
-        else if (throwable instanceof IOException)
-        {
-            _logger.error("IOException caught in" + session + ", session closed implictly: " + throwable, throwable);
-        }
-        else
-        {
-            _logger.error("Exception caught in" + session + ", closing session explictly: " + throwable, throwable);
-
-            // Be aware of possible changes to parameter order as versions change.
-            protocolSession.write(ConnectionCloseBody.createAMQFrame(0,
-                                                                     session.getProtocolMajorVersion(),
-                                                                     session.getProtocolMinorVersion(),    // AMQP version (major, minor)
-                                                                     0,    // classId
-                                                                     0,    // methodId
-                                                                     200,    // replyCode
-                                                                     new AMQShortString(throwable.getMessage())    // replyText
-            ));
-            protocolSession.close();
-        }
-    }
-
-    /**
-     * Invoked when a message is received on a particular protocol session. Note that a
-     * protocol session is directly tied to a particular physical connection.
-     * @param protocolSession the protocol session that received the message
-     * @param message the message itself (i.e. a decoded frame)
-     * @throws Exception if the message cannot be processed
-     */
-    public void messageReceived(IoSession protocolSession, Object message) throws Exception
-    {
-        final AMQProtocolSession amqProtocolSession = AMQMinaProtocolSession.getAMQProtocolSession(protocolSession);
-
-        if (message instanceof AMQDataBlock)
-        {
-            amqProtocolSession.dataBlockReceived((AMQDataBlock) message);
-                        
-        }
-        else if (message instanceof ByteBuffer)
-        {
-            throw new IllegalStateException("Handed undecoded ByteBuffer buf = " + message);
-        }
-        else
-        {
-            throw new IllegalStateException("Handed unhandled message. message.class = " + message.getClass() + " message = "
-                + message);
-        }
-    }
-
-    /**
-     * Called after a message has been sent out on a particular protocol session
-     * @param protocolSession the protocol session (i.e. connection) on which this
-     * message was sent
-     * @param object the message (frame) that was encoded and sent
-     * @throws Exception if we want to indicate an error
-     */
-    public void messageSent(IoSession protocolSession, Object object) throws Exception
-    {
-        if (_logger.isDebugEnabled())
-        {
-            _logger.debug("Message sent: " + object);
-        }
-    }
-
-    protected boolean isSSLClient(ConnectorConfiguration connectionConfig, IoSession protocolSession)
-    {
-        InetSocketAddress addr = (InetSocketAddress) protocolSession.getLocalAddress();
-
-        return addr.getPort() == connectionConfig.sslPort;
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQPProtocolProvider.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQPProtocolProvider.java
deleted file mode 100644
index 07c153bfe8..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQPProtocolProvider.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.protocol;
-
-import org.apache.qpid.server.registry.ApplicationRegistry;
-import org.apache.qpid.server.registry.IApplicationRegistry;
-
-/**
- * The protocol provide's role is to encapsulate the initialisation of the protocol handler.
- *
- * The protocol handler (see AMQPFastProtocolHandler class) handles protocol events
- * such as connection closing or a frame being received. It can either do this directly
- * or pass off to the protocol session in the cases where state information is required to
- * deal with the event.
- *
- */
-public class AMQPProtocolProvider
-{
-    /**
-     * Handler for protocol events
-     */
-    private AMQPFastProtocolHandler _handler;
-
-    public AMQPProtocolProvider()
-    {
-        IApplicationRegistry registry = ApplicationRegistry.getInstance();
-        _handler = new AMQPFastProtocolHandler(registry);
-    }
-
-    public AMQPFastProtocolHandler getHandler()
-    {
-        return _handler;
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSession.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSession.java
deleted file mode 100644
index 390117acf6..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSession.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.protocol;
-
-import javax.security.sasl.SaslServer;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.AMQDataBlock;
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.framing.FieldTable;
-import org.apache.qpid.protocol.AMQVersionAwareProtocolSession;
-import org.apache.qpid.server.AMQChannel;
-import org.apache.qpid.server.output.ProtocolOutputConverter;
-import org.apache.qpid.server.virtualhost.VirtualHost;
-
-import java.security.Principal;
-
-
-public interface AMQProtocolSession extends AMQVersionAwareProtocolSession
-{
-
-    public static interface Task
-    {
-        public void doTask(AMQProtocolSession session) throws AMQException;
-    }
-
-    /**
-     * Called when a protocol data block is received
-     *
-     * @param message the data block that has been received
-     *
-     * @throws Exception if processing the datablock fails
-     */
-    void dataBlockReceived(AMQDataBlock message) throws Exception;
-
-    /**
-     * Get the context key associated with this session. Context key is described in the AMQ protocol specification (RFC
-     * 6).
-     *
-     * @return the context key
-     */
-    AMQShortString getContextKey();
-
-    /**
-     * Set the context key associated with this session. Context key is described in the AMQ protocol specification (RFC
-     * 6).
-     *
-     * @param contextKey the context key
-     */
-    void setContextKey(AMQShortString contextKey);
-
-    /**
-     * Get the channel for this session associated with the specified id. A channel id is unique per connection (i.e.
-     * per session).
-     *
-     * @param channelId the channel id which must be valid
-     *
-     * @return null if no channel exists, the channel otherwise
-     */
-    AMQChannel getChannel(int channelId) throws AMQException;
-
-    /**
-     * Associate a channel with this session.
-     *
-     * @param channel the channel to associate with this session. It is an error to associate the same channel with more
-     *                than one session but this is not validated.
-     */
-    void addChannel(AMQChannel channel) throws AMQException;
-
-    /**
-     * Close a specific channel. This will remove any resources used by the channel, including: <ul><li>any queue
-     * subscriptions (this may in turn remove queues if they are auto delete</li> </ul>
-     *
-     * @param channelId id of the channel to close
-     *
-     * @throws org.apache.qpid.AMQException if an error occurs closing the channel
-     * @throws IllegalArgumentException     if the channel id is not valid
-     */
-    void closeChannel(int channelId) throws AMQException;
-
-    /**
-     * Markes the specific channel as closed. This will release the lock for that channel id so a new channel can be
-     * created on that id.
-     *
-     * @param channelId id of the channel to close
-     */
-    void closeChannelOk(int channelId);
-
-    /**
-     * Check to see if this chanel is closing
-     *
-     * @param channelId id to check
-     * @return boolean with state of channel awaiting closure
-     */
-    boolean channelAwaitingClosure(int channelId);
-
-    /**
-     * Remove a channel from the session but do not close it.
-     *
-     * @param channelId
-     */
-    void removeChannel(int channelId);
-
-    /**
-     * Initialise heartbeats on the session.
-     *
-     * @param delay delay in seconds (not ms)
-     */
-    void initHeartbeats(int delay);
-
-    /** This must be called when the session is _closed in order to free up any resources managed by the session. */
-    void closeSession() throws AMQException;
-
-    /** @return a key that uniquely identifies this session */
-    Object getKey();
-
-    /**
-     * Get the fully qualified domain name of the local address to which this session is bound. Since some servers may
-     * be bound to multiple addresses this could vary depending on the acceptor this session was created from.
-     *
-     * @return a String FQDN
-     */
-    String getLocalFQDN();
-
-    /** @return the sasl server that can perform authentication for this session. */
-    SaslServer getSaslServer();
-
-    /**
-     * Set the sasl server that is to perform authentication for this session.
-     *
-     * @param saslServer
-     */
-    void setSaslServer(SaslServer saslServer);
-
-
-    FieldTable getClientProperties();
-
-    void setClientProperties(FieldTable clientProperties);
-
-    Object getClientIdentifier();
-
-    VirtualHost getVirtualHost();
-
-    void setVirtualHost(VirtualHost virtualHost) throws AMQException;
-
-    void addSessionCloseTask(Task task);
-
-    void removeSessionCloseTask(Task task);
-
-    public ProtocolOutputConverter getProtocolOutputConverter();
-
-    void setAuthorizedID(Principal authorizedID);
-
-    /** @return a Principal that was used to authorized this session */
-    Principal getAuthorizedID();
-
-}
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
deleted file mode 100644
index 66f928a70e..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBean.java
+++ /dev/null
@@ -1,305 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-/*
- *
- * Copyright (c) 2006 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package org.apache.qpid.server.protocol;
-
-import java.security.Principal;
-import java.util.Date;
-import java.util.List;
-
-import javax.management.JMException;
-import javax.management.MBeanException;
-import javax.management.MBeanNotificationInfo;
-import javax.management.NotCompliantMBeanException;
-import javax.management.Notification;
-import javax.management.monitor.MonitorNotification;
-import javax.management.openmbean.CompositeData;
-import javax.management.openmbean.CompositeDataSupport;
-import javax.management.openmbean.CompositeType;
-import javax.management.openmbean.OpenDataException;
-import javax.management.openmbean.OpenType;
-import javax.management.openmbean.SimpleType;
-import javax.management.openmbean.TabularData;
-import javax.management.openmbean.TabularDataSupport;
-import javax.management.openmbean.TabularType;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.AMQFrame;
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.framing.ConnectionCloseBody;
-import org.apache.qpid.protocol.AMQConstant;
-import org.apache.qpid.server.AMQChannel;
-import org.apache.qpid.server.management.AMQManagedObject;
-import org.apache.qpid.server.management.MBeanConstructor;
-import org.apache.qpid.server.management.MBeanDescription;
-import org.apache.qpid.server.management.ManagedObject;
-
-/**
- * This MBean class implements the management interface. In order to make more attributes, operations and notifications
- * available over JMX simply augment the ManagedConnection interface and add the appropriate implementation here.
- */
-@MBeanDescription("Management Bean for an AMQ Broker Connection")
-public class AMQProtocolSessionMBean extends AMQManagedObject implements ManagedConnection
-{
-    private AMQMinaProtocolSession _session = null;
-    private String _name = null;
-
-    // openmbean data types for representing the channel attributes
-    private static final String[] _channelAtttibuteNames =
-        { "Channel Id", "Transactional", "Default Queue", "Unacknowledged Message Count" };
-    private static final String[] _indexNames = { _channelAtttibuteNames[0] };
-    private static final OpenType[] _channelAttributeTypes =
-        { SimpleType.INTEGER, SimpleType.BOOLEAN, SimpleType.STRING, SimpleType.INTEGER };
-    private static CompositeType _channelType = null; // represents the data type for channel data
-    private static TabularType _channelsType = null; // Data type for list of channels type
-    private static final AMQShortString BROKER_MANAGEMENT_CONSOLE_HAS_CLOSED_THE_CONNECTION =
-        new AMQShortString("Broker Management Console has closed the connection.");
-
-    @MBeanConstructor("Creates an MBean exposing an AMQ Broker Connection")
-    public AMQProtocolSessionMBean(AMQMinaProtocolSession session) throws NotCompliantMBeanException, OpenDataException
-    {
-        super(ManagedConnection.class, ManagedConnection.TYPE);
-        _session = session;
-        String remote = getRemoteAddress();
-        remote = "anonymous".equals(remote) ? (remote + hashCode()) : remote;
-        _name = jmxEncode(new StringBuffer(remote), 0).toString();
-        init();
-    }
-
-    static
-    {
-        try
-        {
-            init();
-        }
-        catch (JMException ex)
-        {
-            // This is not expected to ever occur.
-            throw new RuntimeException("Got JMException in static initializer.", ex);
-        }
-    }
-
-    /**
-     * initialises the openmbean data types
-     */
-    private static void init() throws OpenDataException
-    {
-        _channelType =
-            new CompositeType("Channel", "Channel Details", _channelAtttibuteNames, _channelAtttibuteNames,
-                _channelAttributeTypes);
-        _channelsType = new TabularType("Channels", "Channels", _channelType, _indexNames);
-    }
-
-    public String getClientId()
-    {
-        return (_session.getContextKey() == null) ? null : _session.getContextKey().toString();
-    }
-
-    public String getAuthorizedId()
-    {
-        return (_session.getAuthorizedID() != null ) ? _session.getAuthorizedID().getName() : null;
-    }
-
-    public String getVersion()
-    {
-        return (_session.getClientVersion() == null) ? null : _session.getClientVersion().toString();
-    }
-
-    public Date getLastIoTime()
-    {
-        return new Date(_session.getIOSession().getLastIoTime());
-    }
-
-    public String getRemoteAddress()
-    {
-        return _session.getIOSession().getRemoteAddress().toString();
-    }
-
-    public ManagedObject getParentObject()
-    {
-        return _session.getVirtualHost().getManagedObject();
-    }
-
-    public Long getWrittenBytes()
-    {
-        return _session.getIOSession().getWrittenBytes();
-    }
-
-    public Long getReadBytes()
-    {
-        return _session.getIOSession().getReadBytes();
-    }
-
-    public Long getMaximumNumberOfChannels()
-    {
-        return _session.getMaximumNumberOfChannels();
-    }
-
-    public void setMaximumNumberOfChannels(Long value)
-    {
-        _session.setMaximumNumberOfChannels(value);
-    }
-
-    public String getObjectInstanceName()
-    {
-        return _name;
-    }
-
-    /**
-     * commits transactions for a transactional channel
-     *
-     * @param channelId
-     * @throws JMException if channel with given id doesn't exist or if commit fails
-     */
-    public void commitTransactions(int channelId) throws JMException
-    {
-        try
-        {
-            AMQChannel channel = _session.getChannel(channelId);
-            if (channel == null)
-            {
-                throw new JMException("The channel (channel Id = " + channelId + ") does not exist");
-            }
-
-            _session.commitTransactions(channel);
-        }
-        catch (AMQException ex)
-        {
-            throw new MBeanException(ex, ex.toString());
-        }
-    }
-
-    /**
-     * rollsback the transactions for a transactional channel
-     *
-     * @param channelId
-     * @throws JMException if channel with given id doesn't exist or if rollback fails
-     */
-    public void rollbackTransactions(int channelId) throws JMException
-    {
-        try
-        {
-            AMQChannel channel = _session.getChannel(channelId);
-            if (channel == null)
-            {
-                throw new JMException("The channel (channel Id = " + channelId + ") does not exist");
-            }
-
-            _session.rollbackTransactions(channel);
-        }
-        catch (AMQException ex)
-        {
-            throw new MBeanException(ex, ex.toString());
-        }
-    }
-
-    /**
-     * Creates the list of channels in tabular form from the _channelMap.
-     *
-     * @return list of channels in tabular form.
-     * @throws OpenDataException
-     */
-    public TabularData channels() throws OpenDataException
-    {
-        TabularDataSupport channelsList = new TabularDataSupport(_channelsType);
-        List<AMQChannel> list = _session.getChannels();
-
-        for (AMQChannel channel : list)
-        {
-            Object[] itemValues =
-                {
-                    channel.getChannelId(), channel.isTransactional(),
-                    (channel.getDefaultQueue() != null) ? channel.getDefaultQueue().getName().asString() : null,
-                    channel.getUnacknowledgedMessageMap().size()
-                };
-
-            CompositeData channelData = new CompositeDataSupport(_channelType, _channelAtttibuteNames, itemValues);
-            channelsList.put(channelData);
-        }
-
-        return channelsList;
-    }
-
-    /**
-     * closes the connection. The administrator can use this management operation to close connection to free up
-     * resources.
-     * @throws JMException
-     */
-    public void closeConnection() throws JMException
-    {
-        // AMQP version change: Hardwire the version to 0-8 (major=8, minor=0)
-        // TODO: Connect this to the session version obtained from ProtocolInitiation for this session.
-        // Be aware of possible changes to parameter order as versions change.
-        final AMQFrame response =
-            ConnectionCloseBody.createAMQFrame(0, _session.getProtocolMajorVersion(), _session.getProtocolMinorVersion(), // AMQP version (major, minor)
-                0, // classId
-                0, // methodId
-                AMQConstant.REPLY_SUCCESS.getCode(), // replyCode
-                BROKER_MANAGEMENT_CONSOLE_HAS_CLOSED_THE_CONNECTION // replyText
-            );
-        _session.writeFrame(response);
-
-        try
-        {
-            _session.closeSession();
-        }
-        catch (AMQException ex)
-        {
-            throw new MBeanException(ex, ex.toString());
-        }
-    }
-
-    @Override
-    public MBeanNotificationInfo[] getNotificationInfo()
-    {
-        String[] notificationTypes = new String[] { MonitorNotification.THRESHOLD_VALUE_EXCEEDED };
-        String name = MonitorNotification.class.getName();
-        String description = "Channel count has reached threshold value";
-        MBeanNotificationInfo info1 = new MBeanNotificationInfo(notificationTypes, name, description);
-
-        return new MBeanNotificationInfo[] { info1 };
-    }
-
-    public void notifyClients(String notificationMsg)
-    {
-        Notification n =
-            new Notification(MonitorNotification.THRESHOLD_VALUE_EXCEEDED, this, ++_notificationSequenceNumber,
-                System.currentTimeMillis(), notificationMsg);
-        _broadcaster.sendNotification(n);
-    }
-
-} // End of MBean class
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ExchangeInitialiser.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ExchangeInitialiser.java
deleted file mode 100644
index 29d55ce763..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ExchangeInitialiser.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.protocol;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.exchange.ExchangeDefaults;
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.server.exchange.ExchangeFactory;
-import org.apache.qpid.server.exchange.ExchangeRegistry;
-
-public class ExchangeInitialiser
-{
-    public void initialise(ExchangeFactory factory, ExchangeRegistry registry) throws AMQException{
-        define(registry, factory, ExchangeDefaults.DEFAULT_EXCHANGE_NAME, ExchangeDefaults.DIRECT_EXCHANGE_CLASS);
-        define(registry, factory, ExchangeDefaults.DIRECT_EXCHANGE_NAME, ExchangeDefaults.DIRECT_EXCHANGE_CLASS);
-        define(registry, factory, ExchangeDefaults.TOPIC_EXCHANGE_NAME, ExchangeDefaults.TOPIC_EXCHANGE_CLASS);
-        define(registry, factory, ExchangeDefaults.HEADERS_EXCHANGE_NAME, ExchangeDefaults.HEADERS_EXCHANGE_CLASS);
-        define(registry, factory, ExchangeDefaults.FANOUT_EXCHANGE_NAME, ExchangeDefaults.FANOUT_EXCHANGE_CLASS);
-
-        registry.setDefaultExchange(registry.getExchange(ExchangeDefaults.DEFAULT_EXCHANGE_NAME));
-    }
-
-    private void define(ExchangeRegistry r, ExchangeFactory f,
-                        AMQShortString name, AMQShortString type) throws AMQException
-    {
-        if(r.getExchange(name)== null)
-        {
-            r.registerExchange(f.createExchange(name, type, true, false, 0));
-        }
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/HeartbeatConfig.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/HeartbeatConfig.java
deleted file mode 100644
index 310deaaf55..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/HeartbeatConfig.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.protocol;
-
-import org.apache.qpid.configuration.Configured;
-import org.apache.qpid.server.registry.ApplicationRegistry;
-
-public class HeartbeatConfig
-{
-    @Configured(path = "heartbeat.delay", defaultValue = "5")    
-    public int delay = 5;//in secs
-    @Configured(path = "heartbeat.timeoutFactor", defaultValue = "2.0")
-    public double timeoutFactor = 2;
-
-    public double getTimeoutFactor()
-    {
-        return timeoutFactor;
-    }
-
-    public void setTimeoutFactor(double timeoutFactor)
-    {
-        this.timeoutFactor = timeoutFactor;
-    }
-
-    public int getDelay()
-    {
-        return delay;
-    }
-
-    public void setDelay(int delay)
-    {
-        this.delay = delay;
-    }
-
-    int getTimeout(int writeDelay)
-    {
-        return (int) (timeoutFactor * writeDelay);
-    }
-
-    public static HeartbeatConfig getInstance()
-    {
-        return ApplicationRegistry.getInstance().getConfiguredObject(HeartbeatConfig.class);
-    }
-
-    public String toString()
-    {
-        return "HeartBeatConfig{delay = " + delay + " timeoutFactor = " + timeoutFactor + "}";
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ManagedConnection.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ManagedConnection.java
deleted file mode 100644
index e6e713ac6d..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ManagedConnection.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-package org.apache.qpid.server.protocol;
-
-import java.io.IOException;
-import java.util.Date;
-import java.security.Principal;
-
-import javax.management.JMException;
-import javax.management.MBeanOperationInfo;
-import javax.management.openmbean.TabularData;
-
-import org.apache.qpid.server.management.MBeanAttribute;
-import org.apache.qpid.server.management.MBeanOperation;
-import org.apache.qpid.server.management.MBeanOperationParameter;
-
-/**
- * The management interface exposed to allow management of Connections.
- * @author   Bhupendra Bhardwaj
- * @version  0.1
- */
-public interface ManagedConnection
-{
-    static final String TYPE = "Connection";
-
-    @MBeanAttribute(name = "ClientId", description = "Client Id")
-    String getClientId();
-
-    @MBeanAttribute(name = "AuthorizedId", description = "User Name")
-    String getAuthorizedId();
-
-    @MBeanAttribute(name = "Version", description = "Client Version")
-    String getVersion();
-
-    /**
-     * Tells the remote address of this connection.
-     * @return  remote address
-     */
-    @MBeanAttribute(name="RemoteAddress", description=TYPE + " Address")
-    String getRemoteAddress();
-
-    /**
-     * Tells the last time, the IO operation was done.
-     * @return last IO time.
-     */
-    @MBeanAttribute(name="LastIOTime", description="The last time, the IO operation was done")
-    Date getLastIoTime();
-
-    /**
-     * Tells the total number of bytes written till now.
-     * @return number of bytes written.
-     *
-    @MBeanAttribute(name="WrittenBytes", description="The total number of bytes written till now")
-    Long getWrittenBytes();
-    */
-    /**
-     * Tells the total number of bytes read till now.
-     * @return number of bytes read.
-     *
-    @MBeanAttribute(name="ReadBytes", description="The total number of bytes read till now")
-    Long getReadBytes();
-    */
-
-    /**
-     * Threshold high value for no of channels.  This is useful in setting notifications or
-     * taking required action is there are more channels being created.
-     * @return threshold limit for no of channels
-     */
-    Long getMaximumNumberOfChannels();
-
-    /**
-     * Sets the threshold high value for number of channels for a connection
-     * @param value
-     */
-    @MBeanAttribute(name="MaximumNumberOfChannels", description="The threshold high value for number of channels for this connection")
-    void setMaximumNumberOfChannels(Long value);
-
-    //********** Operations *****************//
-
-    /**
-     * channel details of all the channels opened for this connection.
-     * @return general channel details
-     * @throws IOException
-     * @throws JMException
-     */
-    @MBeanOperation(name="channels", description="Channel details for this connection")
-    TabularData channels() throws IOException, JMException;
-
-    /**
-     * Commits the transactions if the channel is transactional.
-     * @param channelId
-     * @throws JMException
-     */
-    @MBeanOperation(name="commitTransaction",
-                    description="Commits the transactions for given channel Id, if the channel is transactional",
-                    impact= MBeanOperationInfo.ACTION)
-    void commitTransactions(@MBeanOperationParameter(name="channel Id", description="channel Id")int channelId) throws JMException;
-
-    /**
-     * Rollsback the transactions if the channel is transactional.
-     * @param channelId
-     * @throws JMException
-     */
-    @MBeanOperation(name="rollbackTransactions",
-                    description="Rollsback the transactions for given channel Id, if the channel is transactional",
-                    impact= MBeanOperationInfo.ACTION)
-    void rollbackTransactions(@MBeanOperationParameter(name="channel Id", description="channel Id")int channelId) throws JMException;
-
-    /**
-     * Closes all the related channels and unregisters this connection from managed objects.
-     */
-    @MBeanOperation(name="closeConnection",
-                    description="Closes this connection and all related channels",
-                    impact= MBeanOperationInfo.ACTION)
-    void closeConnection() throws Exception;
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/UnknnownMessageTypeException.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/UnknnownMessageTypeException.java
deleted file mode 100644
index d053884e69..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/UnknnownMessageTypeException.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*

- *

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- *

- *   http://www.apache.org/licenses/LICENSE-2.0

- *

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- *

- */

-package org.apache.qpid.server.protocol;

-

-import org.apache.qpid.AMQException;

-import org.apache.qpid.framing.AMQDataBlock;

-

-/**

- * UnknnownMessageTypeException represents a failure when Mina passes an unexpected frame type.

- *

- * <p/><table id="crc"><caption>CRC Card</caption>

- * <tr><th> Responsibilities <th> Collaborations

- * <tr><td> Represents failure to cast a frame to its expected type.

- * </table>

- *

- * @todo Not an AMQP exception as no status code.

- *

- * @todo Seems like this exception was created to handle an unsafe type cast that will never happen in practice. Would

- *       be better just to leave that as a ClassCastException. However, check the framing layer catches this error

- *       first.

- */

-public class UnknnownMessageTypeException extends AMQException

-{

-    public UnknnownMessageTypeException(AMQDataBlock message, Throwable cause)

-    {

-        super(null, "Unknown message type: " + message.getClass().getName() + ": " + message, cause);

-    }

-}

diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQMessage.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQMessage.java
deleted file mode 100644
index 7fa028df29..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQMessage.java
+++ /dev/null
@@ -1,1108 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.queue;
-
-import org.apache.log4j.Logger;
-import org.apache.mina.common.ByteBuffer;
-import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.AMQBody;
-import org.apache.qpid.framing.AMQDataBlock;
-import org.apache.qpid.framing.AMQFrame;
-import org.apache.qpid.framing.BasicContentHeaderProperties;
-import org.apache.qpid.framing.ContentHeaderBody;
-import org.apache.qpid.framing.abstraction.ContentChunk;
-import org.apache.qpid.framing.abstraction.MessagePublishInfo;
-import org.apache.qpid.framing.abstraction.ProtocolVersionMethodConverter;
-import org.apache.qpid.server.messageStore.StorableMessage;
-import org.apache.qpid.server.messageStore.StorableQueue;
-import org.apache.qpid.server.protocol.AMQProtocolSession;
-import org.apache.qpid.server.registry.ApplicationRegistry;
-import org.apache.qpid.server.store.MessageStore;
-import org.apache.qpid.server.store.StoreContext;
-import org.apache.qpid.server.txn.TransactionalContext;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicInteger;
-
-/**
- * Combines the information that make up a deliverable message into a more manageable form.
- */
-public class AMQMessage implements StorableMessage
-{
-    /** Used for debugging purposes. */
-    private static final Logger _log = Logger.getLogger(AMQMessage.class);
-
-    // The ordered list of queues into which this message is enqueued.    
-    private List<StorableQueue> _queues = new LinkedList<StorableQueue>();
-    // Indicates whether this message is staged
-    private boolean _isStaged = false;
-
-    /**
-     * Used in clustering
-     */
-    private Set<Object> _tokens;
-
-    /**
-     * Only use in clustering - //todo: should ideally be removed?
-     */
-    private AMQProtocolSession _publisher;
-
-    private final Long _messageId;
-
-    private final AtomicInteger _referenceCount = new AtomicInteger(1);
-
-    private AMQMessageHandle _messageHandle;
-
-    /** Holds the transactional context in which this message is being processed. */
-    // TODO: ideally this should be able to go into the transient message date - check this! (RG)
-    private TransactionalContext _txnContext;
-
-    /**
-     * Flag to indicate whether this message has been delivered to a consumer. Used in implementing return functionality
-     * for messages published with the 'immediate' flag.
-     */
-    private boolean _deliveredToConsumer;
-    /**
-     * We need to keep track of whether the message was 'immediate' as in extreme circumstances, when the
-     * checkDelieveredToConsumer is called, the message may already have been received and acknowledged, and the body
-     * removed from the store.
-     */
-
-    /** Flag to indicate that this message requires 'immediate' delivery. */
-    private boolean _immediate;
-
-    // private Subscription _takenBySubcription;
-    // private AtomicBoolean _taken = new AtomicBoolean(false);
-    private TransientMessageData _transientMessageData = new TransientMessageData();
-
-    //todo: this should be part of a messageOnQueue object
-    private Set<Subscription> _rejectedBy = null;
-
-    //todo: this should be part of a messageOnQueue object
-    private Map<AMQQueue, AtomicBoolean> _takenMap = new HashMap<AMQQueue, AtomicBoolean>();
-    //todo: this should be part of a messageOnQueue object
-    private Map<AMQQueue, Subscription> _takenBySubcriptionMap = new HashMap<AMQQueue, Subscription>();
-
-    private final int hashcode = System.identityHashCode(this);
-
-    //todo: this should be part of a messageOnQueue object
-    private long _expiration;
-
-    public String debugIdentity()
-    {
-        return "(HC:" + hashcode + " ID:" + _messageId + " Ref:" + _referenceCount.get() + ")";
-    }
-
-    public void setExpiration()
-    {
-        long expiration =
-                ((BasicContentHeaderProperties) _transientMessageData.getContentHeaderBody().properties).getExpiration();
-        long timestamp =
-                ((BasicContentHeaderProperties) _transientMessageData.getContentHeaderBody().properties).getTimestamp();
-
-        if (ApplicationRegistry.getInstance().getConfiguration().getBoolean("advanced.synced-clocks", false))
-        {
-            _expiration = expiration;
-        }
-        else
-        {
-            // Update TTL to be in broker time.
-            if (expiration != 0L)
-            {
-                if (timestamp != 0L)
-                {
-                    // todo perhaps use arrival time
-                    long diff = (System.currentTimeMillis() - timestamp);
-
-                    if ((diff > 1000L) || (diff < 1000L))
-                    {
-                        _expiration = expiration + diff;
-                    }
-                }
-            }
-        }
-
-    }
-
-    /**
-     * Used to iterate through all the body frames associated with this message. Will not keep all the data in memory
-     * therefore is memory-efficient.
-     */
-    private class BodyFrameIterator implements Iterator<AMQDataBlock>
-    {
-        private int _channel;
-
-        private int _index = -1;
-        private AMQProtocolSession _protocolSession;
-
-        private BodyFrameIterator(AMQProtocolSession protocolSession, int channel)
-        {
-            _channel = channel;
-            _protocolSession = protocolSession;
-        }
-
-        public boolean hasNext()
-        {
-            try
-            {
-                return _index < (_messageHandle.getBodyCount(getStoreContext(), _messageId) - 1);
-            }
-            catch (AMQException e)
-            {
-                _log.error("Unable to get body count: " + e, e);
-
-                return false;
-            }
-        }
-
-        public AMQDataBlock next()
-        {
-            try
-            {
-
-                AMQBody cb =
-                        getProtocolVersionMethodConverter().convertToBody(_messageHandle.getContentChunk(getStoreContext(),
-                                                                                                         _messageId, ++_index));
-
-                return new AMQFrame(_channel, cb);
-            }
-            catch (AMQException e)
-            {
-                // have no choice but to throw a runtime exception
-                throw new RuntimeException("Error getting content body: " + e, e);
-            }
-
-        }
-
-        private ProtocolVersionMethodConverter getProtocolVersionMethodConverter()
-        {
-            return _protocolSession.getRegistry().getProtocolVersionMethodConverter();
-        }
-
-        public void remove()
-        {
-            throw new UnsupportedOperationException();
-        }
-    }
-
-    public StoreContext getStoreContext()
-    {
-        return _txnContext.getStoreContext();
-    }
-
-    private class BodyContentIterator implements Iterator<ContentChunk>
-    {
-
-        private int _index = -1;
-
-        public boolean hasNext()
-        {
-            try
-            {
-                return _index < (_messageHandle.getBodyCount(getStoreContext(), _messageId) - 1);
-            }
-            catch (AMQException e)
-            {
-                _log.error("Error getting body count: " + e, e);
-
-                return false;
-            }
-        }
-
-        public ContentChunk next()
-        {
-            try
-            {
-                return _messageHandle.getContentChunk(getStoreContext(), _messageId, ++_index);
-            }
-            catch (AMQException e)
-            {
-                throw new RuntimeException("Error getting content body: " + e, e);
-            }
-        }
-
-        public void remove()
-        {
-            throw new UnsupportedOperationException();
-        }
-    }
-
-    public AMQMessage(Long messageId, MessagePublishInfo info, TransactionalContext txnContext)
-    {
-        _messageId = messageId;
-        _txnContext = txnContext;
-        _immediate = info.isImmediate();
-        _transientMessageData.setMessagePublishInfo(info);
-
-    }
-
-    /**
-     * Used when recovering, i.e. when the message store is creating references to messages. In that case, the normal
-     * enqueue/routingComplete is not done since the recovery process is responsible for routing the messages to
-     * queues.
-     *
-     * @param messageId
-     * @param store
-     * @param factory
-     *
-     * @throws AMQException
-     */
-    public AMQMessage(Long messageId, MessageStore store, MessageHandleFactory factory, TransactionalContext txnConext)
-            throws AMQException
-    {
-        _messageId = messageId;
-        _messageHandle = factory.createMessageHandle(store, this, true);
-        _txnContext = txnConext;
-        _transientMessageData = null;
-    }
-
-    /**
-     * Used in testing only. This allows the passing of the content header immediately on construction.
-     *
-     * @param messageId
-     * @param info
-     * @param txnContext
-     * @param contentHeader
-     */
-    public AMQMessage(Long messageId, MessagePublishInfo info, TransactionalContext txnContext,
-                      ContentHeaderBody contentHeader) throws AMQException
-    {
-        this(messageId, info, txnContext);
-        setContentHeaderBody(contentHeader);
-    }
-
-    /**
-     * Used in testing only. This allows the passing of the content header and some body fragments on construction.
-     *
-     * @param messageId
-     * @param info
-     * @param txnContext
-     * @param contentHeader
-     * @param destinationQueues
-     * @param contentBodies
-     *
-     * @throws AMQException
-     */
-    public AMQMessage(Long messageId, MessagePublishInfo info, TransactionalContext txnContext,
-                      ContentHeaderBody contentHeader, List<AMQQueue> destinationQueues, List<ContentChunk> contentBodies,
-                      MessageStore messageStore, StoreContext storeContext, MessageHandleFactory messageHandleFactory) throws AMQException
-    {
-        this(messageId, info, txnContext, contentHeader);
-        _transientMessageData.setDestinationQueues(destinationQueues);
-        routingComplete(messageStore, storeContext, messageHandleFactory);
-        for (ContentChunk cb : contentBodies)
-        {
-            addContentBodyFrame(storeContext, cb);
-        }
-    }
-
-    protected AMQMessage(AMQMessage msg) throws AMQException
-    {
-        _messageId = msg._messageId;
-        _messageHandle = msg._messageHandle;
-        _txnContext = msg._txnContext;
-        _deliveredToConsumer = msg._deliveredToConsumer;
-        _transientMessageData = msg._transientMessageData;
-    }
-
-    // ========================================================================
-    // Interface  StorableMessage
-    // ========================================================================
-
-    public long getMessageId()
-    {
-        return _messageId;
-    }
-
-    public byte[] getHeaderBody()
-    {
-        byte[] result = null;
-        ContentHeaderBody headerBody;
-        ByteBuffer bufferedResult;
-        try
-        {
-            headerBody = _messageHandle.getContentHeaderBody(_txnContext.getStoreContext(), _messageId);
-            result = new byte[headerBody.getSize()];
-            bufferedResult = ByteBuffer.wrap(result);
-            headerBody.writePayload(bufferedResult);
-        }
-        catch (AMQException e)
-        {
-            _log.error("Error when getting message header", e);
-        }
-
-        return result;
-    }
-
-    public int getHeaderSize()
-    {
-        int result = 0;
-        try
-        {
-            result = _messageHandle.getContentHeaderBody(_txnContext.getStoreContext(), _messageId).getSize();
-        }
-        catch (AMQException e)
-        {
-            _log.error("Error when getting message header size", e);
-        }
-
-        return result;
-    }
-
-    public byte[] getData()
-    {
-        return _messageHandle.getMessagePayload();
-    }
-
-    public int getPayloadSize()
-    {
-        return _messageHandle.getMessagePayload().length;
-    }
-
-    public boolean isEnqueued()
-    {
-        return _queues.size() > 0;
-    }
-
-    public void enqueue(StorableQueue queue)
-    {
-        _queues.add(queue);
-        if (_log.isDebugEnabled())
-        {
-            _log.debug("enqueued");
-        }
-    }
-
-    public void dequeue(StorableQueue queue)
-    {
-        _queues.remove(queue);
-        if (_log.isDebugEnabled())
-        {
-            _log.debug("dequeued");
-        }
-    }
-
-    public int getQueuePosition(StorableQueue queue)
-    {
-        if (_log.isDebugEnabled())
-        {
-            _log.debug("The queue position is " + _queues.indexOf(queue));
-        }
-
-        return _queues.indexOf(queue);
-    }
-
-    public boolean isStaged()
-    {
-        return _isStaged;
-    }
-
-    public void staged()
-    {
-        _isStaged = true;
-    }
-
-    public Iterator<AMQDataBlock> getBodyFrameIterator(AMQProtocolSession protocolSession, int channel)
-    {
-        return new BodyFrameIterator(protocolSession, channel);
-    }
-
-    public Iterator<ContentChunk> getContentBodyIterator()
-    {
-        return new BodyContentIterator();
-    }
-
-    public ContentHeaderBody getContentHeaderBody() throws AMQException
-    {
-        if (_transientMessageData != null)
-        {
-            return _transientMessageData.getContentHeaderBody();
-        }
-        else
-        {
-            return _messageHandle.getContentHeaderBody(getStoreContext(), _messageId);
-        }
-    }
-
-    public void setContentHeaderBody(ContentHeaderBody contentHeaderBody) throws AMQException
-    {
-        _transientMessageData.setContentHeaderBody(contentHeaderBody);
-    }
-
-    public void routingComplete(MessageStore store, StoreContext storeContext, MessageHandleFactory factory)
-            throws AMQException
-    {
-        final boolean persistent = isPersistent();
-        _messageHandle = factory.createMessageHandle(store, this, persistent);
-        if (persistent)  //DTX was removed
-        {
-            _txnContext.beginTranIfNecessary();
-        }
-
-        // enqueuing the messages ensure that if required the destinations are recorded to a
-        // persistent store
-
-        //DTX was removed
-        for (AMQQueue q : _transientMessageData.getDestinationQueues())
-        {
-            _messageHandle.enqueue(storeContext, _messageId, q);
-        }
-
-        if (_transientMessageData.getContentHeaderBody().bodySize == 0)
-        {
-            deliver(storeContext);
-        }
-    }
-
-    public boolean addContentBodyFrame(StoreContext storeContext, ContentChunk contentChunk) throws AMQException
-    {
-        _transientMessageData.addBodyLength(contentChunk.getSize());
-        final boolean allContentReceived = isAllContentReceived();
-        _messageHandle.addContentBodyFrame(storeContext, _messageId, contentChunk, allContentReceived);
-        if (allContentReceived)
-        {
-            deliver(storeContext);
-
-            return true;
-        }
-        else
-        {
-            return false;
-        }
-    }
-
-    public boolean isAllContentReceived() throws AMQException
-    {
-        return _transientMessageData.isAllContentReceived();
-    }
-
-    /**
-     * Creates a long-lived reference to this message, and increments the count of such references, as an atomic
-     * operation.
-     */
-    public AMQMessage takeReference()
-    {
-        incrementReference(); // _referenceCount.incrementAndGet();
-
-        return this;
-    }
-
-
-    /**
-     * Threadsafe. Increment the reference count on the message.
-     */
-    protected void incrementReference()
-    {
-        _referenceCount.incrementAndGet();
-        // if (_log.isDebugEnabled())
-        // {
-        // _log.debug("Ref count on message " + debugIdentity() + " incremented " + Arrays.asList(Thread.currentThread().getStackTrace()).subList(3, 6));
-        // }
-    }
-
-    /**
-     * Threadsafe. This will decrement the reference count and when it reaches zero will remove the message from the
-     * message store.
-     *
-     * @param storeContext
-     *
-     * @throws MessageCleanupException when an attempt was made to remove the message from the message store and that
-     *                                 failed
-     */
-    public void decrementReference(StoreContext storeContext) throws MessageCleanupException
-    {
-        int count = _referenceCount.decrementAndGet();
-
-        // note that the operation of decrementing the reference count and then removing the message does not
-        // have to be atomic since the ref count starts at 1 and the exchange itself decrements that after
-        // the message has been passed to all queues. i.e. we are
-        // not relying on the all the increments having taken place before the delivery manager decrements.
-        if (count == 0)
-        {
-            try
-            {
-                // if (_log.isDebugEnabled())
-                // {
-                // _log.debug("Decremented ref count on message " + debugIdentity() + " is zero; removing message" + Arrays.asList(Thread.currentThread().getStackTrace()).subList(3, 6));
-                // }
-
-                // must check if the handle is null since there may be cases where we decide to throw away a message
-                // and the handle has not yet been constructed
-                if (_messageHandle != null)
-                {
-                    _messageHandle.removeMessage(storeContext, _messageId);
-                }
-            }
-            catch (AMQException e)
-            {
-                // to maintain consistency, we revert the count
-                incrementReference();
-                throw new MessageCleanupException("Failed to cleanup message with id " + _messageId, e);
-            }
-        }
-        else
-        {
-            if (count < 0)
-            {
-                throw new MessageCleanupException("Reference count for message id " + debugIdentity() + " has gone below 0.",
-                                                  null);
-            }
-        }
-    }
-
-    public void setPublisher(AMQProtocolSession publisher)
-    {
-        _publisher = publisher;
-    }
-
-    public AMQProtocolSession getPublisher()
-    {
-        return _publisher;
-    }
-
-    /**
-     * Called selectors to determin if the message has already been sent
-     *
-     * @return _deliveredToConsumer
-     */
-    public boolean getDeliveredToConsumer()
-    {
-        return _deliveredToConsumer;
-    }
-
-    public boolean isTaken(AMQQueue queue)
-    {
-        // return _taken.get();
-
-        synchronized (this)
-        {
-            AtomicBoolean taken = _takenMap.get(queue);
-            if (taken == null)
-            {
-                taken = new AtomicBoolean(false);
-                _takenMap.put(queue, taken);
-            }
-
-            return taken.get();
-        }
-    }
-
-    public boolean taken(AMQQueue queue, Subscription sub)
-    {
-        // if (_taken.getAndSet(true))
-        // {
-        // return true;
-        // }
-        // else
-        // {
-        // _takenBySubcription = sub;
-        // return false;
-        // }
-
-        synchronized (this)
-        {
-            AtomicBoolean taken = _takenMap.get(queue);
-            if (taken == null)
-            {
-                taken = new AtomicBoolean(false);
-            }
-
-            if (taken.getAndSet(true))
-            {
-                return true;
-            }
-            else
-            {
-                _takenMap.put(queue, taken);
-                _takenBySubcriptionMap.put(queue, sub);
-
-                return false;
-            }
-        }
-    }
-
-    public void release(AMQQueue queue)
-    {
-        if (_log.isTraceEnabled())
-        {
-            _log.trace("Releasing Message:" + debugIdentity());
-        }
-
-        // _taken.set(false);
-        // _takenBySubcription = null;
-
-        synchronized (this)
-        {
-            AtomicBoolean taken = _takenMap.get(queue);
-            if (taken == null)
-            {
-                taken = new AtomicBoolean(false);
-            }
-            else
-            {
-                taken.set(false);
-            }
-
-            _takenMap.put(queue, taken);
-            _takenBySubcriptionMap.put(queue, null);
-        }
-    }
-
-    public boolean checkToken(Object token)
-    {
-
-        if (_tokens == null)
-        {
-            _tokens = new HashSet<Object>();
-        }
-
-        if (_tokens.contains(token))
-        {
-            return true;
-        }
-        else
-        {
-            _tokens.add(token);
-
-            return false;
-        }
-    }
-
-    /**
-     * Registers a queue to which this message is to be delivered. This is called from the exchange when it is routing
-     * the message. This will be called before any content bodies have been received so that the choice of
-     * AMQMessageHandle implementation can be picked based on various criteria.
-     *
-     * @param queue the queue
-     *
-     * @throws org.apache.qpid.AMQException if there is an error enqueuing the message
-     */
-    public void enqueue(AMQQueue queue) throws AMQException
-    {
-        _transientMessageData.addDestinationQueue(queue);
-    }
-
-    public void dequeue(StoreContext storeContext, AMQQueue queue) throws AMQException
-    {
-        _messageHandle.dequeue(storeContext, _messageId, queue);
-    }
-
-    public boolean isPersistent() throws AMQException
-    {
-        if (_transientMessageData != null)
-        {
-            return _transientMessageData.isPersistent();
-        }
-        else
-        {
-            return _messageHandle.isPersistent(getStoreContext(), _messageId);
-        }
-    }
-
-    /**
-     * Called to enforce the 'immediate' flag.
-     *
-     * @throws NoConsumersException if the message is marked for immediate delivery but has not been marked as delivered
-     *                              to a consumer
-     */
-    public void checkDeliveredToConsumer() throws NoConsumersException
-    {
-
-        if (_immediate && !_deliveredToConsumer)
-        {
-            throw new NoConsumersException(this, null);
-        }
-    }
-
-    public MessagePublishInfo getMessagePublishInfo() throws AMQException
-    {
-        MessagePublishInfo pb;
-        if (_transientMessageData != null)
-        {
-            pb = _transientMessageData.getMessagePublishInfo();
-        }
-        else
-        {
-            pb = _messageHandle.getMessagePublishInfo(getStoreContext(), _messageId);
-        }
-
-        return pb;
-    }
-
-    public boolean isRedelivered()
-    {
-        return _messageHandle.isRedelivered();
-    }
-
-    public void setRedelivered(boolean redelivered)
-    {
-        _messageHandle.setRedelivered(redelivered);
-    }
-
-    public long getArrivalTime()
-    {
-        return _messageHandle.getArrivalTime();
-    }
-
-    /**
-     * Checks to see if the message has expired. If it has the message is dequeued.
-     *
-     * @param queue The queue to check the expiration against. (Currently not used)
-     *
-     * @return true if the message has expire
-     *
-     * @throws AMQException
-     */
-    public boolean expired(AMQQueue queue) throws AMQException
-    {
-        // note: If the storecontext isn't need then we can remove the getChannel() from Subscription.
-
-        if (_expiration != 0L)
-        {
-            long now = System.currentTimeMillis();
-
-            return (now > _expiration);
-        }
-
-        return false;
-    }
-
-    /** Called when this message is delivered to a consumer. (used to implement the 'immediate' flag functionality). */
-    public void setDeliveredToConsumer()
-    {
-        _deliveredToConsumer = true;
-    }
-
-    private void deliver(StoreContext storeContext) throws AMQException
-    {
-        // we get a reference to the destination queues now so that we can clear the
-        // transient message data as quickly as possible
-        List<AMQQueue> destinationQueues = _transientMessageData.getDestinationQueues();
-        if (_log.isDebugEnabled())
-        {
-            _log.debug("Delivering message " + debugIdentity() + " to " + destinationQueues);
-        }
-
-        try
-        {
-            // first we allow the handle to know that the message has been fully received. This is useful if it is
-            // maintaining any calculated values based on content chunks
-            _messageHandle.setPublishAndContentHeaderBody(storeContext, _messageId,
-                                                          _transientMessageData.getMessagePublishInfo(), _transientMessageData.getContentHeaderBody());
-
-            // we then allow the transactional context to do something with the message content
-            // now that it has all been received, before we attempt delivery
-            _txnContext.messageFullyReceived(isPersistent());
-
-            _transientMessageData = null;
-
-            for (AMQQueue q : destinationQueues)
-            {
-                // Increment the references to this message for each queue delivery.
-                incrementReference();
-                // normal deliver so add this message at the end.
-                _txnContext.deliver(this, q, false);
-            }
-        }
-        finally
-        {
-            destinationQueues.clear();
-            // Remove refence for routing process . Reference count should now == delivered queue count
-            decrementReference(storeContext);
-        }
-    }
-
-    /*
-        public void writeDeliver(AMQProtocolSession protocolSession, int channelId, long deliveryTag, AMQShortString consumerTag)
-                throws AMQException
-        {
-            ByteBuffer deliver = createEncodedDeliverFrame(protocolSession, channelId, deliveryTag, consumerTag);
-            AMQDataBlock contentHeader = ContentHeaderBody.createAMQFrame(channelId,
-                                                                          getContentHeaderBody());
-
-            final int bodyCount = _messageHandle.getBodyCount(getStoreContext(), _messageId);
-            if (bodyCount == 0)
-            {
-                SmallCompositeAMQDataBlock compositeBlock = new SmallCompositeAMQDataBlock(deliver,
-                                                                                           contentHeader);
-
-                protocolSession.writeFrame(compositeBlock);
-            }
-            else
-            {
-
-                //
-                // Optimise the case where we have a single content body. In that case we create a composite block
-                // so that we can writeDeliver out the deliver, header and body with a single network writeDeliver.
-                //
-                ContentChunk cb = _messageHandle.getContentChunk(getStoreContext(), _messageId, 0);
-
-                AMQDataBlock firstContentBody = new AMQFrame(channelId, protocolSession.getRegistry().getProtocolVersionMethodConverter().convertToBody(cb));
-                AMQDataBlock[] headerAndFirstContent = new AMQDataBlock[]{contentHeader, firstContentBody};
-                CompositeAMQDataBlock compositeBlock = new CompositeAMQDataBlock(deliver, headerAndFirstContent);
-                protocolSession.writeFrame(compositeBlock);
-
-                //
-                // Now start writing out the other content bodies
-                //
-                for (int i = 1; i < bodyCount; i++)
-                {
-                    cb = _messageHandle.getContentChunk(getStoreContext(), _messageId, i);
-                    protocolSession.writeFrame(new AMQFrame(channelId, protocolSession.getRegistry().getProtocolVersionMethodConverter().convertToBody(cb)));
-                }
-
-
-            }
-
-
-        }
-
-        public void writeGetOk(AMQProtocolSession protocolSession, int channelId, long deliveryTag, int queueSize) throws AMQException
-        {
-            ByteBuffer deliver = createEncodedGetOkFrame(protocolSession, channelId, deliveryTag, queueSize);
-            AMQDataBlock contentHeader = ContentHeaderBody.createAMQFrame(channelId,
-                                                                          getContentHeaderBody());
-
-            final int bodyCount = _messageHandle.getBodyCount(getStoreContext(), _messageId);
-            if (bodyCount == 0)
-            {
-                SmallCompositeAMQDataBlock compositeBlock = new SmallCompositeAMQDataBlock(deliver,
-                                                                                           contentHeader);
-                protocolSession.writeFrame(compositeBlock);
-            }
-            else
-            {
-
-                //
-                // Optimise the case where we have a single content body. In that case we create a composite block
-                // so that we can writeDeliver out the deliver, header and body with a single network writeDeliver.
-                //
-                ContentChunk cb = _messageHandle.getContentChunk(getStoreContext(), _messageId, 0);
-
-                AMQDataBlock firstContentBody = new AMQFrame(channelId, protocolSession.getRegistry().getProtocolVersionMethodConverter().convertToBody(cb));
-                AMQDataBlock[] headerAndFirstContent = new AMQDataBlock[]{contentHeader, firstContentBody};
-                CompositeAMQDataBlock compositeBlock = new CompositeAMQDataBlock(deliver, headerAndFirstContent);
-                protocolSession.writeFrame(compositeBlock);
-
-                //
-                // Now start writing out the other content bodies
-                //
-                for (int i = 1; i < bodyCount; i++)
-                {
-                    cb = _messageHandle.getContentChunk(getStoreContext(), _messageId, i);
-                    protocolSession.writeFrame(new AMQFrame(channelId, protocolSession.getRegistry().getProtocolVersionMethodConverter().convertToBody(cb)));
-                }
-
-
-            }
-
-
-        }
-
-
-        private ByteBuffer createEncodedDeliverFrame(AMQProtocolSession protocolSession, int channelId, long deliveryTag, AMQShortString consumerTag)
-                throws AMQException
-        {
-            MessagePublishInfo pb = getMessagePublishInfo();
-            AMQFrame deliverFrame = BasicDeliverBody.createAMQFrame(channelId, protocolSession.getProtocolMajorVersion(), (byte) 0, consumerTag,
-                                                                    deliveryTag, pb.getExchange(), _messageHandle.isRedelivered(),
-                                                                    pb.getRoutingKey());
-            ByteBuffer buf = ByteBuffer.allocate((int) deliverFrame.getSize()); // XXX: Could cast be a problem?
-            deliverFrame.writePayload(buf);
-            buf.flip();
-            return buf;
-        }
-
-        private ByteBuffer createEncodedGetOkFrame(AMQProtocolSession protocolSession, int channelId, long deliveryTag, int queueSize)
-                throws AMQException
-        {
-            MessagePublishInfo pb = getMessagePublishInfo();
-            AMQFrame getOkFrame = BasicGetOkBody.createAMQFrame(channelId,
-                                                                protocolSession.getProtocolMajorVersion(),
-                                                                protocolSession.getProtocolMinorVersion(),
-                                                                deliveryTag, pb.getExchange(),
-                                                                queueSize,
-                                                                _messageHandle.isRedelivered(),
-                                                                pb.getRoutingKey());
-            ByteBuffer buf = ByteBuffer.allocate((int) getOkFrame.getSize()); // XXX: Could cast be a problem?
-            getOkFrame.writePayload(buf);
-            buf.flip();
-            return buf;
-        }
-
-        private ByteBuffer createEncodedReturnFrame(AMQProtocolSession protocolSession, int channelId, int replyCode, AMQShortString replyText) throws AMQException
-        {
-            AMQFrame returnFrame = BasicReturnBody.createAMQFrame(channelId,
-                                                                  protocolSession.getProtocolMajorVersion(),
-                                                                  protocolSession.getProtocolMinorVersion(),
-                                                                  getMessagePublishInfo().getExchange(),
-                                                                  replyCode, replyText,
-                                                                  getMessagePublishInfo().getRoutingKey());
-            ByteBuffer buf = ByteBuffer.allocate((int) returnFrame.getSize()); // XXX: Could cast be a problem?
-            returnFrame.writePayload(buf);
-            buf.flip();
-            return buf;
-        }
-
-        public void writeReturn(AMQProtocolSession protocolSession, int channelId, int replyCode, AMQShortString replyText)
-                throws AMQException
-        {
-            ByteBuffer returnFrame = createEncodedReturnFrame(protocolSession, channelId, replyCode, replyText);
-
-            AMQDataBlock contentHeader = ContentHeaderBody.createAMQFrame(channelId,
-                                                                          getContentHeaderBody());
-
-            Iterator<AMQDataBlock> bodyFrameIterator = getBodyFrameIterator(protocolSession, channelId);
-            //
-            // Optimise the case where we have a single content body. In that case we create a composite block
-            // so that we can writeDeliver out the deliver, header and body with a single network writeDeliver.
-            //
-            if (bodyFrameIterator.hasNext())
-            {
-                AMQDataBlock firstContentBody = bodyFrameIterator.next();
-                AMQDataBlock[] headerAndFirstContent = new AMQDataBlock[]{contentHeader, firstContentBody};
-                CompositeAMQDataBlock compositeBlock = new CompositeAMQDataBlock(returnFrame, headerAndFirstContent);
-                protocolSession.writeFrame(compositeBlock);
-            }
-            else
-            {
-                CompositeAMQDataBlock compositeBlock = new CompositeAMQDataBlock(returnFrame,
-                                                                                 new AMQDataBlock[]{contentHeader});
-                protocolSession.writeFrame(compositeBlock);
-            }
-
-            //
-            // Now start writing out the other content bodies
-            // TODO: MINA needs to be fixed so the the pending writes buffer is not unbounded
-            //
-            while (bodyFrameIterator.hasNext())
-            {
-                protocolSession.writeFrame(bodyFrameIterator.next());
-            }
-        }
-     */
-
-    public AMQMessageHandle getMessageHandle()
-    {
-        return _messageHandle;
-    }
-
-    public long getSize()
-    {
-        try
-        {
-            long size = getContentHeaderBody().bodySize;
-
-            return size;
-        }
-        catch (AMQException e)
-        {
-            _log.error(e.toString(), e);
-
-            return 0;
-        }
-
-    }
-
-    public void restoreTransientMessageData() throws AMQException
-    {
-        TransientMessageData transientMessageData = new TransientMessageData();
-        transientMessageData.setMessagePublishInfo(getMessagePublishInfo());
-        transientMessageData.setContentHeaderBody(getContentHeaderBody());
-        transientMessageData.addBodyLength(getContentHeaderBody().getSize());
-        _transientMessageData = transientMessageData;
-    }
-
-    public void clearTransientMessageData()
-    {
-        _transientMessageData = null;
-    }
-
-    public String toString()
-    {
-        // return "Message[" + debugIdentity() + "]: " + _messageId + "; ref count: " + _referenceCount + "; taken : " +
-        // _taken + " by :" + _takenBySubcription;
-
-        return "Message[" + debugIdentity() + "]: " + _messageId + "; ref count: " + _referenceCount + "; taken for queues: "
-               + _takenMap.toString() + " by Subs:" + _takenBySubcriptionMap.toString();
-    }
-
-    public Subscription getDeliveredSubscription(AMQQueue queue)
-    {
-        // return _takenBySubcription;
-        synchronized (this)
-        {
-            return _takenBySubcriptionMap.get(queue);
-        }
-    }
-
-    public void reject(Subscription subscription)
-    {
-
-        if (subscription != null)
-        {
-            if (_rejectedBy == null)
-            {
-                _rejectedBy = new HashSet<Subscription>();
-            }
-
-            _rejectedBy.add(subscription);
-        }
-        else
-        {
-            _log.warn("Requesting rejection by null subscriber:" + debugIdentity());
-        }
-    }
-
-    public boolean isRejectedBy(Subscription subscription)
-    {
-        boolean rejected = _rejectedBy != null;
-
-        if (rejected) // We have subscriptions that rejected this message
-        {
-            return _rejectedBy.contains(subscription);
-        }
-        else // This messasge hasn't been rejected yet.
-        {
-            return rejected;
-        }
-    }
-
-    public String getBodyAsString()
-    {
-        StringBuilder b = new StringBuilder();
-        for (Iterator<ContentChunk> it = getContentBodyIterator(); it.hasNext(); )
-        {
-            ByteBuffer buf = it.next().getData();
-            byte[] bytes = new byte[buf.remaining()];
-            buf.duplicate().get(bytes);
-            b.append(new String(bytes));
-        }
-        return b.toString();
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQMessageHandle.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQMessageHandle.java
deleted file mode 100644
index 296e61bfa9..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQMessageHandle.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.queue;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.ContentHeaderBody;
-import org.apache.qpid.server.store.StoreContext;
-import org.apache.qpid.framing.abstraction.ContentChunk;
-import org.apache.qpid.framing.abstraction.MessagePublishInfo;
-
-/**
- * A pluggable way of getting message data. Implementations can provide intelligent caching for example or
- * even no caching at all to minimise the broker memory footprint.
- *
- * The method all take a messageId to avoid having to store it in the instance - the AMQMessage container
- * must already keen the messageId so it is pointless storing it twice.
- */
-public interface AMQMessageHandle
-{
-    ContentHeaderBody getContentHeaderBody(StoreContext context, Long messageId) throws AMQException;
-
-    /**
-     * @return the number of body frames associated with this message
-     */
-    int getBodyCount(StoreContext context, Long messageId) throws AMQException;
-
-    /**
-     * @return the size of the body
-     */
-    long getBodySize(StoreContext context, Long messageId) throws AMQException;
-
-    /**
-     * Get a particular content body
-     * @param index the index of the body to retrieve, must be between 0 and getBodyCount() - 1
-     * @return a content body
-     * @throws IllegalArgumentException if the index is invalid
-     */
-    ContentChunk getContentChunk(StoreContext context, Long messageId, int index) throws IllegalArgumentException, AMQException;
-
-    void addContentBodyFrame(StoreContext storeContext, Long messageId, ContentChunk contentBody, boolean isLastContentBody) throws AMQException;
-
-    MessagePublishInfo getMessagePublishInfo(StoreContext context, Long messageId) throws AMQException;
-
-    boolean isRedelivered();
-
-    void setRedelivered(boolean redelivered);
-
-    boolean isPersistent(StoreContext context, Long messageId) throws AMQException;
-
-    void setPublishAndContentHeaderBody(StoreContext storeContext, Long messageId, MessagePublishInfo messagePublishInfo,
-                                        ContentHeaderBody contentHeaderBody)
-            throws AMQException;
-
-    void removeMessage(StoreContext storeContext, Long messageId) throws AMQException;
-
-    void enqueue(StoreContext storeContext, Long messageId, AMQQueue queue) throws AMQException;
-
-    void dequeue(StoreContext storeContext, Long messageId, AMQQueue queue) throws AMQException;
-
-    long getArrivalTime();
-
-    // added by Arnaud
-    byte[] getMessagePayload();
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueue.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueue.java
deleted file mode 100644
index b4a92b3483..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueue.java
+++ /dev/null
@@ -1,1052 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.queue;
-
-import org.apache.log4j.Logger;
-import org.apache.qpid.AMQException;
-import org.apache.qpid.configuration.Configured;
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.framing.FieldTable;
-import org.apache.qpid.server.AMQChannel;
-import org.apache.qpid.server.exchange.Exchange;
-import org.apache.qpid.server.management.Managable;
-import org.apache.qpid.server.management.ManagedObject;
-import org.apache.qpid.server.messageStore.StorableMessage;
-import org.apache.qpid.server.messageStore.StorableQueue;
-import org.apache.qpid.server.protocol.AMQProtocolSession;
-import org.apache.qpid.server.store.MessageStore;
-import org.apache.qpid.server.store.StoreContext;
-import org.apache.qpid.server.virtualhost.VirtualHost;
-
-import javax.management.JMException;
-import java.text.MessageFormat;
-import java.util.Collection;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.concurrent.Executor;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicLong;
-
-/**
- * This is an AMQ Queue, and should not be confused with a JMS queue or any other abstraction like that. It is described
- * fully in RFC 006.
- */
-public class AMQQueue implements Managable, Comparable, StorableQueue
-{
-    //FROM M2 - think these have been replaced by *Exception in the broker exception package
-//    /**
-//     * ExistingExclusiveSubscription signals a failure to create a subscription, because an exclusive subscription
-//     * already exists.
-//     *
-//     * <p/><table id="crc"><caption>CRC Card</caption>
-//     * <tr><th> Responsibilities <th> Collaborations
-//     * <tr><td> Represent failure to create a subscription, because an exclusive subscription already exists.
-//     * </table>
-//     *
-//     * @todo Not an AMQP exception as no status code.
-//     *
-//     * @todo Move to top level, used outside this class.
-//     */
-//    public static final class ExistingExclusiveSubscription extends AMQException
-//    {
-//
-//        public ExistingExclusiveSubscription()
-//        {
-//            super("");
-//        }
-//    }
-//
-//    /**
-//     * ExistingSubscriptionPreventsExclusive signals a failure to create an exclusize subscription, as a subscription
-//     * already exists.
-//     *
-//     * <p/><table id="crc"><caption>CRC Card</caption>
-//     * <tr><th> Responsibilities <th> Collaborations
-//     * <tr><td> Represent failure to create an exclusize subscription, as a subscription already exists.
-//     * </table>
-//     *
-//     * @todo Not an AMQP exception as no status code.
-//     *
-//     * @todo Move to top level, used outside this class.
-//     */
-//    public static final class ExistingSubscriptionPreventsExclusive extends AMQException
-//    {
-//        public ExistingSubscriptionPreventsExclusive()
-//        {
-//            super("");
-    //        }
-    //    }
-    public static int s_queueID = 0;
-
-    private static final Logger _logger = Logger.getLogger(AMQQueue.class);
-
-    private final AMQShortString _name;
-
-    // The queueu ID
-    int _queueId;
-    // The list of enqueued messages.
-    Hashtable<Long, StorableMessage> _messages = new Hashtable<Long, StorableMessage>();
-
-    /**
-     * null means shared
-     */
-    private final AMQShortString _owner;
-
-    private final boolean _durable;
-
-    /**
-     * If true, this queue is deleted when the last subscriber is removed
-     */
-    private final boolean _autoDelete;
-
-    /**
-     * Holds subscribers to the queue.
-     */
-    private final SubscriptionSet _subscribers;
-
-    private final SubscriptionFactory _subscriptionFactory;
-
-    private final AtomicInteger _subscriberCount = new AtomicInteger();
-
-    private final AtomicBoolean _isExclusive = new AtomicBoolean();
-
-    private final AtomicBoolean _deleted = new AtomicBoolean(false);
-
-    private List<Task> _deleteTaskList = new CopyOnWriteArrayList<Task>();
-
-    /**
-     * Manages message delivery.
-     */
-    private final DeliveryManager _deliveryMgr;
-
-    /**
-     * Used to track bindings to exchanges so that on deletion they can easily be cancelled.
-     */
-    private final ExchangeBindings _bindings = new ExchangeBindings(this);
-
-    /**
-     * Executor on which asynchronous delivery will be carriedout where required
-     */
-    private final Executor _asyncDelivery;
-
-    private final AMQQueueMBean _managedObject;
-
-    private final VirtualHost _virtualHost;
-
-    /**
-     * max allowed size(KB) of a single message
-     */
-    @Configured(path = "maximumMessageSize", defaultValue = "0")
-    public long _maximumMessageSize;
-
-    /**
-     * max allowed number of messages on a queue.
-     */
-    @Configured(path = "maximumMessageCount", defaultValue = "0")
-    public long _maximumMessageCount;
-
-    /**
-     * max queue depth for the queue
-     */
-    @Configured(path = "maximumQueueDepth", defaultValue = "0")
-    public long _maximumQueueDepth;
-
-    /**
-     * maximum message age before alerts occur
-     */
-    @Configured(path = "maximumMessageAge", defaultValue = "0")
-    public long _maximumMessageAge;
-
-    /**
-     * the minimum interval between sending out consequetive alerts of the same type
-     */
-    @Configured(path = "minimumAlertRepeatGap", defaultValue = "0")
-    public long _minimumAlertRepeatGap;
-
-    /**
-     * total messages received by the queue since startup.
-     */
-    public AtomicLong _totalMessagesReceived = new AtomicLong();
-
-    public int compareTo(Object o)
-    {
-        return _name.compareTo(((AMQQueue) o).getName());
-    }
-
-    public AMQQueue(AMQShortString name, boolean durable, AMQShortString owner, boolean autoDelete, VirtualHost virtualHost)
-            throws AMQException
-    {
-        this(name, durable, owner, autoDelete, virtualHost, AsyncDeliveryConfig.getAsyncDeliveryExecutor(),
-             new SubscriptionSet(), new SubscriptionImpl.Factory());
-    }
-
-    protected AMQQueue(AMQShortString name, boolean durable, AMQShortString owner, boolean autoDelete,
-                       VirtualHost virtualHost, SubscriptionSet subscribers) throws AMQException
-    {
-        this(name, durable, owner, autoDelete, virtualHost, AsyncDeliveryConfig.getAsyncDeliveryExecutor(), subscribers,
-             new SubscriptionImpl.Factory());
-    }
-
-    protected AMQQueue(AMQShortString name, boolean durable, AMQShortString owner, boolean autoDelete,
-                       VirtualHost virtualHost, Executor asyncDelivery, SubscriptionSet subscribers,
-                       SubscriptionFactory subscriptionFactory) throws AMQException
-    {
-        if (name == null)
-        {
-            throw new IllegalArgumentException("Queue name must not be null");
-        }
-
-        if (virtualHost == null)
-        {
-            throw new IllegalArgumentException("Virtual Host must not be null");
-        }
-
-        _name = name;
-        _durable = durable;
-        _owner = owner;
-        _autoDelete = autoDelete;
-        _virtualHost = virtualHost;
-        _asyncDelivery = asyncDelivery;
-
-        _managedObject = createMBean();
-        _managedObject.register();
-
-        _subscribers = subscribers;
-        _subscriptionFactory = subscriptionFactory;
-        _deliveryMgr = new ConcurrentSelectorDeliveryManager(_subscribers, this);
-        _queueId = s_queueID++;
-    }
-
-    private AMQQueueMBean createMBean() throws AMQException
-    {
-        try
-        {
-            return new AMQQueueMBean(this);
-        }
-        catch (JMException ex)
-        {
-            throw new AMQException(null, "AMQQueue MBean creation has failed ", ex);
-        }
-    }
-
-    public AMQShortString getName()
-    {
-        return _name;
-    }
-
-    public boolean isShared()
-    {
-        return _owner == null;
-    }
-
-    public boolean isDurable()
-    {
-        return _durable;
-    }
-
-    public AMQShortString getOwner()
-    {
-        return _owner;
-    }
-
-    public boolean isAutoDelete()
-    {
-        return _autoDelete;
-    }
-
-    /**
-     * @return no of messages(undelivered) on the queue.
-     */
-    public int getMessageCount()
-    {
-        return _deliveryMgr.getQueueMessageCount();
-    }
-
-    /**
-     * @return List of messages(undelivered) on the queue.
-     */
-    public List<AMQMessage> getMessagesOnTheQueue()
-    {
-        return _deliveryMgr.getMessages();
-    }
-
-    /**
-     * Returns messages within the given range of message Ids
-     *
-     * @param fromMessageId
-     * @param toMessageId
-     * @return List of messages
-     */
-    public List<AMQMessage> getMessagesOnTheQueue(long fromMessageId, long toMessageId)
-    {
-        return _deliveryMgr.getMessages(fromMessageId, toMessageId);
-    }
-
-    public long getQueueDepth()
-    {
-        return _deliveryMgr.getTotalMessageSize();
-    }
-
-    /**
-     * @param messageId
-     * @return AMQMessage with give id if exists. null if AMQMessage with given id doesn't exist.
-     */
-    public AMQMessage getMessageOnTheQueue(long messageId)
-    {
-        List<AMQMessage> list = getMessagesOnTheQueue(messageId, messageId);
-        if ((list == null) || (list.size() == 0))
-        {
-            return null;
-        }
-
-        return list.get(0);
-    }
-
-    /**
-     * moves messages from this queue to another queue. to do this the approach is following- - setup the queue for
-     * moving messages (stop the async delivery) - get all the messages available in the given message id range - setup
-     * the other queue for moving messages (stop the async delivery) - send these available messages to the other queue
-     * (enqueue in other queue) - Once sending to other Queue is successful, remove messages from this queue - remove
-     * locks from both queues and start async delivery
-     *
-     * @param fromMessageId The first message id to move.
-     * @param toMessageId   The last message id to move.
-     * @param queueName     The queue to move the messages to.
-     * @param storeContext  The context of the message store under which to perform the move. This is associated with
-     *                      the stores transactional context.
-     */
-    public synchronized void moveMessagesToAnotherQueue(long fromMessageId, long toMessageId, String queueName,
-                                                        StoreContext storeContext)
-    {
-        AMQQueue toQueue = getVirtualHost().getQueueRegistry().getQueue(new AMQShortString(queueName));
-
-        MessageStore fromStore = getVirtualHost().getMessageStore();
-        MessageStore toStore = toQueue.getVirtualHost().getMessageStore();
-
-        if (toStore != fromStore)
-        {
-            throw new RuntimeException("Can only move messages between queues on the same message store.");
-        }
-
-        try
-        {
-            // Obtain locks to prevent activity on the queues being moved between.
-            startMovingMessages();
-            toQueue.startMovingMessages();
-
-            // Get the list of messages to move.
-            List<AMQMessage> foundMessagesList = getMessagesOnTheQueue(fromMessageId, toMessageId);
-
-            try
-            {
-                fromStore.beginTran(storeContext);
-
-                // Move the messages in on the message store.
-                for (AMQMessage message : foundMessagesList)
-                {
-                    fromStore.dequeueMessage(storeContext, _name, message.getMessageId());
-                    toStore.enqueueMessage(storeContext, toQueue._name, message.getMessageId());
-                }
-
-                // Commit and flush the move transcations.
-                try
-                {
-                    fromStore.commitTran(storeContext);
-                }
-                catch (AMQException e)
-                {
-                    throw new RuntimeException("Failed to commit transaction whilst moving messages on message store.", e);
-                }
-
-                // Move the messages on the in-memory queues.
-                toQueue.enqueueMovedMessages(storeContext, foundMessagesList);
-                _deliveryMgr.removeMovedMessages(foundMessagesList);
-            }
-            // Abort the move transactions on move failures.
-            catch (AMQException e)
-            {
-                try
-                {
-                    fromStore.abortTran(storeContext);
-                }
-                catch (AMQException ae)
-                {
-                    throw new RuntimeException("Failed to abort transaction whilst moving messages on message store.", ae);
-                }
-            }
-        }
-        // Release locks to allow activity on the queues being moved between to continue.
-        finally
-        {
-            toQueue.stopMovingMessages();
-            stopMovingMessages();
-        }
-    }
-
-    /**
-     * Copies messages on this queue to another queue, and also commits the move on the message store. Delivery activity
-     * on the queues being moved between is suspended during the move.
-     *
-     * @param fromMessageId The first message id to move.
-     * @param toMessageId   The last message id to move.
-     * @param queueName     The queue to move the messages to.
-     * @param storeContext  The context of the message store under which to perform the move. This is associated with
-     *                      the stores transactional context.
-     */
-    public synchronized void copyMessagesToAnotherQueue(long fromMessageId, long toMessageId, String queueName,
-                                                        StoreContext storeContext)
-    {
-        AMQQueue toQueue = getVirtualHost().getQueueRegistry().getQueue(new AMQShortString(queueName));
-
-        MessageStore fromStore = getVirtualHost().getMessageStore();
-        MessageStore toStore = toQueue.getVirtualHost().getMessageStore();
-
-        if (toStore != fromStore)
-        {
-            throw new RuntimeException("Can only move messages between queues on the same message store.");
-        }
-
-        try
-        {
-            // Obtain locks to prevent activity on the queues being moved between.
-            startMovingMessages();
-            toQueue.startMovingMessages();
-
-            // Get the list of messages to move.
-            List<AMQMessage> foundMessagesList = getMessagesOnTheQueue(fromMessageId, toMessageId);
-
-            try
-            {
-                fromStore.beginTran(storeContext);
-
-                // Move the messages in on the message store.
-                for (AMQMessage message : foundMessagesList)
-                {
-                    toStore.enqueueMessage(storeContext, toQueue._name, message.getMessageId());
-                    message.takeReference();
-                }
-
-                // Commit and flush the move transcations.
-                try
-                {
-                    fromStore.commitTran(storeContext);
-                }
-                catch (AMQException e)
-                {
-                    throw new RuntimeException("Failed to commit transaction whilst moving messages on message store.", e);
-                }
-
-                // Move the messages on the in-memory queues.
-                toQueue.enqueueMovedMessages(storeContext, foundMessagesList);
-            }
-            // Abort the move transactions on move failures.
-            catch (AMQException e)
-            {
-                try
-                {
-                    fromStore.abortTran(storeContext);
-                }
-                catch (AMQException ae)
-                {
-                    throw new RuntimeException("Failed to abort transaction whilst moving messages on message store.", ae);
-                }
-            }
-        }
-        // Release locks to allow activity on the queues being moved between to continue.
-        finally
-        {
-            toQueue.stopMovingMessages();
-            stopMovingMessages();
-        }
-    }
-
-    /**
-     * Removes messages from this queue, and also commits the remove on the message store. Delivery activity
-     * on the queues being moved between is suspended during the remove.
-     *
-     * @param fromMessageId The first message id to move.
-     * @param toMessageId   The last message id to move.
-     * @param storeContext  The context of the message store under which to perform the move. This is associated with
-     *                      the stores transactional context.
-     */
-    public synchronized void removeMessagesFromQueue(long fromMessageId, long toMessageId, StoreContext storeContext)
-    {
-        MessageStore fromStore = getVirtualHost().getMessageStore();
-
-        try
-        {
-            // Obtain locks to prevent activity on the queues being moved between.
-            startMovingMessages();
-
-            // Get the list of messages to move.
-            List<AMQMessage> foundMessagesList = getMessagesOnTheQueue(fromMessageId, toMessageId);
-
-            try
-            {
-                fromStore.beginTran(storeContext);
-
-                // remove the messages in on the message store.
-                for (AMQMessage message : foundMessagesList)
-                {
-                    fromStore.dequeueMessage(storeContext, _name, message.getMessageId());
-                }
-
-                // Commit and flush the move transcations.
-                try
-                {
-                    fromStore.commitTran(storeContext);
-                }
-                catch (AMQException e)
-                {
-                    throw new RuntimeException("Failed to commit transaction whilst moving messages on message store.", e);
-                }
-
-                // remove the messages on the in-memory queues.
-                _deliveryMgr.removeMovedMessages(foundMessagesList);
-            }
-            // Abort the move transactions on move failures.
-            catch (AMQException e)
-            {
-                try
-                {
-                    fromStore.abortTran(storeContext);
-                }
-                catch (AMQException ae)
-                {
-                    throw new RuntimeException("Failed to abort transaction whilst moving messages on message store.", ae);
-                }
-            }
-        }
-        // Release locks to allow activity on the queues being moved between to continue.
-        finally
-        {
-            stopMovingMessages();
-        }
-    }
-
-    public void startMovingMessages()
-    {
-        _deliveryMgr.startMovingMessages();
-    }
-
-    private void enqueueMovedMessages(StoreContext storeContext, List<AMQMessage> messageList)
-    {
-        _deliveryMgr.enqueueMovedMessages(storeContext, messageList);
-        _totalMessagesReceived.addAndGet(messageList.size());
-    }
-
-    public void stopMovingMessages()
-    {
-        _deliveryMgr.stopMovingMessages();
-        _deliveryMgr.processAsync(_asyncDelivery);
-    }
-
-    /**
-     * @return MBean object associated with this Queue
-     */
-    public ManagedObject getManagedObject()
-    {
-        return _managedObject;
-    }
-
-    public long getMaximumMessageSize()
-    {
-        return _maximumMessageSize;
-    }
-
-    public void setMaximumMessageSize(long value)
-    {
-        _maximumMessageSize = value;
-    }
-
-    public int getConsumerCount()
-    {
-        return _subscribers.size();
-    }
-
-    public int getActiveConsumerCount()
-    {
-        return _subscribers.getWeight();
-    }
-
-    public long getReceivedMessageCount()
-    {
-        return _totalMessagesReceived.get();
-    }
-
-    public long getMaximumMessageCount()
-    {
-        return _maximumMessageCount;
-    }
-
-    public void setMaximumMessageCount(long value)
-    {
-        _maximumMessageCount = value;
-    }
-
-    public long getMaximumQueueDepth()
-    {
-        return _maximumQueueDepth;
-    }
-
-    // Sets the queue depth, the max queue size
-    public void setMaximumQueueDepth(long value)
-    {
-        _maximumQueueDepth = value;
-    }
-
-    public long getOldestMessageArrivalTime()
-    {
-        return _deliveryMgr.getOldestMessageArrival();
-
-    }
-
-    /**
-     * Removes the AMQMessage from the top of the queue.
-     */
-    public synchronized void deleteMessageFromTop(StoreContext storeContext) throws AMQException
-    {
-        _deliveryMgr.removeAMessageFromTop(storeContext);
-    }
-
-    /**
-     * removes all the messages from the queue.
-     */
-    public synchronized long clearQueue(StoreContext storeContext) throws AMQException
-    {
-        return _deliveryMgr.clearAllMessages(storeContext);
-    }
-
-    public void bind(AMQShortString routingKey, FieldTable arguments, Exchange exchange) throws AMQException
-    {
-        exchange.registerQueue(routingKey, this, arguments);
-        if (isDurable() && exchange.isDurable())
-        {
-            _virtualHost.getMessageStore().bindQueue(exchange, routingKey, this, arguments);
-            //DTX MessageStore
-//            try
-//            {
-//                _virtualHost.getMessageStore().bindQueue(exchange, routingKey, this, arguments);
-//            }
-//            catch (InternalErrorException e)
-//            {
-//                throw new AMQException(null, "Problem binding queue ", e);
-//            }
-        }
-
-        _bindings.addBinding(routingKey, arguments, exchange);
-    }
-
-    public void unBind(AMQShortString routingKey, FieldTable arguments, Exchange exchange) throws AMQException
-    {
-        exchange.deregisterQueue(routingKey, this, arguments);
-        if (isDurable() && exchange.isDurable())
-        {
-
-            _virtualHost.getMessageStore().unbindQueue(exchange, routingKey, this, arguments);
-            //DTX MessageStore
-//            try
-//            {
-//                _virtualHost.getMessageStore().unbindQueue(exchange, routingKey, this, arguments);
-//            }
-//            catch (InternalErrorException e)
-//            {
-//                throw new AMQException(null, "problem unbinding queue", e);
-//            }
-        }
-
-        _bindings.remove(routingKey, arguments, exchange);
-    }
-
-    public void registerProtocolSession(AMQProtocolSession ps, int channel, AMQShortString consumerTag, boolean acks,
-                                        FieldTable filters, boolean noLocal, boolean exclusive) throws AMQException
-    {
-        if (incrementSubscriberCount() > 1)
-        {
-            if (isExclusive())
-            {
-                decrementSubscriberCount();
-                throw new ExistingExclusiveSubscriptionException();
-            }
-            else if (exclusive)
-            {
-                decrementSubscriberCount();
-                throw new ExistingSubscriptionPreventsExclusiveException();
-            }
-
-        }
-        else if (exclusive)
-        {
-            setExclusive(true);
-        }
-
-        if (_logger.isDebugEnabled())
-        {
-            _logger.debug(MessageFormat.format(
-                    "Registering protocol session {0} with channel {1} and " + "consumer tag {2} with {3}", ps, channel,
-                    consumerTag, this));
-        }
-
-        Subscription subscription =
-                _subscriptionFactory.createSubscription(channel, ps, consumerTag, acks, filters, noLocal, this);
-
-        if (subscription.filtersMessages())
-        {
-            if (_deliveryMgr.hasQueuedMessages())
-            {
-                _deliveryMgr.populatePreDeliveryQueue(subscription);
-            }
-        }
-
-        _subscribers.addSubscriber(subscription);
-    }
-
-    private boolean isExclusive()
-    {
-        return _isExclusive.get();
-    }
-
-    private void setExclusive(boolean exclusive)
-    {
-        _isExclusive.set(exclusive);
-    }
-
-    private int incrementSubscriberCount()
-    {
-        return _subscriberCount.incrementAndGet();
-    }
-
-    private int decrementSubscriberCount()
-    {
-        return _subscriberCount.decrementAndGet();
-    }
-
-    public void unregisterProtocolSession(AMQProtocolSession ps, int channel, AMQShortString consumerTag) throws AMQException
-    {
-        if (_logger.isDebugEnabled())
-        {
-            _logger.debug(MessageFormat.format(
-                    "Unregistering protocol session {0} with channel {1} and consumer tag {2} from {3}", ps, channel,
-                    consumerTag, this));
-        }
-
-        Subscription removedSubscription;
-
-        if ((removedSubscription =
-                _subscribers.removeSubscriber(_subscriptionFactory.createSubscription(channel, ps, consumerTag)))
-            == null)
-        {
-            throw new AMQException(null, "Protocol session with channel " + channel + " and consumer tag " + consumerTag
-                                         + " and protocol session key " + ps.getKey() + " not registered with queue " + this, null);
-        }
-
-        removedSubscription.close();
-        setExclusive(false);
-        decrementSubscriberCount();
-
-        // if we are eligible for auto deletion, unregister from the queue registry
-        if (_autoDelete && _subscribers.isEmpty())
-        {
-            if (_logger.isInfoEnabled())
-            {
-                _logger.info("Auto-deleteing queue:" + this);
-            }
-
-            autodelete();
-            // we need to manually fire the event to the removed subscription (which was the last one left for this
-            // queue. This is because the delete method uses the subscription set which has just been cleared
-            removedSubscription.queueDeleted(this);
-        }
-    }
-
-    public boolean isUnused()
-    {
-        return _subscribers.isEmpty();
-    }
-
-    public boolean isEmpty()
-    {
-        return !_deliveryMgr.hasQueuedMessages();
-    }
-
-    public int delete(boolean checkUnused, boolean checkEmpty) throws AMQException
-    {
-        if (checkUnused && !_subscribers.isEmpty())
-        {
-            _logger.info("Will not delete " + this + " as it is in use.");
-
-            return 0;
-        }
-        else if (checkEmpty && _deliveryMgr.hasQueuedMessages())
-        {
-            _logger.info("Will not delete " + this + " as it is not empty.");
-
-            return 0;
-        }
-        else
-        {
-            delete();
-
-            return _deliveryMgr.getQueueMessageCount();
-        }
-    }
-
-    public void delete() throws AMQException
-    {
-        if (!_deleted.getAndSet(true))
-        {
-            _subscribers.queueDeleted(this);
-            _bindings.deregister();
-            _virtualHost.getQueueRegistry().unregisterQueue(_name);
-            _managedObject.unregister();
-            for (Task task : _deleteTaskList)
-            {
-                task.doTask(this);
-            }
-
-            _deleteTaskList.clear();
-        }
-    }
-
-    protected void autodelete() throws AMQException
-    {
-        if (_logger.isDebugEnabled())
-        {
-            _logger.debug(MessageFormat.format("autodeleting {0}", this));
-        }
-
-        delete();
-    }
-
-    /*public void processGet(StoreContext storeContext, AMQMessage msg, boolean deliverFirst) throws AMQException
-    {
-        // fixme not sure what this is doing. should we be passing deliverFirst through here?
-        // This code is not used so when it is perhaps it should
-        _deliveryMgr.deliver(storeContext, getName(), msg, deliverFirst);
-        try
-        {
-            msg.checkDeliveredToConsumer();
-            updateReceivedMessageCount(msg);
-        }
-        catch (NoConsumersException e)
-        {
-            // as this message will be returned, it should be removed
-            // from the queue:
-            dequeue(storeContext, msg);
-        }
-    }*/
-
-    // public DeliveryManager getDeliveryManager()
-    // {
-    // return _deliveryMgr;
-    // }
-
-    public void process(StoreContext storeContext, AMQMessage msg, boolean deliverFirst) throws AMQException
-    {
-        _deliveryMgr.deliver(storeContext, getName(), msg, deliverFirst);
-        try
-        {
-            msg.checkDeliveredToConsumer();
-            updateReceivedMessageCount(msg);
-        }
-        catch (NoConsumersException e)
-        {
-            // as this message will be returned, it should be removed
-            // from the queue:
-            dequeue(storeContext, msg);
-        }
-    }
-
-    void dequeue(StoreContext storeContext, AMQMessage msg) throws FailedDequeueException
-    {
-        try
-        {
-            msg.dequeue(storeContext, this);
-        }
-        catch (MessageCleanupException e)
-        {
-            // Message was dequeued, but could not then be deleted
-            // though it is no longer referenced. This should be very
-            // rare and can be detected and cleaned up on recovery or
-            // done through some form of manual intervention.
-            _logger.error(e, e);
-        }
-        catch (AMQException e)
-        {
-            throw new FailedDequeueException(_name.toString(), e);
-        }
-    }
-
-    public void deliverAsync()
-    {
-        _deliveryMgr.processAsync(_asyncDelivery);
-    }
-
-    protected SubscriptionManager getSubscribers()
-    {
-        return _subscribers;
-    }
-
-    protected void updateReceivedMessageCount(AMQMessage msg) throws AMQException
-    {
-        if (!msg.isRedelivered())
-        {
-            _totalMessagesReceived.incrementAndGet();
-        }
-
-        try
-        {
-            _managedObject.checkForNotification(msg);
-        }
-        catch (JMException e)
-        {
-            throw new AMQException(null, "Unable to get notification from manage queue: " + e, e);
-        }
-    }
-
-    public boolean equals(Object o)
-    {
-        if (this == o)
-        {
-            return true;
-        }
-
-        if ((o == null) || (getClass() != o.getClass()))
-        {
-            return false;
-        }
-
-        final AMQQueue amqQueue = (AMQQueue) o;
-
-        return (_name.equals(amqQueue._name));
-    }
-
-    public int hashCode()
-    {
-        return _name.hashCode();
-    }
-
-    public String toString()
-    {
-        return "Queue(" + _name + ")@" + System.identityHashCode(this);
-    }
-
-    public boolean performGet(AMQProtocolSession session, AMQChannel channel, boolean acks) throws AMQException
-    {
-        return _deliveryMgr.performGet(session, channel, acks);
-    }
-
-    public QueueRegistry getQueueRegistry()
-    {
-        return _virtualHost.getQueueRegistry();
-    }
-
-    public VirtualHost getVirtualHost()
-    {
-        return _virtualHost;
-    }
-
-    public static interface Task
-    {
-        public void doTask(AMQQueue queue) throws AMQException;
-    }
-
-    public void addQueueDeleteTask(Task task)
-    {
-        _deleteTaskList.add(task);
-    }
-
-    public long getMinimumAlertRepeatGap()
-    {
-        return _minimumAlertRepeatGap;
-    }
-
-    public void setMinimumAlertRepeatGap(long minimumAlertRepeatGap)
-    {
-        _minimumAlertRepeatGap = minimumAlertRepeatGap;
-    }
-
-    public long getMaximumMessageAge()
-    {
-        return _maximumMessageAge;
-    }
-
-    public void setMaximumMessageAge(long maximumMessageAge)
-    {
-        _maximumMessageAge = maximumMessageAge;
-    }
-
-    public void subscriberHasPendingResend(boolean hasContent, SubscriptionImpl subscription, AMQMessage msg)
-    {
-        _deliveryMgr.subscriberHasPendingResend(hasContent, subscription, msg);
-    }
-
-    // ========================================================================
-    // Interface StorableQueue
-    // ========================================================================
-
-    public int getQueueID()
-    {
-        return _queueId;
-    }
-
-    public void setQueueID(int id)
-    {
-        _queueId = id;
-    }
-
-    public void dequeue(StorableMessage m)
-    {
-        _messages.remove(m.getMessageId());
-    }
-
-    public void enqueue(StorableMessage m)
-    {
-        _messages.put(m.getMessageId(), m);
-    }
-
-    // ========================================================================
-    // Used by the Store
-    // ========================================================================
-
-    /**
-     * Get the list of enqueud messages
-     *
-     * @return The list of enqueud messages
-     */
-    public Collection<StorableMessage> getAllEnqueuedMessages()
-    {
-        return _messages.values();
-    }
-
-    /**
-     * Get the enqueued message identified by messageID
-     *
-     * @param messageId the id of the enqueued message to recover
-     * @return The enqueued message with the specified id
-     */
-    public StorableMessage getEnqueuedMessage(long messageId)
-    {
-        return _messages.get(messageId);
-    }
-}
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
deleted file mode 100644
index 4331d8d870..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueMBean.java
+++ /dev/null
@@ -1,471 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.queue;
-
-import org.apache.log4j.Logger;
-
-import org.apache.mina.common.ByteBuffer;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.framing.BasicContentHeaderProperties;
-import org.apache.qpid.framing.CommonContentHeaderProperties;
-import org.apache.qpid.framing.ContentHeaderBody;
-import org.apache.qpid.framing.abstraction.ContentChunk;
-import org.apache.qpid.server.management.AMQManagedObject;
-import org.apache.qpid.server.management.MBeanConstructor;
-import org.apache.qpid.server.management.MBeanDescription;
-import org.apache.qpid.server.management.ManagedObject;
-import org.apache.qpid.server.store.StoreContext;
-
-import javax.management.JMException;
-import javax.management.MBeanException;
-import javax.management.MBeanNotificationInfo;
-import javax.management.Notification;
-import javax.management.OperationsException;
-import javax.management.monitor.MonitorNotification;
-import javax.management.openmbean.ArrayType;
-import javax.management.openmbean.CompositeData;
-import javax.management.openmbean.CompositeDataSupport;
-import javax.management.openmbean.CompositeType;
-import javax.management.openmbean.OpenDataException;
-import javax.management.openmbean.OpenType;
-import javax.management.openmbean.SimpleType;
-import javax.management.openmbean.TabularData;
-import javax.management.openmbean.TabularDataSupport;
-import javax.management.openmbean.TabularType;
-
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
-
-/**
- * MBean class for AMQQueue. It implements all the management features exposed
- * for an AMQQueue.
- * <p/><tablse id="crc"><caption>CRC Caption</caption>
- * <tr><th> Responsibilities <th> Collaborations
- * </table>
- */
-@MBeanDescription("Management Interface for AMQQueue")
-public class AMQQueueMBean extends AMQManagedObject implements ManagedQueue, QueueNotificationListener
-{
-    /** Used for debugging purposes. */
-    private static final Logger _logger = Logger.getLogger(AMQQueueMBean.class);
-
-    private static final SimpleDateFormat _dateFormat = new SimpleDateFormat("MM-dd-yy HH:mm:ss.SSS z");
-
-    /**
-     * Since the MBean is not associated with a real channel we can safely create our own store context
-     * for use in the few methods that require one.
-     */
-    private StoreContext _storeContext = new StoreContext();
-
-    private AMQQueue _queue = null;
-    private String _queueName = null;
-    // OpenMBean data types for viewMessages method
-    private static final String[] _msgAttributeNames = { "AMQ MessageId", "Header", "Size(bytes)", "Redelivered" };
-    private static String[] _msgAttributeIndex = { _msgAttributeNames[0] };
-    private static OpenType[] _msgAttributeTypes = new OpenType[4]; // AMQ message attribute types.
-    private static CompositeType _messageDataType = null; // Composite type for representing AMQ Message data.
-    private static TabularType _messagelistDataType = null; // Datatype for representing AMQ messages list.
-
-    // OpenMBean data types for viewMessageContent method
-    private static CompositeType _msgContentType = null;
-    private static final String[] _msgContentAttributes = { "AMQ MessageId", "MimeType", "Encoding", "Content" };
-    private static OpenType[] _msgContentAttributeTypes = new OpenType[4];
-
-    private final long[] _lastNotificationTimes = new long[NotificationCheck.values().length];
-    private Notification _lastNotification = null;
-
-    @MBeanConstructor("Creates an MBean exposing an AMQQueue")
-    public AMQQueueMBean(AMQQueue queue) throws JMException
-    {
-        super(ManagedQueue.class, ManagedQueue.TYPE);
-        _queue = queue;
-        _queueName = jmxEncode(new StringBuffer(queue.getName()), 0).toString();
-    }
-
-    public ManagedObject getParentObject()
-    {
-        return _queue.getVirtualHost().getManagedObject();
-    }
-
-    static
-    {
-        try
-        {
-            init();
-        }
-        catch (JMException ex)
-        {
-            // This is not expected to ever occur.
-            throw new RuntimeException("Got JMException in static initializer.", ex);
-        }
-    }
-
-    /**
-     * initialises the openmbean data types
-     */
-    private static void init() throws OpenDataException
-    {
-        _msgContentAttributeTypes[0] = SimpleType.LONG; // For message id
-        _msgContentAttributeTypes[1] = SimpleType.STRING; // For MimeType
-        _msgContentAttributeTypes[2] = SimpleType.STRING; // For Encoding
-        _msgContentAttributeTypes[3] = new ArrayType(1, SimpleType.BYTE); // For message content
-        _msgContentType =
-            new CompositeType("Message Content", "AMQ Message Content", _msgContentAttributes, _msgContentAttributes,
-                _msgContentAttributeTypes);
-
-        _msgAttributeTypes[0] = SimpleType.LONG; // For message id
-        _msgAttributeTypes[1] = new ArrayType(1, SimpleType.STRING); // For header attributes
-        _msgAttributeTypes[2] = SimpleType.LONG; // For size
-        _msgAttributeTypes[3] = SimpleType.BOOLEAN; // For redelivered
-
-        _messageDataType =
-            new CompositeType("Message", "AMQ Message", _msgAttributeNames, _msgAttributeNames, _msgAttributeTypes);
-        _messagelistDataType = new TabularType("Messages", "List of messages", _messageDataType, _msgAttributeIndex);
-    }
-
-    public String getObjectInstanceName()
-    {
-        return _queueName;
-    }
-
-    public String getName()
-    {
-        return _queueName;
-    }
-
-    public boolean isDurable()
-    {
-        return _queue.isDurable();
-    }
-
-    public String getOwner()
-    {
-        return String.valueOf(_queue.getOwner());
-    }
-
-    public boolean isAutoDelete()
-    {
-        return _queue.isAutoDelete();
-    }
-
-    public Integer getMessageCount()
-    {
-        return _queue.getMessageCount();
-    }
-
-    public Long getMaximumMessageSize()
-    {
-        return _queue.getMaximumMessageSize();
-    }
-
-    public Long getMaximumMessageAge()
-    {
-        return _queue.getMaximumMessageAge();
-    }
-
-    public void setMaximumMessageAge(Long maximumMessageAge)
-    {
-        _queue.setMaximumMessageAge(maximumMessageAge);
-    }
-
-    public void setMaximumMessageSize(Long value)
-    {
-        _queue.setMaximumMessageSize(value);
-    }
-
-    public Integer getConsumerCount()
-    {
-        return _queue.getConsumerCount();
-    }
-
-    public Integer getActiveConsumerCount()
-    {
-        return _queue.getActiveConsumerCount();
-    }
-
-    public Long getReceivedMessageCount()
-    {
-        return _queue.getReceivedMessageCount();
-    }
-
-    public Long getMaximumMessageCount()
-    {
-        return _queue.getMaximumMessageCount();
-    }
-
-    public void setMaximumMessageCount(Long value)
-    {
-        _queue.setMaximumMessageCount(value);
-    }
-
-    public Long getMaximumQueueDepth()
-    {
-        long queueDepthInBytes = _queue.getMaximumQueueDepth();
-
-        return queueDepthInBytes >> 10;
-    }
-
-    public void setMaximumQueueDepth(Long value)
-    {
-        _queue.setMaximumQueueDepth(value);
-    }
-
-    /**
-     * returns the size of messages(KB) in the queue.
-     */
-    public Long getQueueDepth() throws JMException
-    {
-        long queueBytesSize = _queue.getQueueDepth();
-
-        return queueBytesSize >> 10;
-    }
-
-    /**
-     * Checks if there is any notification to be send to the listeners
-     */
-    public void checkForNotification(AMQMessage msg) throws AMQException, JMException
-    {
-
-        final long currentTime = System.currentTimeMillis();
-        final long thresholdTime = currentTime - _queue.getMinimumAlertRepeatGap();
-
-        for (NotificationCheck check : NotificationCheck.values())
-        {
-            if (check.isMessageSpecific() || (_lastNotificationTimes[check.ordinal()] < thresholdTime))
-            {
-                if (check.notifyIfNecessary(msg, _queue, this))
-                {
-                    _lastNotificationTimes[check.ordinal()] = currentTime;
-                }
-            }
-        }
-
-    }
-
-    /**
-     * Sends the notification to the listeners
-     */
-    public void notifyClients(NotificationCheck notification, AMQQueue queue, String notificationMsg)
-    {
-        // important : add log to the log file - monitoring tools may be looking for this
-        _logger.info(notification.name() + " On Queue " + queue.getName() + " - " + notificationMsg);
-        notificationMsg = notification.name() + " " + notificationMsg;
-
-        _lastNotification =
-            new Notification(MonitorNotification.THRESHOLD_VALUE_EXCEEDED, this, ++_notificationSequenceNumber,
-                System.currentTimeMillis(), notificationMsg);
-
-        _broadcaster.sendNotification(_lastNotification);
-    }
-
-    public Notification getLastNotification()
-    {
-        return _lastNotification;
-    }
-
-    /**
-     * @see org.apache.qpid.server.queue.AMQQueue#deleteMessageFromTop
-     */
-    public void deleteMessageFromTop() throws JMException
-    {
-        try
-        {
-            _queue.deleteMessageFromTop(_storeContext);
-        }
-        catch (AMQException ex)
-        {
-            throw new MBeanException(ex, ex.toString());
-        }
-    }
-
-    /**
-     * @see org.apache.qpid.server.queue.AMQQueue#clearQueue
-     */
-    public void clearQueue() throws JMException
-    {
-        try
-        {
-            _queue.clearQueue(_storeContext);
-        }
-        catch (AMQException ex)
-        {
-            throw new MBeanException(ex, ex.toString());
-        }
-    }
-
-    /**
-     * returns message content as byte array and related attributes for the given message id.
-     */
-    public CompositeData viewMessageContent(long msgId) throws JMException
-    {
-        AMQMessage msg = _queue.getMessageOnTheQueue(msgId);
-        if (msg == null)
-        {
-            throw new OperationsException("AMQMessage with message id = " + msgId + " is not in the " + _queueName);
-        }
-        // get message content
-        Iterator<ContentChunk> cBodies = msg.getContentBodyIterator();
-        List<Byte> msgContent = new ArrayList<Byte>();
-        while (cBodies.hasNext())
-        {
-            ContentChunk body = cBodies.next();
-            if (body.getSize() != 0)
-            {
-                if (body.getSize() != 0)
-                {
-                    ByteBuffer slice = body.getData().slice();
-                    for (int j = 0; j < slice.limit(); j++)
-                    {
-                        msgContent.add(slice.get());
-                    }
-                }
-            }
-        }
-
-        try
-        {
-            // Create header attributes list
-            CommonContentHeaderProperties headerProperties =
-                (CommonContentHeaderProperties) msg.getContentHeaderBody().properties;
-            String mimeType = null, encoding = null;
-            if (headerProperties != null)
-            {
-                AMQShortString mimeTypeShortSting = headerProperties.getContentType();
-                mimeType = (mimeTypeShortSting == null) ? null : mimeTypeShortSting.toString();
-                encoding = (headerProperties.getEncoding() == null) ? "" : headerProperties.getEncoding().toString();
-            }
-
-            Object[] itemValues = { msgId, mimeType, encoding, msgContent.toArray(new Byte[0]) };
-
-            return new CompositeDataSupport(_msgContentType, _msgContentAttributes, itemValues);
-        }
-        catch (AMQException e)
-        {
-            JMException jme = new JMException("Error creating header attributes list: " + e);
-            jme.initCause(e);
-            throw jme;
-        }
-    }
-
-    /**
-     * Returns the header contents of the messages stored in this queue in tabular form.
-     */
-    public TabularData viewMessages(int beginIndex, int endIndex) throws JMException
-    {
-        if ((beginIndex > endIndex) || (beginIndex < 1))
-        {
-            throw new OperationsException("From Index = " + beginIndex + ", To Index = " + endIndex
-                + "\n\"From Index\" should be greater than 0 and less than \"To Index\"");
-        }
-
-        List<AMQMessage> list = _queue.getMessagesOnTheQueue();
-        TabularDataSupport _messageList = new TabularDataSupport(_messagelistDataType);
-
-        try
-        {
-            // Create the tabular list of message header contents
-            for (int i = beginIndex; (i <= endIndex) && (i <= list.size()); i++)
-            {
-                AMQMessage msg = list.get(i - 1);
-                ContentHeaderBody headerBody = msg.getContentHeaderBody();
-                // Create header attributes list
-                String[] headerAttributes = getMessageHeaderProperties(headerBody);
-                Object[] itemValues = { msg.getMessageId(), headerAttributes, headerBody.bodySize, msg.isRedelivered() };
-                CompositeData messageData = new CompositeDataSupport(_messageDataType, _msgAttributeNames, itemValues);
-                _messageList.put(messageData);
-            }
-        }
-        catch (AMQException e)
-        {
-            JMException jme = new JMException("Error creating message contents: " + e);
-            jme.initCause(e);
-            throw jme;
-        }
-
-        return _messageList;
-    }
-
-    private String[] getMessageHeaderProperties(ContentHeaderBody headerBody)
-    {
-        List<String> list = new ArrayList<String>();
-        BasicContentHeaderProperties headerProperties = (BasicContentHeaderProperties) headerBody.properties;
-        list.add("reply-to = " + headerProperties.getReplyToAsString());
-        list.add("propertyFlags = " + headerProperties.getPropertyFlags());
-        list.add("ApplicationID = " + headerProperties.getAppIdAsString());
-        list.add("ClusterID = " + headerProperties.getClusterIdAsString());
-        list.add("UserId = " + headerProperties.getUserIdAsString());
-        list.add("JMSMessageID = " + headerProperties.getMessageIdAsString());
-        list.add("JMSCorrelationID = " + headerProperties.getCorrelationIdAsString());
-
-        int delMode = headerProperties.getDeliveryMode();
-        list.add("JMSDeliveryMode = " + ((delMode == 1) ? "Persistent" : "Non_Persistent"));
-
-        list.add("JMSPriority = " + headerProperties.getPriority());
-        list.add("JMSType = " + headerProperties.getType());
-
-        long longDate = headerProperties.getExpiration();
-        String strDate = (longDate != 0) ? _dateFormat.format(new Date(longDate)) : null;
-        list.add("JMSExpiration = " + strDate);
-
-        longDate = headerProperties.getTimestamp();
-        strDate = (longDate != 0) ? _dateFormat.format(new Date(longDate)) : null;
-        list.add("JMSTimestamp = " + strDate);
-
-        return list.toArray(new String[list.size()]);
-    }
-
-    /**
-     * @see ManagedQueue#moveMessages
-     * @param fromMessageId
-     * @param toMessageId
-     * @param toQueueName
-     * @throws JMException
-     */
-    public void moveMessages(long fromMessageId, long toMessageId, String toQueueName) throws JMException
-    {
-        if ((fromMessageId > toMessageId) || (fromMessageId < 1))
-        {
-            throw new OperationsException("\"From MessageId\" should be greater then 0 and less then \"To MessageId\"");
-        }
-
-        _queue.moveMessagesToAnotherQueue(fromMessageId, toMessageId, toQueueName, _storeContext);
-    }
-
-    /**
-     * returns Notifications sent by this MBean.
-     */
-    @Override
-    public MBeanNotificationInfo[] getNotificationInfo()
-    {
-        String[] notificationTypes = new String[] { MonitorNotification.THRESHOLD_VALUE_EXCEEDED };
-        String name = MonitorNotification.class.getName();
-        String description = "Either Message count or Queue depth or Message size has reached threshold high value";
-        MBeanNotificationInfo info1 = new MBeanNotificationInfo(notificationTypes, name, description);
-
-        return new MBeanNotificationInfo[] { info1 };
-    }
-
-} // End of AMQQueueMBean class
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AsyncDeliveryConfig.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AsyncDeliveryConfig.java
deleted file mode 100644
index 290fedcf7b..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AsyncDeliveryConfig.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.queue;
-
-import java.util.concurrent.Executor;
-import java.util.concurrent.Executors;
-
-import org.apache.qpid.configuration.Configured;
-import org.apache.qpid.server.registry.ApplicationRegistry;
-
-public class AsyncDeliveryConfig
-{
-    private Executor _executor;
-
-    @Configured(path = "delivery.poolsize", defaultValue = "0")
-    public int poolSize;
-
-    public Executor getExecutor()
-    {
-        if (_executor == null)
-        {
-            if (poolSize > 0)
-            {
-                _executor = Executors.newFixedThreadPool(poolSize);
-            }
-            else
-            {
-                _executor = Executors.newCachedThreadPool();
-            }
-        }
-        return _executor;
-    }
-
-    public static Executor getAsyncDeliveryExecutor()
-    {
-        return ApplicationRegistry.getInstance().getConfiguredObject(AsyncDeliveryConfig.class).getExecutor();
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/ConcurrentSelectorDeliveryManager.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/ConcurrentSelectorDeliveryManager.java
deleted file mode 100644
index f3b8f0de35..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/ConcurrentSelectorDeliveryManager.java
+++ /dev/null
@@ -1,923 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.queue;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Queue;
-import java.util.Set;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.concurrent.Executor;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.locks.ReentrantLock;
-
-import org.apache.log4j.Logger;
-import org.apache.qpid.AMQException;
-import org.apache.qpid.configuration.Configured;
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.framing.abstraction.ContentChunk;
-import org.apache.qpid.server.AMQChannel;
-import org.apache.qpid.server.configuration.Configurator;
-import org.apache.qpid.server.protocol.AMQProtocolSession;
-import org.apache.qpid.server.store.StoreContext;
-import org.apache.qpid.util.MessageQueue;
-import org.apache.qpid.util.ConcurrentLinkedMessageQueueAtomicSize;
-
-
-/** Manages delivery of messages on behalf of a queue */
-public class ConcurrentSelectorDeliveryManager implements DeliveryManager
-{
-    private static final Logger _log = Logger.getLogger(ConcurrentSelectorDeliveryManager.class);
-
-    @Configured(path = "advanced.compressBufferOnQueue",
-                defaultValue = "false")
-    public boolean compressBufferOnQueue;
-    /** Holds any queued messages */
-    private final MessageQueue<AMQMessage> _messages = new ConcurrentLinkedMessageQueueAtomicSize<AMQMessage>();
-
-    /** Ensures that only one asynchronous task is running for this manager at any time. */
-    private final AtomicBoolean _processing = new AtomicBoolean();
-    /** The subscriptions on the queue to whom messages are delivered */
-    private final SubscriptionManager _subscriptions;
-
-    /**
-     * A reference to the queue we are delivering messages for. We need this to be able to pass the code that handles
-     * acknowledgements a handle on the queue.
-     */
-    private final AMQQueue _queue;
-
-    /**
-     * Flag used while moving messages from this queue to another. For moving messages the async delivery should also
-     * stop. This flat should be set to true to stop async delivery and set to false to enable async delivery again.
-     */
-    private AtomicBoolean _movingMessages = new AtomicBoolean();
-
-    /**
-     * Lock used to ensure that an channel that becomes unsuspended during the start of the queueing process is forced
-     * to wait till the first message is added to the queue. This will ensure that the _queue has messages to be
-     * delivered via the async thread. <p/> Lock is used to control access to hasQueuedMessages() and over the addition
-     * of messages to the queue.
-     */
-    private ReentrantLock _lock = new ReentrantLock();
-    private AtomicLong _totalMessageSize = new AtomicLong();
-    private AtomicInteger _extraMessages = new AtomicInteger();
-    private Set<Subscription> _hasContent = Collections.synchronizedSet(new HashSet<Subscription>());
-    private final Object _queueHeadLock = new Object();
-    private String _processingThreadName = "";
-
-
-    /** Used by any reaping thread to purge messages */
-    private StoreContext _reapingStoreContext = new StoreContext();
-
-    ConcurrentSelectorDeliveryManager(SubscriptionManager subscriptions, AMQQueue queue)
-    {
-
-        //Set values from configuration
-        Configurator.configure(this);
-
-        if (compressBufferOnQueue)
-        {
-            _log.warn("Compressing Buffers on queue.");
-        }
-
-        _subscriptions = subscriptions;
-        _queue = queue;
-    }
-
-
-    private boolean addMessageToQueue(AMQMessage msg, boolean deliverFirst)
-    {
-        // Shrink the ContentBodies to their actual size to save memory.
-        if (compressBufferOnQueue)
-        {
-            Iterator<ContentChunk> it = msg.getContentBodyIterator();
-            while (it.hasNext())
-            {
-                ContentChunk cb = it.next();
-                cb.reduceToFit();
-            }
-        }
-
-        if (deliverFirst)
-        {
-            synchronized (_queueHeadLock)
-            {
-                _messages.pushHead(msg);
-            }
-        }
-        else
-        {
-            _messages.offer(msg);
-        }
-
-        _totalMessageSize.addAndGet(msg.getSize());
-
-        return true;
-    }
-
-
-    public boolean hasQueuedMessages()
-    {
-        _lock.lock();
-        try
-        {
-            return !(_messages.isEmpty() && _hasContent.isEmpty());
-        }
-        finally
-        {
-            _lock.unlock();
-        }
-    }
-
-    public int getQueueMessageCount()
-    {
-        return getMessageCount();
-    }
-
-    /**
-     * This is an EXPENSIVE opperation to perform with a ConcurrentLinkedQueue as it must run the queue to determine
-     * size. The ConcurrentLinkedQueueAtomicSize uses an AtomicInteger to record the number of elements on the queue.
-     *
-     * @return int the number of messages in the delivery queue.
-     */
-    private int getMessageCount()
-    {
-        return _messages.size() + _extraMessages.get();
-    }
-
-
-    public long getTotalMessageSize()
-    {
-        return _totalMessageSize.get();
-    }
-
-    public long getOldestMessageArrival()
-    {
-        AMQMessage msg = _messages.peek();
-        return msg == null ? Long.MAX_VALUE : msg.getArrivalTime();
-    }
-
-    public void subscriberHasPendingResend(boolean hasContent, Subscription subscription, AMQMessage msg)
-    {
-        _lock.lock();
-        try
-        {
-            if (hasContent)
-            {
-                _log.debug("Queue has adding subscriber content");
-                _hasContent.add(subscription);
-                _totalMessageSize.addAndGet(msg.getSize());
-                _extraMessages.addAndGet(1);
-            }
-            else
-            {
-                _log.debug("Queue has removing subscriber content");
-                if (msg == null)
-                {
-                    _hasContent.remove(subscription);
-                }
-                else
-                {
-                    _totalMessageSize.addAndGet(-msg.getSize());
-                    _extraMessages.addAndGet(-1);
-                }
-            }
-        }
-        finally
-        {
-            _lock.unlock();
-        }
-    }
-
-    /**
-     * Returns all the messages in the Queue
-     *
-     * @return List of messages
-     */
-    public List<AMQMessage> getMessages()
-    {
-        _lock.lock();
-        List<AMQMessage> list = new ArrayList<AMQMessage>();
-
-        for (AMQMessage message : _messages)
-        {
-            list.add(message);
-        }
-        _lock.unlock();
-
-        return list;
-    }
-
-    /**
-     * Returns messages within the range of given messageIds
-     *
-     * @param fromMessageId
-     * @param toMessageId
-     *
-     * @return
-     */
-    public List<AMQMessage> getMessages(long fromMessageId, long toMessageId)
-    {
-        if (fromMessageId <= 0 || toMessageId <= 0)
-        {
-            return null;
-        }
-
-        long maxMessageCount = toMessageId - fromMessageId + 1;
-
-        _lock.lock();
-
-        List<AMQMessage> foundMessagesList = new ArrayList<AMQMessage>();
-
-        for (AMQMessage message : _messages)
-        {
-            long msgId = message.getMessageId();
-            if (msgId >= fromMessageId && msgId <= toMessageId)
-            {
-                foundMessagesList.add(message);
-            }
-            // break if the no of messages are found
-            if (foundMessagesList.size() == maxMessageCount)
-            {
-                break;
-            }
-        }
-        _lock.unlock();
-
-        return foundMessagesList;
-    }
-
-    public void populatePreDeliveryQueue(Subscription subscription)
-    {
-        if (_log.isTraceEnabled())
-        {
-            _log.trace("Populating PreDeliveryQueue for Subscription(" + System.identityHashCode(subscription) + ")");
-        }
-
-        Iterator<AMQMessage> currentQueue = _messages.iterator();
-
-        while (currentQueue.hasNext())
-        {
-            AMQMessage message = currentQueue.next();
-            if (subscription.hasInterest(message))
-            {
-                subscription.enqueueForPreDelivery(message, false);
-            }
-        }
-    }
-
-    public boolean performGet(AMQProtocolSession protocolSession, AMQChannel channel, boolean acks) throws AMQException
-    {
-        AMQMessage msg = getNextMessage();
-        if (msg == null)
-        {
-            return false;
-        }
-        else
-        {
-
-            try
-            {
-                // if we do not need to wait for client acknowledgements
-                // we can decrement the reference count immediately.
-
-                // By doing this _before_ the send we ensure that it
-                // doesn't get sent if it can't be dequeued, preventing
-                // duplicate delivery on recovery.
-
-                // The send may of course still fail, in which case, as
-                // the message is unacked, it will be lost.
-                if (!acks)
-                {
-                    if (_log.isDebugEnabled())
-                    {
-                        _log.debug("No ack mode so dequeuing message immediately: " + msg.getMessageId());
-                    }
-                    _queue.dequeue(channel.getStoreContext(), msg);
-                }
-                synchronized (channel)
-                {
-                    long deliveryTag = channel.getNextDeliveryTag();
-
-                    if (acks)
-                    {
-                        channel.addUnacknowledgedMessage(msg, deliveryTag, null, _queue);
-                    }
-
-                    protocolSession.getProtocolOutputConverter().writeGetOk(msg, channel.getChannelId(),
-                                                                            deliveryTag, _queue.getMessageCount());
-                    _totalMessageSize.addAndGet(-msg.getSize());
-                }
-            }
-            finally
-            {
-                msg.setDeliveredToConsumer();
-            }
-            return true;
-
-        }
-    }
-
-    /**
-     * For feature of moving messages, this method is used. It sets the lock and sets the movingMessages flag, so that
-     * the asyn delivery is also stopped.
-     */
-    public void startMovingMessages()
-    {
-        _movingMessages.set(true);
-    }
-
-    /**
-     * Once moving messages to another queue is done or aborted, remove lock and unset the movingMessages flag, so that
-     * the async delivery can start again.
-     */
-    public void stopMovingMessages()
-    {
-        _movingMessages.set(false);
-        if (_lock.isHeldByCurrentThread())
-        {
-            _lock.unlock();
-        }
-    }
-
-    /**
-     * Messages will be removed from this queue and all preDeliveryQueues
-     *
-     * @param messageList
-     */
-    public void removeMovedMessages(List<AMQMessage> messageList)
-    {
-        // Remove from the
-        boolean hasSubscribers = _subscriptions.hasActiveSubscribers();
-        if (hasSubscribers)
-        {
-            for (Subscription sub : _subscriptions.getSubscriptions())
-            {
-                if (!sub.isSuspended() && sub.filtersMessages())
-                {
-                    Queue<AMQMessage> preDeliveryQueue = sub.getPreDeliveryQueue();
-                    for (AMQMessage msg : messageList)
-                    {
-                        preDeliveryQueue.remove(msg);
-                    }
-                }
-            }
-        }
-
-        for (AMQMessage msg : messageList)
-        {
-            if (_messages.remove(msg))
-            {
-                _totalMessageSize.getAndAdd(-msg.getSize());
-            }
-        }
-    }
-
-    /**
-     * Now with implementation of predelivery queues, this method will mark the message on the top as taken.
-     *
-     * @param storeContext
-     *
-     * @throws AMQException
-     */
-    public void removeAMessageFromTop(StoreContext storeContext) throws AMQException
-    {
-        _lock.lock();
-
-        AMQMessage message = _messages.poll();
-        if (message != null)
-        {
-            _totalMessageSize.addAndGet(-message.getSize());
-        }
-
-        _lock.unlock();
-    }
-
-    public long clearAllMessages(StoreContext storeContext) throws AMQException
-    {
-        long count = 0;
-        _lock.lock();
-
-        synchronized (_queueHeadLock)
-        {
-            AMQMessage msg = getNextMessage();
-            while (msg != null)
-            {
-                //and remove it
-                _messages.poll();
-
-                _queue.dequeue(storeContext, msg);
-                msg = getNextMessage();
-                count++;
-            }
-            _totalMessageSize.set(0L);
-        }
-        _lock.unlock();
-        return count;
-    }
-
-    /**
-     * This can only be used to clear the _messages queue. Any subscriber resend queue will not be purged.
-     *
-     * @return the next message or null
-     *
-     * @throws org.apache.qpid.AMQException
-     */
-    private AMQMessage getNextMessage() throws AMQException
-    {
-        return getNextMessage(_messages, null);
-    }
-
-    private AMQMessage getNextMessage(Queue<AMQMessage> messages, Subscription sub) throws AMQException
-    {
-        AMQMessage message = messages.peek();
-
-        //while (we have a message) && ((The subscriber is not a browser or message is taken ) or we are clearing) && (Check message is taken.)
-        while (purgeMessage(message, sub))
-        {
-            // if we are purging then ensure we mark this message taken for the current subscriber
-            // the current subscriber may be null in the case of a get or a purge but this is ok.
-//            boolean alreadyTaken = message.taken(_queue, sub);
-
-            //remove the already taken message or expired
-            AMQMessage removed = messages.poll();
-
-            assert removed == message;
-
-            // if the message expired then the _totalMessageSize needs adjusting
-            if (message.expired(_queue))
-            {
-                _totalMessageSize.addAndGet(-message.getSize());
-
-                // Use the reapingStoreContext as any sub(if we have one) may be in a tx.
-                message.dequeue(_reapingStoreContext, _queue);
-
-                if (_log.isInfoEnabled())
-                {
-                    _log.info(debugIdentity() + " Doing clean up of the main _message queue.");
-                }
-            }
-
-            //else the clean up is not required as the message has already been taken for this queue therefore
-            // it was the responsibility of the code that took the message to ensure the _totalMessageSize was updated.
-
-            if (_log.isTraceEnabled())
-            {
-                _log.trace("Removed taken message:" + message.debugIdentity());
-            }
-
-            // try the next message
-            message = messages.peek();
-        }
-
-        return message;
-    }
-
-    /**
-     *  This method will return true if the message is to be purged from the queue.
-     *
-     *
-     *  SIDE-EFFECT: The message will be taken by the Subscription(sub) for the current Queue(_queue)
-     * @param message
-     * @param sub
-     * @return
-     * @throws AMQException
-     */
-    private boolean purgeMessage(AMQMessage message, Subscription sub) throws AMQException
-    {
-        //Original.. complicated while loop control
-//                (message != null
-//                            && (
-//                ((sub != null && !sub.isBrowser()) || message.isTaken(_queue))
-//                || sub == null)
-//                            && message.taken(_queue, sub));
-
-        boolean purge = false;
-
-        // if the message is null then don't purge as we have no messagse.
-        if (message != null)
-        {
-            // Check that the message hasn't expired.
-            if (message.expired(_queue))
-            {
-                return true;
-            }
-
-            // if we have a subscriber perform message checks
-            if (sub != null)
-            {
-                // if we have a queue browser(we don't purge) so check mark the message as taken
-                purge = ((!sub.isBrowser() || message.isTaken(_queue)));
-            }
-            else
-            {
-                // if there is no subscription we are doing
-                // a get or purging so mark message as taken.
-                message.isTaken(_queue);
-                // and then ensure that it gets purged
-                purge = true;
-            }
-        }
-
-        // if we are purging then ensure we mark this message taken for the current subscriber
-        // the current subscriber may be null in the case of a get or a purge but this is ok.
-        return purge && message.taken(_queue, sub);
-    }
-
-    public void sendNextMessage(Subscription sub, AMQQueue queue)//Queue<AMQMessage> messageQueue)
-    {
-
-        Queue<AMQMessage> messageQueue = sub.getNextQueue(_messages);
-
-        if (_log.isTraceEnabled())
-        {
-            _log.trace(debugIdentity() + "Async sendNextMessage for sub (" + System.identityHashCode(sub) +
-                       ") from queue (" + System.identityHashCode(messageQueue) +
-                       ") AMQQueue (" + System.identityHashCode(queue) + ")");
-        }
-
-        if (messageQueue == null)
-        {
-            // There is no queue with messages currently. This is ok... just means the queue has no msgs matching selector
-            if (_log.isInfoEnabled())
-            {
-                _log.info(debugIdentity() + sub + ": asked to send messages but has none on given queue:" + queue);
-            }
-            return;
-        }
-
-        AMQMessage message = null;
-        AMQMessage removed = null;
-        try
-        {
-            synchronized (_queueHeadLock)
-            {
-                message = getNextMessage(messageQueue, sub);
-
-                // message will be null if we have no messages in the messageQueue.
-                if (message == null)
-                {
-                    if (_log.isTraceEnabled())
-                    {
-                        _log.trace(debugIdentity() + "No messages for Subscriber(" + System.identityHashCode(sub) + ") from queue; (" + System.identityHashCode(messageQueue) + ")");
-                    }
-                    return;
-                }
-                if (_log.isDebugEnabled())
-                {
-                    _log.debug(debugIdentity() + "Async Delivery Message :" + message + "(" + System.identityHashCode(message) +
-                               ") by :" + System.identityHashCode(this) +
-                               ") to :" + System.identityHashCode(sub));
-                }
-
-                sub.send(message, _queue);
-
-                //remove sent message from our queue.
-                removed = messageQueue.poll();
-                //If we don't remove the message from _messages
-                // Otherwise the Async send will never end
-            }
-
-            if (removed != message)
-            {
-                _log.error("Just send message:" + message.debugIdentity() + " BUT removed this from queue:" + removed);
-            }
-
-            if (_log.isDebugEnabled())
-            {
-                _log.debug(debugIdentity() + "Async Delivered Message r:" + removed.debugIdentity() + "d:" + message +
-                           ") by :" + System.identityHashCode(this) +
-                           ") to :" + System.identityHashCode(sub));
-            }
-
-
-            if (messageQueue == sub.getResendQueue())
-            {
-                if (_log.isTraceEnabled())
-                {
-                    _log.trace(debugIdentity() + "All messages sent from resendQueue for " + sub);
-                }
-                if (messageQueue.isEmpty())
-                {
-                    subscriberHasPendingResend(false, sub, null);
-                    //better to use the above method as this keeps all the tracking in one location.
-                    // _hasContent.remove(sub);
-                }
-
-                _extraMessages.decrementAndGet();
-            }
-            else if (messageQueue == sub.getPreDeliveryQueue() && !sub.isBrowser())
-            {
-                if (_log.isInfoEnabled())
-                {
-                    //fixme - we should do the clean up as the message remains on the _message queue
-                    // this is resulting in the next consumer receiving the message and then attempting to purge it
-                    //
-                    _log.info(debugIdentity() + "We should do clean up of the main _message queue here");
-                }
-            }
-
-            if ((message != null) && (messageQueue == _messages))
-            {
-                _totalMessageSize.addAndGet(-message.getSize());
-            }
-        }
-        catch (AMQException e)
-        {
-            if (message != null)
-            {
-                message.release(_queue);
-            }
-            else
-            {
-                _log.error(debugIdentity() + "Unable to release message as it is null. " + e, e);
-            }
-            _log.error(debugIdentity() + "Unable to deliver message as dequeue failed: " + e, e);
-        }
-    }
-
-    /**
-     * enqueues the messages in the list on the queue and all required predelivery queues
-     *
-     * @param storeContext
-     * @param movedMessageList
-     */
-    public void enqueueMovedMessages(StoreContext storeContext, List<AMQMessage> movedMessageList)
-    {
-        _lock.lock();
-        for (AMQMessage msg : movedMessageList)
-        {
-            addMessageToQueue(msg, false);
-        }
-
-        // enqueue on the pre delivery queues
-        for (Subscription sub : _subscriptions.getSubscriptions())
-        {
-            for (AMQMessage msg : movedMessageList)
-            {
-                // Only give the message to those that want them.
-                if (sub.hasInterest(msg))
-                {
-                    sub.enqueueForPreDelivery(msg, true);
-                }
-            }
-        }
-        _lock.unlock();
-    }
-
-    /**
-     * Only one thread should ever execute this method concurrently, but it can do so while other threads invoke
-     * deliver().
-     */
-    private void processQueue()
-    {
-        //record thread name
-        if (_log.isDebugEnabled())
-        {
-            _processingThreadName = Thread.currentThread().getName();
-        }
-
-        if (_log.isDebugEnabled())
-        {
-            _log.debug(debugIdentity() + "Running process Queue." + currentStatus());
-        }
-
-        // Continue to process delivery while we haveSubscribers and messages
-        boolean hasSubscribers = _subscriptions.hasActiveSubscribers();
-
-        while (hasSubscribers && hasQueuedMessages() && !_movingMessages.get())
-        {
-            hasSubscribers = false;
-
-            for (Subscription sub : _subscriptions.getSubscriptions())
-            {
-                synchronized (sub.getSendLock())
-                {
-                    if (!sub.isSuspended())
-                    {
-                        sendNextMessage(sub, _queue);
-
-                        hasSubscribers = true;
-                    }
-                }
-            }
-        }
-
-        if (_log.isDebugEnabled())
-        {
-            _log.debug(debugIdentity() + "Done process Queue." + currentStatus());
-        }
-
-    }
-
-    public void deliver(StoreContext context, AMQShortString name, AMQMessage msg, boolean deliverFirst) throws AMQException
-    {
-
-        final boolean debugEnabled = _log.isDebugEnabled();
-        if (debugEnabled)
-        {
-            _log.debug(debugIdentity() + "deliver :first(" + deliverFirst + ") :" + msg);
-        }
-
-        //Check if we have someone to deliver the message to.
-        _lock.lock();
-        try
-        {
-            Subscription s = _subscriptions.nextSubscriber(msg);
-
-            if (s == null || hasQueuedMessages()) //no-one can take the message right now or we're queueing
-            {
-                if (debugEnabled)
-                {
-                    _log.debug(debugIdentity() + "Testing Message(" + msg + ") for Queued Delivery:" + currentStatus());
-                }
-                if (!msg.getMessagePublishInfo().isImmediate())
-                {
-                    addMessageToQueue(msg, deliverFirst);
-
-                    //release lock now message is on queue.
-                    _lock.unlock();
-
-                    //Pre Deliver to all subscriptions
-                    if (debugEnabled)
-                    {
-                        _log.debug(debugIdentity() + "We have " + _subscriptions.getSubscriptions().size() +
-                                   " subscribers to give the message to:" + currentStatus());
-                    }
-                    for (Subscription sub : _subscriptions.getSubscriptions())
-                    {
-
-                        // stop if the message gets delivered whilst PreDelivering if we have a shared queue.
-                        if (_queue.isShared() && msg.getDeliveredToConsumer())
-                        {
-                            if (debugEnabled)
-                            {
-                                _log.debug(debugIdentity() + "Stopping PreDelivery as message(" + System.identityHashCode(msg) +
-                                           ") is already delivered.");
-                            }
-                            continue;
-                        }
-
-                        // Only give the message to those that want them.
-                        if (sub.hasInterest(msg))
-                        {
-                            if (debugEnabled)
-                            {
-                                _log.debug(debugIdentity() + "Queuing message(" + System.identityHashCode(msg) +
-                                           ") for PreDelivery for subscriber(" + System.identityHashCode(sub) + ")");
-                            }
-                            sub.enqueueForPreDelivery(msg, deliverFirst);
-                        }
-                    }
-                }
-            }
-            else
-            {
-
-                if (_messages.size() > 0)
-                {
-                    _log.error("Direct delivery with queued msgs:" + _messages.size());
-                }
-
-                //release lock now
-                _lock.unlock();
-                synchronized (s.getSendLock())
-                {
-                    if (!s.isSuspended())
-                    {
-                        if (_log.isTraceEnabled())
-                        {
-                            _log.trace(debugIdentity() + "Delivering Message:" + msg.debugIdentity() + " to(" +
-                                       System.identityHashCode(s) + ") :" + s);
-                        }
-                        msg.taken(_queue, s);
-                        //Deliver the message
-                        s.send(msg, _queue);
-                    }
-                    else
-                    {
-                        if (debugEnabled)
-                        {
-                            _log.debug(debugIdentity() + " Subscription(" + System.identityHashCode(s) + ") became " +
-                                       "suspended between nextSubscriber and send for message:" + msg.debugIdentity());
-                        }
-                    }
-                }
-
-                if (!msg.isTaken(_queue))
-                {
-                    if (debugEnabled)
-                    {
-                        _log.debug(debugIdentity() + " Message(" + msg.debugIdentity() + ") has not been taken so recursing!:" +
-                                   " Subscriber:" + System.identityHashCode(s));
-                    }
-
-                    deliver(context, name, msg, deliverFirst);
-                }
-                else
-                {
-                    if (debugEnabled)
-                    {
-                        _log.debug(debugIdentity() + " Message(" + msg.toString() +
-                                   ") has been taken so disregarding deliver request to Subscriber:" +
-                                   System.identityHashCode(s));
-                    }
-                }
-            }
-
-        }
-        finally
-        {
-            //ensure lock is released
-            if (_lock.isHeldByCurrentThread())
-            {
-                _lock.unlock();
-            }
-        }
-    }
-
-    private final String id = "(" + String.valueOf(System.identityHashCode(this)) + ")";
-
-    private String debugIdentity()
-    {
-        return id;
-    }
-
-    Runner asyncDelivery = new Runner();
-
-    private class Runner implements Runnable
-    {
-        public void run()
-        {
-            boolean running = true;
-            while (running && !_movingMessages.get())
-            {
-                processQueue();
-
-                //Check that messages have not been added since we did our last peek();
-                // Synchronize with the thread that adds to the queue.
-                // If the queue is still empty then we can exit
-
-                if (!(hasQueuedMessages() && _subscriptions.hasActiveSubscribers()))
-                {
-                    running = false;
-                    _processing.set(false);
-                }
-            }
-        }
-    }
-
-    public void processAsync(Executor executor)
-    {
-        if (_log.isDebugEnabled())
-        {
-            _log.debug(debugIdentity() + "Processing Async." + currentStatus());
-        }
-
-        if (hasQueuedMessages() && _subscriptions.hasActiveSubscribers())
-        {
-            //are we already running? if so, don't re-run
-            if (_processing.compareAndSet(false, true))
-            {
-                if (_log.isDebugEnabled())
-                {
-                    _log.debug(debugIdentity() + "Executing Async process.");
-                }
-                executor.execute(asyncDelivery);
-            }
-        }
-    }
-
-    private String currentStatus()
-    {
-        return " Queued:" + (_messages.isEmpty() ? "Empty " : "Contains(M:H)") +
-               "(" + _messages.size() + ":" + ((ConcurrentLinkedMessageQueueAtomicSize) _messages).headSize() + ") " +
-               " Extra: " + (_hasContent.isEmpty() ? "Empty " : "Contains") +
-               "(" + _hasContent.size() + ":" + _extraMessages.get() + ") " +
-               " Active:" + _subscriptions.hasActiveSubscribers() +
-               " Processing:" + (_processing.get() ? " true : Processing Thread: " + _processingThreadName : " false");
-    }
-
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/DefaultQueueRegistry.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/DefaultQueueRegistry.java
deleted file mode 100644
index cbe9246f09..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/DefaultQueueRegistry.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.queue;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.server.virtualhost.VirtualHost;
-
-import java.util.Collection;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-
-public class DefaultQueueRegistry implements QueueRegistry
-{
-    private ConcurrentMap<AMQShortString, AMQQueue> _queueMap = new ConcurrentHashMap<AMQShortString, AMQQueue>();
-
-    private final VirtualHost _virtualHost;
-
-    public DefaultQueueRegistry(VirtualHost virtualHost)
-    {
-        _virtualHost = virtualHost;
-    }
-
-    public VirtualHost getVirtualHost()
-    {
-        return _virtualHost;
-    }
-
-    public void registerQueue(AMQQueue queue) throws AMQException
-    {
-        _queueMap.put(queue.getName(), queue);
-    }
-
-    public void unregisterQueue(AMQShortString name) throws AMQException
-    {
-        _queueMap.remove(name);
-    }
-
-    public AMQQueue getQueue(AMQShortString name)
-    {
-        return _queueMap.get(name);
-    }
-
-    public Collection<AMQShortString> getQueueNames()
-    {
-        return _queueMap.keySet();
-    }
-
-    public Collection<AMQQueue> getQueues()
-    {
-        return _queueMap.values();
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/DeliveryManager.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/DeliveryManager.java
deleted file mode 100644
index 10ba48552c..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/DeliveryManager.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.queue;
-
-import java.util.List;
-import java.util.concurrent.Executor;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.server.AMQChannel;
-import org.apache.qpid.server.protocol.AMQProtocolSession;
-import org.apache.qpid.server.store.StoreContext;
-
-interface DeliveryManager
-{
-    /**
-     * Determines whether there are queued messages. Sets _queueing to false if there are no queued messages. This needs
-     * to be atomic.
-     *
-     * @return true if there are queued messages
-     */
-    boolean hasQueuedMessages();
-
-    /**
-     * This method should not be used to determin if there are messages in the queue.
-     *
-     * @return int The number of messages in the queue
-     *
-     * @use hasQueuedMessages() for all controls relating to having messages on the queue.
-     */
-    int getQueueMessageCount();
-
-    /**
-     * Requests that the delivery manager start processing the queue asynchronously if there is work that can be done
-     * (i.e. there are messages queued up and subscribers that can receive them. <p/> This should be called when
-     * subscribers are added, but only after the consume-ok message has been returned as message delivery may start
-     * immediately. It should also be called after unsuspending a client. <p/>
-     *
-     * @param executor the executor on which the delivery should take place
-     */
-    void processAsync(Executor executor);
-
-    /**
-     * Handles message delivery. The delivery manager is always in one of two modes; it is either queueing messages for
-     * asynchronous delivery or delivering directly.
-     *
-     * @param storeContext
-     * @param name         the name of the entity on whose behalf we are delivering the message
-     * @param msg          the message to deliver
-     * @param deliverFirst
-     *
-     * @throws org.apache.qpid.server.queue.FailedDequeueException
-     *          if the message could not be dequeued
-     */
-    void deliver(StoreContext storeContext, AMQShortString name, AMQMessage msg, boolean deliverFirst) throws FailedDequeueException, AMQException;
-
-    void removeAMessageFromTop(StoreContext storeContext) throws AMQException;
-
-    long clearAllMessages(StoreContext storeContext) throws AMQException;
-
-    void startMovingMessages();
-
-    void enqueueMovedMessages(StoreContext context, List<AMQMessage> messageList);
-
-    void stopMovingMessages();
-
-    void removeMovedMessages(List<AMQMessage> messageListToRemove);
-
-    List<AMQMessage> getMessages();
-
-    List<AMQMessage> getMessages(long fromMessageId, long toMessageId);
-
-    void populatePreDeliveryQueue(Subscription subscription);
-
-    boolean performGet(AMQProtocolSession session, AMQChannel channel, boolean acks) throws AMQException;
-
-    long getTotalMessageSize();
-
-    long getOldestMessageArrival();
-
-    void subscriberHasPendingResend(boolean hasContent, Subscription subscription, AMQMessage msg);
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/ExchangeBindings.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/ExchangeBindings.java
deleted file mode 100644
index a950678487..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/ExchangeBindings.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.queue;
-
-import java.util.HashSet;
-import java.util.List;
-import java.util.concurrent.CopyOnWriteArrayList;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.framing.FieldTable;
-import org.apache.qpid.server.exchange.Exchange;
-
-/**
- * When a queue is deleted, it should be deregistered from any
- * exchange it has been bound to. This class assists in this task,
- * by keeping track of all bindings for a given queue.
- */
-class ExchangeBindings
-{
-    private static final FieldTable EMPTY_ARGUMENTS = new FieldTable();
-
-    static class ExchangeBinding
-    {
-        private final Exchange _exchange;
-        private final AMQShortString _routingKey;
-        private final FieldTable _arguments;
-
-        ExchangeBinding(AMQShortString routingKey, Exchange exchange)
-        {
-            this(routingKey, exchange,EMPTY_ARGUMENTS);
-        }
-
-        ExchangeBinding(AMQShortString routingKey, Exchange exchange, FieldTable arguments)
-        {
-            _routingKey = routingKey;
-            _exchange = exchange;
-            _arguments = arguments == null ? EMPTY_ARGUMENTS : arguments;
-        }
-
-        void unbind(AMQQueue queue) throws AMQException
-        {
-            _exchange.deregisterQueue(_routingKey, queue, _arguments);
-        }
-
-        public Exchange getExchange()
-        {
-            return _exchange;
-        }
-
-        public AMQShortString getRoutingKey()
-        {
-            return _routingKey;
-        }
-
-        public int hashCode()
-        {
-            return (_exchange == null ? 0 : _exchange.hashCode())
-                   + (_routingKey == null ? 0 : _routingKey.hashCode())
-                   + (_arguments == null ? 0 : _arguments.hashCode());
-        }
-
-        public boolean equals(Object o)
-        {
-            if (!(o instanceof ExchangeBinding))
-            {
-                return false;
-            }
-            ExchangeBinding eb = (ExchangeBinding) o;
-            return _exchange.equals(eb._exchange)
-                   && _routingKey.equals(eb._routingKey)
-                   && _arguments.equals(eb._arguments);
-        }
-    }
-
-    private final List<ExchangeBinding> _bindings = new CopyOnWriteArrayList<ExchangeBinding>();
-    private final AMQQueue _queue;
-
-    ExchangeBindings(AMQQueue queue)
-    {
-        _queue = queue;
-    }
-
-    /**
-     * Adds the specified binding to those being tracked.
-     * @param routingKey the routing key with which the queue whose bindings
-     * are being tracked by the instance has been bound to the exchange
-     * @param exchange the exchange bound to
-     */
-    void addBinding(AMQShortString routingKey, FieldTable arguments, Exchange exchange)
-    {
-        _bindings.add(new ExchangeBinding(routingKey, exchange, arguments));
-    }
-
-
-    public void remove(AMQShortString routingKey, FieldTable arguments, Exchange exchange)
-    {
-        _bindings.remove(new ExchangeBinding(routingKey, exchange, arguments));
-    }
-
-
-    /**
-     * Deregisters this queue from any exchange it has been bound to
-     */
-    void deregister() throws AMQException
-    {
-        //remove duplicates at this point
-        HashSet<ExchangeBinding> copy = new HashSet<ExchangeBinding>(_bindings);
-        for (ExchangeBinding b : copy)
-        {
-            b.unbind(_queue);
-        }
-    }
-
-    List<ExchangeBinding> getExchangeBindings()
-    {
-        return _bindings;
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/ExistingExclusiveSubscriptionException.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/ExistingExclusiveSubscriptionException.java
deleted file mode 100644
index a5ff9e6326..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/ExistingExclusiveSubscriptionException.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.apache.qpid.server.queue;

-

-import org.apache.qpid.AMQException;

-

-/**

- * ExistingExclusiveSubscriptionException signals a failure to create a subscription, because an exclusive subscription

- * already exists.

- *

- * <p/><table id="crc"><caption>CRC Card</caption>

- * <tr><th> Responsibilities <th> Collaborations

- * <tr><td> Represent failure to create a subscription, because an exclusive subscription already exists.

- * </table>

- *

- * @todo Not an AMQP exception as no status code.

- */

-public final class ExistingExclusiveSubscriptionException extends AMQException

-{

-    public ExistingExclusiveSubscriptionException()

-    {

-        super(null, "", null);

-    }

-}

diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/ExistingSubscriptionPreventsExclusiveException.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/ExistingSubscriptionPreventsExclusiveException.java
deleted file mode 100644
index a13686eb56..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/ExistingSubscriptionPreventsExclusiveException.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.apache.qpid.server.queue;

-

-import org.apache.qpid.AMQException;

-

-/**

- * ExistingSubscriptionPreventsExclusiveException signals a failure to create an exclusize subscription, as a subscription

- * already exists.

- *

- * <p/><table id="crc"><caption>CRC Card</caption>

- * <tr><th> Responsibilities <th> Collaborations

- * <tr><td> Represent failure to create an exclusize subscription, as a subscription already exists.

- * </table>

- *

- * @todo Not an AMQP exception as no status code.

- */

-public final class ExistingSubscriptionPreventsExclusiveException extends AMQException

-{

-    public ExistingSubscriptionPreventsExclusiveException()

-    {

-        super(null, "", null);

-    }

-}

diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/FailedDequeueException.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/FailedDequeueException.java
deleted file mode 100644
index d5c34152a8..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/FailedDequeueException.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.queue;
-
-import org.apache.qpid.AMQException;
-
-/**
- * Signals that the dequeue of a message from a queue failed.
- *
- * <p/><table id="crc"><caption>CRC Card</caption>
- * <tr><th> Responsibilities <th> Collaborations
- * <tr><td> Indicates the a message could not be dequeued from a queue.
- * <tr><td>
- * </table>
- *
- * @todo Not an AMQP exception as no status code.
- *
- * @todo Happens as a consequence of a message store failure, or reference counting error. Both of which migh become
- *       runtime exceptions, as unrecoverable conditions? In which case this one might be dropped too.
- */
-public class FailedDequeueException extends AMQException
-{
-    public FailedDequeueException(String queue, Throwable cause)
-    {
-        super(null, "Failed to dequeue message from " + queue, cause);
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/InMemoryMessageHandle.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/InMemoryMessageHandle.java
deleted file mode 100644
index c81360e7d4..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/InMemoryMessageHandle.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.queue;
-
-import java.util.LinkedList;
-import java.util.List;
-import java.nio.ByteBuffer;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.BasicContentHeaderProperties;
-import org.apache.qpid.framing.ContentBody;
-import org.apache.qpid.framing.ContentHeaderBody;
-import org.apache.qpid.framing.abstraction.MessagePublishInfo;
-import org.apache.qpid.framing.abstraction.ContentChunk;
-import org.apache.qpid.server.store.StoreContext;
-
-/**
- */
-public class InMemoryMessageHandle implements AMQMessageHandle
-{
-
-    private ContentHeaderBody _contentHeaderBody;
-
-    private MessagePublishInfo _messagePublishInfo;
-
-    private List<ContentChunk> _contentBodies = new LinkedList<ContentChunk>();
-
-    private boolean _redelivered;
-
-    private long _arrivalTime;
-
-    // the message payload
-    private byte[] _payload;
-    // a buffer to write the payload
-    ByteBuffer _buffer;
-
-    public InMemoryMessageHandle()
-    {
-    }
-
-    public ContentHeaderBody getContentHeaderBody(StoreContext context, Long messageId) throws AMQException
-    {
-        return _contentHeaderBody;
-    }
-
-    public int getBodyCount(StoreContext context, Long messageId)
-    {
-        return _contentBodies.size();
-    }
-
-    public long getBodySize(StoreContext context, Long messageId) throws AMQException
-    {
-        return getContentHeaderBody(context, messageId).bodySize;
-    }
-
-    public ContentChunk getContentChunk(StoreContext context, Long messageId, int index) throws AMQException, IllegalArgumentException
-    {
-        if (index > _contentBodies.size() - 1)
-        {
-            throw new IllegalArgumentException("Index " + index + " out of valid range 0 to " +
-                                               (_contentBodies.size() - 1));
-        }
-        return _contentBodies.get(index);
-    }
-
-    public void addContentBodyFrame(StoreContext storeContext, Long messageId, ContentChunk contentBody, boolean isLastContentBody)
-            throws AMQException
-    {
-        _contentBodies.add(contentBody);
-    }
-
-    public MessagePublishInfo getMessagePublishInfo(StoreContext context, Long messageId) throws AMQException
-    {
-        return _messagePublishInfo;
-    }
-
-    public boolean isRedelivered()
-    {
-        return _redelivered;
-    }
-
-
-    public void setRedelivered(boolean redelivered)
-    {
-        _redelivered = redelivered;
-    }
-
-    public boolean isPersistent(StoreContext context, Long messageId) throws AMQException
-    {
-        //todo remove literal values to a constant file such as AMQConstants in common
-        ContentHeaderBody chb = getContentHeaderBody(context, messageId);
-        return chb.properties instanceof BasicContentHeaderProperties &&
-               ((BasicContentHeaderProperties) chb.properties).getDeliveryMode() == 2;
-    }
-
-    /**
-     * This is called when all the content has been received.
-     * @param messagePublishInfo
-     * @param contentHeaderBody
-     * @throws AMQException
-     */
-    public void setPublishAndContentHeaderBody(StoreContext storeContext, Long messageId, MessagePublishInfo messagePublishInfo,
-                                               ContentHeaderBody contentHeaderBody)
-            throws AMQException
-    {
-        _messagePublishInfo = messagePublishInfo;
-        _contentHeaderBody = contentHeaderBody;
-        _arrivalTime = System.currentTimeMillis();
-    }
-
-    public void removeMessage(StoreContext storeContext, Long messageId) throws AMQException
-    {
-        // NO OP
-    }
-
-    public void enqueue(StoreContext storeContext, Long messageId, AMQQueue queue) throws AMQException
-    {
-        // NO OP
-    }
-
-    public void dequeue(StoreContext storeContext, Long messageId, AMQQueue queue) throws AMQException
-    {
-        // NO OP
-    }
-
-    public long getArrivalTime()
-    {
-        return _arrivalTime;
-    }
-
-
-    // added by Arnaud
-    public byte[] getMessagePayload()
-    {
-         if (_payload == null)
-        {
-            int bodySize = (int) _contentHeaderBody.bodySize;
-            _buffer = ByteBuffer.allocate(bodySize);
-            _payload = new byte[bodySize];
-            for (ContentChunk contentBody : _contentBodies)
-            {
-                int chunkSize = contentBody.getSize();
-                byte[] chunk = new byte[chunkSize];
-                contentBody.getData().get(chunk);
-                _buffer.put(chunk);
-            }
-            _buffer.get(_payload);
-        }
-        return _payload;
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/ManagedQueue.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/ManagedQueue.java
deleted file mode 100644
index 061ab56024..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/ManagedQueue.java
+++ /dev/null
@@ -1,245 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.queue;
-
-import java.io.IOException;
-
-import javax.management.JMException;
-import javax.management.MBeanOperationInfo;
-import javax.management.openmbean.CompositeData;
-import javax.management.openmbean.TabularData;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.server.management.MBeanAttribute;
-import org.apache.qpid.server.management.MBeanOperation;
-import org.apache.qpid.server.management.MBeanOperationParameter;
-
-/**
- * The management interface exposed to allow management of a queue.
- * @author  Robert J. Greig
- * @author  Bhupendra Bhardwaj
- * @version 0.1
- */
-public interface ManagedQueue
-{
-    static final String TYPE = "Queue";
-
-    /**
-     * Returns the Name of the ManagedQueue.
-     * @return the name of the managedQueue.
-     * @throws IOException
-     */
-    @MBeanAttribute(name="Name", description = TYPE + " Name")
-    String getName() throws IOException;
-
-    /**
-     * Total number of messages on the queue, which are yet to be delivered to the consumer(s).
-     * @return number of undelivered message in the Queue.
-     * @throws IOException
-     */
-    @MBeanAttribute(name="MessageCount", description = "Total number of undelivered messages on the queue")
-    Integer getMessageCount() throws IOException;
-
-    /**
-     * Tells the total number of messages receieved by the queue since startup.
-     * @return total number of messages received.
-     * @throws IOException
-     */
-    @MBeanAttribute(name="ReceivedMessageCount", description="The total number of messages receieved by the queue since startup")
-    Long getReceivedMessageCount() throws IOException;
-
-    /**
-     * Size of messages in the queue
-     * @return
-     * @throws IOException
-     */
-    @MBeanAttribute(name="QueueDepth", description="Size of messages(KB) in the queue")
-    Long getQueueDepth() throws IOException, JMException;
-
-    /**
-     *  Returns the total number of active subscribers to the queue.
-     * @return the number of active subscribers
-     * @throws IOException
-     */
-    @MBeanAttribute(name="ActiveConsumerCount", description="The total number of active subscribers to the queue")
-    Integer getActiveConsumerCount() throws IOException;
-
-    /**
-     * Returns the total number of subscribers to the queue.
-     * @return the number of subscribers.
-     * @throws IOException
-     */
-    @MBeanAttribute(name="ConsumerCount", description="The total number of subscribers to the queue")
-    Integer getConsumerCount() throws IOException;
-
-    /**
-     * Tells the Owner of the ManagedQueue.
-     * @return the owner's name.
-     * @throws IOException
-     */
-    @MBeanAttribute(name="Owner", description = "Owner")
-    String getOwner() throws IOException;
-
-    /**
-     * Tells whether this ManagedQueue is durable or not.
-     * @return true if this ManagedQueue is a durable queue.
-     * @throws IOException
-     */
-    @MBeanAttribute(name="Durable", description = "true if the AMQQueue is durable")
-    boolean isDurable() throws IOException;
-
-    /**
-     * Tells if the ManagedQueue is set to AutoDelete.
-     * @return  true if the ManagedQueue is set to AutoDelete.
-     * @throws IOException
-     */
-    @MBeanAttribute(name="AutoDelete", description = "true if the AMQQueue is AutoDelete")
-    boolean isAutoDelete() throws IOException;
-
-    /**
-     * Returns the maximum age of a message (expiration time)
-     * @return the maximum age
-     * @throws IOException
-     */
-    Long getMaximumMessageAge() throws IOException;
-
-    /**
-     * Sets the maximum age of a message
-     * @param age  maximum age of message.
-     * @throws IOException
-     */
-    @MBeanAttribute(name="MaximumMessageAge", description="Threshold high value for message age on thr broker")
-    void setMaximumMessageAge(Long age) throws IOException;
-
-    /**
-     * Returns the maximum size of a message (in kbytes) allowed to be accepted by the
-     * ManagedQueue. This is useful in setting notifications or taking
-     * appropriate action, if the size of the message received is more than
-     * the allowed size.
-     * @return the maximum size of a message allowed to be aceepted by the
-     *         ManagedQueue.
-     * @throws IOException
-     */
-    Long getMaximumMessageSize() throws IOException;
-
-    /**
-     * Sets the maximum size of the message (in kbytes) that is allowed to be
-     * accepted by the Queue.
-     * @param size  maximum size of message.
-     * @throws IOException
-     */
-    @MBeanAttribute(name="MaximumMessageSize", description="Threshold high value(KB) for a message size")
-    void setMaximumMessageSize(Long size) throws IOException;
-
-    /**
-     * Tells the maximum number of messages that can be stored in the queue.
-     * This is useful in setting the notifications or taking required
-     * action is the number of message increase this limit.
-     * @return maximum muber of message allowed to be stored in the queue.
-     * @throws IOException
-     */
-    Long getMaximumMessageCount() throws IOException;
-
-    /**
-     * Sets the maximum number of messages allowed to be stored in the queue.
-     * @param value  the maximum number of messages allowed to be stored in the queue.
-     * @throws IOException
-     */
-    @MBeanAttribute(name="MaximumMessageCount", description="Threshold high value for number of undelivered messages in the queue")
-    void setMaximumMessageCount(Long value) throws IOException;
-
-    /**
-     * This is useful for setting notifications or taking required action if the size of messages
-     * stored in the queue increases over this limit.
-     * @return threshold high value for Queue Depth
-     * @throws IOException
-     */
-    Long getMaximumQueueDepth() throws IOException;
-
-    /**
-     * Sets the maximum size of all the messages together, that can be stored
-     * in the queue.
-     * @param value
-     * @throws IOException
-     */
-    @MBeanAttribute(name="MaximumQueueDepth", description="The threshold high value(KB) for Queue Depth")
-    void setMaximumQueueDepth(Long value) throws IOException;
-
-
-
-    //********** Operations *****************//
-
-
-    /**
-     * Returns a subset of all the messages stored in the queue. The messages
-     * are returned based on the given index numbers.
-     * @param fromIndex
-     * @param toIndex
-     * @return
-     * @throws IOException
-     * @throws JMException
-     */
-    @MBeanOperation(name="viewMessages",
-                    description="Message headers for messages in this queue within given index range. eg. from index 1 - 100")
-    TabularData viewMessages(@MBeanOperationParameter(name="from index", description="from index")int fromIndex,
-                             @MBeanOperationParameter(name="to index", description="to index")int toIndex)
-            throws IOException, JMException, AMQException;
-
-    @MBeanOperation(name="viewMessageContent", description="The message content for given Message Id")
-    CompositeData viewMessageContent(@MBeanOperationParameter(name="Message Id", description="Message Id")long messageId)
-        throws IOException, JMException;
-
-    /**
-     * Deletes the first message from top.
-     * @throws IOException
-     * @throws JMException
-     */
-    @MBeanOperation(name="deleteMessageFromTop", description="Deletes the first message from top",
-                    impact= MBeanOperationInfo.ACTION)
-    void deleteMessageFromTop() throws IOException, JMException;
-
-    /**
-     * Clears the queue by deleting all the undelivered messages from the queue.
-     * @throws IOException
-     * @throws JMException
-     */
-    @MBeanOperation(name="clearQueue",
-                    description="Clears the queue by deleting all the undelivered messages from the queue",
-                    impact= MBeanOperationInfo.ACTION)
-    void clearQueue() throws IOException, JMException;
-
-    /**
-     * Moves the messages in given range of message Ids to given Queue. QPID-170
-     * @param fromMessageId  first in the range of message ids
-     * @param toMessageId    last in the range of message ids
-     * @param toQueue        where the messages are to be moved
-     * @throws IOException
-     * @throws JMException
-     * @throws AMQException
-     */
-    @MBeanOperation(name="moveMessages",
-                    description="You can move messages to another queue from this queue ",
-                    impact= MBeanOperationInfo.ACTION)
-    void moveMessages(@MBeanOperationParameter(name="from MessageId", description="from MessageId")long fromMessageId,
-                      @MBeanOperationParameter(name="to MessageId", description="to MessageId")long toMessageId,
-                      @MBeanOperationParameter(name= ManagedQueue.TYPE, description="to Queue Name")String toQueue)
-            throws IOException, JMException, AMQException;
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/MessageCleanupException.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/MessageCleanupException.java
deleted file mode 100644
index 2fdd2791b1..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/MessageCleanupException.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.queue;
-
-import org.apache.qpid.AMQException;
-
-/**
- * MessageCleanupException represents the failure to perform reference counting on messages correctly. This should not
- * happen, but there may be programming errors giving race conditions that cause the reference counting to go wrong.
- *
- * <p/><table id="crc"><caption>CRC Card</caption>
- * <tr><th> Responsibilities <th> Collaborations
- * <tr><td> Signals that the reference count of a message has gone below zero.
- * <tr><td> Indicates that a message store has lost a message which is still referenced.
- * </table>
- *
- * @todo Not an AMQP exception as no status code.
- *
- * @todo The race conditions leading to this error should be cleaned up, and a runtime exception used instead. If the
- *       message store loses messages, then something is seriously wrong and it would be sensible to terminate the
- *       broker. This may be disguising out of memory errors.
- */
-public class MessageCleanupException extends AMQException
-{
-    public MessageCleanupException(String message, Throwable cause)
-    {
-        super(null, message, cause);
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/MessageHandleFactory.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/MessageHandleFactory.java
deleted file mode 100644
index 35e43aa412..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/MessageHandleFactory.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.queue;
-
-import org.apache.qpid.server.store.MessageStore;
-import org.apache.qpid.server.messageStore.StorableMessage;
-
-/**
- * Constructs a message handle based on the publish body, the content header and the queue to which the message
- * has been routed.
- *
- */
-public class MessageHandleFactory
-{
-
-    public AMQMessageHandle createMessageHandle(MessageStore store, StorableMessage m, boolean persistent)
-    {
-        // just hardcoded for now
-        if (persistent)
-        {
-            return new WeakReferenceMessageHandle(store);
-             //DTX MessageStore
-//          return new StorableMessageHandle(store, m);
-        }
-        else
-        {
-            return new InMemoryMessageHandle();
-        }
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/MessageMetaData.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/MessageMetaData.java
deleted file mode 100644
index 6118a4c11f..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/MessageMetaData.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.queue;
-
-import org.apache.qpid.framing.ContentHeaderBody;
-import org.apache.qpid.framing.abstraction.MessagePublishInfo;
-
-/**
- * Encapsulates a publish body and a content header. In the context of the message store these are treated as a
- * single unit.
- */
-public class MessageMetaData
-{
-    private MessagePublishInfo _messagePublishInfo;
-
-    private ContentHeaderBody _contentHeaderBody;
-
-    private int _contentChunkCount;
-
-    private long _arrivalTime;
-
-    public MessageMetaData(MessagePublishInfo publishBody, ContentHeaderBody contentHeaderBody, int contentChunkCount)
-    {
-        this(publishBody,contentHeaderBody, contentChunkCount, System.currentTimeMillis());
-    }
-
-    public MessageMetaData(MessagePublishInfo publishBody, ContentHeaderBody contentHeaderBody, int contentChunkCount, long arrivalTime)
-    {
-        _contentHeaderBody = contentHeaderBody;
-        _messagePublishInfo = publishBody;
-        _contentChunkCount = contentChunkCount;
-        _arrivalTime = arrivalTime;
-    }
-
-    public int getContentChunkCount()
-    {
-        return _contentChunkCount;
-    }
-
-    public void setContentChunkCount(int contentChunkCount)
-    {
-        _contentChunkCount = contentChunkCount;
-    }
-
-    public ContentHeaderBody getContentHeaderBody()
-    {
-        return _contentHeaderBody;
-    }
-
-    public void setContentHeaderBody(ContentHeaderBody contentHeaderBody)
-    {
-        _contentHeaderBody = contentHeaderBody;
-    }
-
-    public MessagePublishInfo getMessagePublishInfo()
-    {
-        return _messagePublishInfo;
-    }
-
-    public void setMessagePublishInfo(MessagePublishInfo messagePublishInfo)
-    {
-        _messagePublishInfo = messagePublishInfo;
-    }
-
-    public long getArrivalTime()
-    {
-        return _arrivalTime;
-    }
-
-    public void setArrivalTime(long arrivalTime)
-    {
-        _arrivalTime = arrivalTime;
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/NoConsumersException.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/NoConsumersException.java
deleted file mode 100644
index afcdf062de..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/NoConsumersException.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.queue;
-
-import org.apache.qpid.protocol.AMQConstant;
-import org.apache.qpid.server.RequiredDeliveryException;
-
-/**
- * NoConsumersException is a {@link RequiredDeliveryException} that represents the failure case where an immediate
- * message cannot be delivered because there are presently no consumers for the message. The AMQP status code, 313, is
- * always used to report this condition.
- *
- * <p/><table id="crc"><caption>CRC Card</caption>
- * <tr><th> Responsibilities <th> Collaborations
- * <tr><td> Represent failure to deliver a message that must be delivered.
- * </table>
- */
-public class NoConsumersException extends RequiredDeliveryException
-{
-    public NoConsumersException(AMQMessage message, Throwable cause)
-    {
-        super("Immediate delivery is not possible.", message, cause);
-    }
-
-    public AMQConstant getReplyCode()
-    {
-        return AMQConstant.NO_CONSUMERS;
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/NotificationCheck.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/NotificationCheck.java
deleted file mode 100644
index 6b3d65661f..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/NotificationCheck.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*

- *

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- *

- *   http://www.apache.org/licenses/LICENSE-2.0

- *

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- *

- */

-package org.apache.qpid.server.queue;

-

-import org.apache.qpid.AMQException;

-

-public enum NotificationCheck

-{

-

-    MESSAGE_COUNT_ALERT

-    {

-        boolean notifyIfNecessary(AMQMessage msg, AMQQueue queue, QueueNotificationListener listener)

-        {

-            int msgCount = queue.getMessageCount();

-            final long maximumMessageCount = queue.getMaximumMessageCount();

-            if (maximumMessageCount!= 0 && msgCount >= maximumMessageCount)

-            {

-                listener.notifyClients(this, queue, msgCount + ": Maximum count on queue threshold ("+ maximumMessageCount +") breached.");

-                return true;

-            }

-            return false;

-        }

-    },

-    MESSAGE_SIZE_ALERT(true)

-    {

-        boolean notifyIfNecessary(AMQMessage msg, AMQQueue queue, QueueNotificationListener listener)

-        {

-            final long maximumMessageSize = queue.getMaximumMessageSize();

-            if(maximumMessageSize != 0)

-            {

-                // Check for threshold message size

-                long messageSize;

-                try

-                {

-                    messageSize = (msg == null) ? 0 : msg.getContentHeaderBody().bodySize;

-                }

-                catch (AMQException e)

-                {

-                    messageSize = 0;

-                }

-

-

-                if (messageSize >= maximumMessageSize)

-                {

-                    listener.notifyClients(this, queue, messageSize + "b : Maximum message size threshold ("+ maximumMessageSize +") breached. [Message ID=" + msg.getMessageId() + "]");

-                    return true;

-                }

-            }

-            return false;

-        }

-

-    },

-    QUEUE_DEPTH_ALERT

-    {

-        boolean notifyIfNecessary(AMQMessage msg, AMQQueue queue, QueueNotificationListener listener)

-        {

-            // Check for threshold queue depth in bytes

-            final long maximumQueueDepth = queue.getMaximumQueueDepth();

-

-            if(maximumQueueDepth != 0)

-            {

-                final long queueDepth = queue.getQueueDepth();

-

-                if (queueDepth >= maximumQueueDepth)

-                {

-                    listener.notifyClients(this, queue, (queueDepth>>10) + "Kb : Maximum queue depth threshold ("+(maximumQueueDepth>>10)+"Kb) breached.");

-                    return true;

-                }

-            }

-            return false;

-        }

-

-    },

-    MESSAGE_AGE_ALERT

-    {

-        boolean notifyIfNecessary(AMQMessage msg, AMQQueue queue, QueueNotificationListener listener)

-        {

-

-            final long maxMessageAge = queue.getMaximumMessageAge();

-            if(maxMessageAge != 0)

-            {

-                final long currentTime = System.currentTimeMillis();

-                final long thresholdTime = currentTime - maxMessageAge;

-                final long firstArrivalTime = queue.getOldestMessageArrivalTime();

-

-                if(firstArrivalTime < thresholdTime)

-                {

-                    long oldestAge = currentTime - firstArrivalTime;

-                    listener.notifyClients(this, queue, (oldestAge/1000) + "s : Maximum age on queue threshold ("+(maxMessageAge /1000)+"s) breached.");

-

-                    return true;

-                }

-            }

-            return false;

-                    

-        }

-

-    }

-    ;

-

-    private final boolean _messageSpecific;

-

-    NotificationCheck()

-    {

-        this(false);

-    }

-

-    NotificationCheck(boolean messageSpecific)

-    {

-        _messageSpecific = messageSpecific;

-    }

-

-    public boolean isMessageSpecific()

-    {

-        return _messageSpecific;

-    }

-

-    abstract boolean notifyIfNecessary(AMQMessage msg, AMQQueue queue, QueueNotificationListener listener);

-

-}

diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/QueueNotificationListener.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/QueueNotificationListener.java
deleted file mode 100644
index d2680ffcc8..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/QueueNotificationListener.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*

- *

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- *

- *   http://www.apache.org/licenses/LICENSE-2.0

- *

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- *

- */

-package org.apache.qpid.server.queue;

-

-public interface QueueNotificationListener

-{

-    void notifyClients(NotificationCheck notification, AMQQueue queue, String notificationMsg);

-}

diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/QueueRegistry.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/QueueRegistry.java
deleted file mode 100644
index 1210f0e97c..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/QueueRegistry.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.queue;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.server.virtualhost.VirtualHost;
-
-import java.util.Collection;
-
-public interface QueueRegistry
-{
-    VirtualHost getVirtualHost();
-
-    void registerQueue(AMQQueue queue) throws AMQException;
-
-    void unregisterQueue(AMQShortString name) throws AMQException;
-
-    AMQQueue getQueue(AMQShortString name);
-
-    Collection<AMQShortString> getQueueNames();
-
-    Collection<AMQQueue> getQueues();
-
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/StorableMessageHandle.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/StorableMessageHandle.java
deleted file mode 100644
index 8c20050027..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/StorableMessageHandle.java
+++ /dev/null
@@ -1,304 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.qpid.server.queue;
-
-import org.apache.log4j.Logger;
-import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.BasicContentHeaderProperties;
-import org.apache.qpid.framing.ContentHeaderBody;
-import org.apache.qpid.framing.abstraction.ContentChunk;
-import org.apache.qpid.framing.abstraction.MessagePublishInfo;
-import org.apache.qpid.protocol.AMQConstant;
-import org.apache.qpid.server.messageStore.MessageStore;
-import org.apache.qpid.server.messageStore.StorableMessage;
-import org.apache.qpid.server.store.StoreContext;
-
-import javax.transaction.xa.Xid;
-import java.nio.ByteBuffer;
-import java.util.LinkedList;
-import java.util.List;
-
-/**
- * Created by Arnaud Simon
- * Date: 25-Apr-2007
- * Time: 14:26:34
- */
-public class StorableMessageHandle implements AMQMessageHandle
-{
-    //========================================================================
-    // Static Constants
-    //========================================================================
-    // The logger for this class
-    private static final Logger _log = Logger.getLogger(StorableMessageHandle.class);
-
-    //========================================================================
-    // Instance Fields
-    //========================================================================
-    // the message store
-    final private MessageStore _messageStore;
-    // A reference on the message itself
-    final private StorableMessage _message;
-    // the message payload
-    private byte[] _payload;
-    // a buffer to write the payload
-    ByteBuffer _buffer;
-    // the ContentHeaderBody
-    private ContentHeaderBody _contentHeaderBody;
-    // the arrival time
-    private long _arrivalTime;
-    // Specify if this messag is redelivered
-    private boolean _redelivered;
-    // MessagePublishInfo
-    private MessagePublishInfo _messagePublishInfo;
-    // list of chunks
-    private List<ContentChunk> _chunks;
-
-    //========================================================================
-    // Constructors
-    //========================================================================
-
-    public StorableMessageHandle(MessageStore messageStore, StorableMessage message)
-    {
-        _messageStore = messageStore;
-        _message = message;
-    }
-
-    //========================================================================
-    // Interface AMQMessageHandle
-    //========================================================================
-    public ContentHeaderBody getContentHeaderBody(StoreContext context, Long messageId)
-            throws
-            AMQException
-    {
-        if (_contentHeaderBody == null)
-        {
-            // load it from the store
-            try
-            {
-                _contentHeaderBody = _messageStore.getContentHeaderBody(_message);
-            }
-            catch (Exception e)
-            {
-                throw new AMQException(AMQConstant.INTERNAL_ERROR, e.getMessage(), e);
-            }
-        }
-        return _contentHeaderBody;
-    }
-
-    public int getBodyCount(StoreContext context, Long messageId)
-            throws
-            AMQException
-    {
-        if (_chunks == null)
-        {
-            if (_message.isStaged())
-            {
-                loadChunks();
-            }
-            else
-            {
-                return 0;
-            }
-        }
-        return _chunks.size();
-    }
-
-    public long getBodySize(StoreContext context, Long messageId)
-            throws
-            AMQException
-    {
-        return _payload.length;
-    }
-
-    public ContentChunk getContentChunk(StoreContext context, Long messageId, int index)
-            throws
-            IllegalArgumentException,
-            AMQException
-    {
-        if (_chunks == null)
-        {
-            loadChunks();
-        }
-        return _chunks.get(index);
-    }
-
-    private void loadChunks()
-            throws
-            AMQException
-    {
-        try
-        {
-            _chunks = new LinkedList<ContentChunk>();
-            byte[] underlying = _messageStore.loadContent(_message, 1, 0);
-            final int size = underlying.length;
-            final org.apache.mina.common.ByteBuffer data =
-                    org.apache.mina.common.ByteBuffer.wrap(underlying);
-            ContentChunk cb = new ContentChunk()
-            {
-
-                public int getSize()
-                {
-                    return size;
-                }
-
-                public org.apache.mina.common.ByteBuffer getData()
-                {
-                    return data;
-                }
-
-                public void reduceToFit()
-                {
-
-                }
-            };
-            _chunks.add(cb);
-        }
-        catch (Exception e)
-        {
-            throw new AMQException(AMQConstant.INTERNAL_ERROR, e.getMessage(), e);
-        }
-    }
-
-    public void addContentBodyFrame(StoreContext storeContext, Long messageId, ContentChunk contentBody, boolean isLastContentBody)
-            throws
-            AMQException
-    {
-        if (_chunks == null)
-        {
-            _chunks = new LinkedList<ContentChunk>();
-        }
-        _chunks.add(contentBody);
-        // if rquired this message can be added to the store
-        //_messageStore.appendContent(_message, _payload, 0, 10);
-
-    }
-
-    public MessagePublishInfo getMessagePublishInfo(StoreContext context, Long messageId)
-            throws
-            AMQException
-    {
-        if (_messagePublishInfo == null)
-        {
-            // read it from the store
-            try
-            {
-
-                _messagePublishInfo = _messageStore.getMessagePublishInfo(_message);
-            }
-            catch (Exception e)
-            {
-                throw new AMQException(AMQConstant.INTERNAL_ERROR, e.getMessage(), e);
-            }
-        }
-        return _messagePublishInfo;
-    }
-
-    public boolean isRedelivered()
-    {
-        return _redelivered;
-    }
-
-    public void setRedelivered(boolean redelivered)
-    {
-        _redelivered = redelivered;
-    }
-
-    public boolean isPersistent(StoreContext context, Long messageId)
-            throws
-            AMQException
-    {
-        return _contentHeaderBody.properties instanceof BasicContentHeaderProperties &&
-               ((BasicContentHeaderProperties) _contentHeaderBody.properties).getDeliveryMode() == 2;
-    }
-
-    public void setPublishAndContentHeaderBody(StoreContext storeContext, Long messageId,
-                                               MessagePublishInfo messagePublishInfo,
-                                               ContentHeaderBody contentHeaderBody)
-            throws
-            AMQException
-    {
-        _contentHeaderBody = contentHeaderBody;
-        _arrivalTime = System.currentTimeMillis();
-        _messagePublishInfo = messagePublishInfo;
-    }
-
-    public void removeMessage(StoreContext storeContext, Long messageId)
-            throws
-            AMQException
-    {
-        //  This is already handled by the store but we can possibly do:
-        // _messageStore.destroy(_message);
-    }
-
-    public void enqueue(StoreContext storeContext, Long messageId, AMQQueue queue)
-            throws
-            AMQException
-    {
-        try
-        {
-            if (queue.isDurable())
-            {
-                _messageStore.enqueue((Xid) storeContext.getPayload(), _message, queue);
-            }
-        }
-        catch (Exception e)
-        {
-            throw new AMQException(null, "PRoblem during message enqueue", e);
-        }
-    }
-
-    public void dequeue(StoreContext storeContext, Long messageId, AMQQueue queue)
-            throws
-            AMQException
-    {
-        try
-        {
-            if (queue.isDurable())
-            {
-                _messageStore.dequeue((Xid) storeContext.getPayload(), _message, queue);
-            }
-        }
-        catch (Exception e)
-        {
-            throw new AMQException(null, "PRoblem during message dequeue", e);
-        }
-    }
-
-    public long getArrivalTime()
-    {
-        return _arrivalTime;
-    }
-
-    public byte[] getMessagePayload()
-    {
-        if (_payload == null)
-        {
-            int bodySize = (int) _contentHeaderBody.bodySize;
-            _payload = new byte[bodySize];
-            _buffer = ByteBuffer.wrap(_payload);
-            for (ContentChunk contentBody : _chunks)
-            {
-                int chunkSize = contentBody.getSize();
-                byte[] chunk = new byte[chunkSize];
-                contentBody.getData().get(chunk);
-                _buffer.put(chunk);
-            }
-        }
-        return _payload;
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/Subscription.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/Subscription.java
deleted file mode 100644
index 77688f19be..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/Subscription.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.queue;
-
-import java.util.Queue;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.server.AMQChannel;
-
-public interface Subscription
-{
-    void send(AMQMessage msg, AMQQueue queue) throws AMQException;
-
-    boolean isSuspended();
-
-    void queueDeleted(AMQQueue queue) throws AMQException;
-
-    boolean filtersMessages();
-
-    boolean hasInterest(AMQMessage msg);
-
-    Queue<AMQMessage> getPreDeliveryQueue();
-
-    Queue<AMQMessage> getResendQueue();
-
-    Queue<AMQMessage> getNextQueue(Queue<AMQMessage> messages);    
-
-    void enqueueForPreDelivery(AMQMessage msg, boolean deliverFirst);
-
-    boolean isAutoClose();
-
-    void close();
-
-    boolean isClosed();
-
-    boolean isBrowser();
-
-    boolean wouldSuspend(AMQMessage msg);
-
-    void addToResendQueue(AMQMessage msg);
-
-    Object getSendLock();
-
-    AMQChannel getChannel();
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SubscriptionFactory.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SubscriptionFactory.java
deleted file mode 100644
index 917f7c4e97..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SubscriptionFactory.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.queue;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.framing.FieldTable;
-import org.apache.qpid.server.protocol.AMQProtocolSession;
-
-/**
- * Allows the customisation of the creation of a subscription. This is typically done within an AMQQueue. This factory
- * primarily assists testing although in future more sophisticated subscribers may need a different subscription
- * implementation.
- *
- * @see org.apache.qpid.server.queue.AMQQueue
- */
-public interface SubscriptionFactory
-{
-    Subscription createSubscription(int channel, AMQProtocolSession protocolSession, AMQShortString consumerTag, boolean acks,
-                                    FieldTable filters, boolean noLocal, AMQQueue queue) throws AMQException;
-
-
-    Subscription createSubscription(int channel, AMQProtocolSession protocolSession, AMQShortString consumerTag)
-            throws AMQException;
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SubscriptionImpl.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SubscriptionImpl.java
deleted file mode 100644
index 1cebf08fa6..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SubscriptionImpl.java
+++ /dev/null
@@ -1,676 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.queue;
-
-import java.util.Queue;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import org.apache.log4j.Logger;
-import org.apache.qpid.AMQException;
-import org.apache.qpid.protocol.AMQConstant;
-import org.apache.qpid.common.AMQPFilterTypes;
-import org.apache.qpid.common.ClientProperties;
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.framing.FieldTable;
-import org.apache.qpid.server.AMQChannel;
-import org.apache.qpid.server.output.ProtocolOutputConverter;
-import org.apache.qpid.server.filter.FilterManager;
-import org.apache.qpid.server.filter.FilterManagerFactory;
-import org.apache.qpid.server.protocol.AMQProtocolSession;
-import org.apache.qpid.server.store.StoreContext;
-import org.apache.qpid.util.ConcurrentLinkedQueueAtomicSize;
-import org.apache.qpid.util.MessageQueue;
-import org.apache.qpid.util.ConcurrentLinkedMessageQueueAtomicSize;
-
-/**
- * Encapsulation of a supscription to a queue. <p/> Ties together the protocol session of a subscriber, the consumer tag
- * that was given out by the broker and the channel id. <p/>
- */
-public class SubscriptionImpl implements Subscription
-{
-
-    private static final Logger _suspensionlogger = Logger.getLogger("Suspension");
-    private static final Logger _logger = Logger.getLogger(SubscriptionImpl.class);
-
-    public final AMQChannel channel;
-
-    public final AMQProtocolSession protocolSession;
-
-    public final AMQShortString consumerTag;
-
-    private final Object _sessionKey;
-
-    private MessageQueue<AMQMessage> _messages;
-
-    private Queue<AMQMessage> _resendQueue;
-
-    private final boolean _noLocal;
-
-    /** True if messages need to be acknowledged */
-    private final boolean _acks;
-    private FilterManager _filters;
-    private final boolean _isBrowser;
-    private final Boolean _autoClose;
-    private boolean _sentClose = false;
-
-    private static final String CLIENT_PROPERTIES_INSTANCE = ClientProperties.instance.toString();
-
-    private AMQQueue _queue;
-    private final AtomicBoolean _sendLock = new AtomicBoolean(false);
-
-
-    public static class Factory implements SubscriptionFactory
-    {
-        public Subscription createSubscription(int channel, AMQProtocolSession protocolSession,
-                                               AMQShortString consumerTag, boolean acks, FieldTable filters,
-                                               boolean noLocal, AMQQueue queue) throws AMQException
-        {
-            return new SubscriptionImpl(channel, protocolSession, consumerTag, acks, filters, noLocal, queue);
-        }
-
-        public SubscriptionImpl createSubscription(int channel, AMQProtocolSession protocolSession, AMQShortString consumerTag)
-                throws AMQException
-        {
-            return new SubscriptionImpl(channel, protocolSession, consumerTag, false, null, false, null);
-        }
-    }
-
-    public SubscriptionImpl(int channelId, AMQProtocolSession protocolSession,
-                            AMQShortString consumerTag, boolean acks)
-            throws AMQException
-    {
-        this(channelId, protocolSession, consumerTag, acks, null, false, null);
-    }
-
-    public SubscriptionImpl(int channelId, AMQProtocolSession protocolSession,
-                            AMQShortString consumerTag, boolean acks, FieldTable filters,
-                            boolean noLocal, AMQQueue queue)
-            throws AMQException
-    {
-        AMQChannel channel = protocolSession.getChannel(channelId);
-        if (channel == null)
-        {
-            throw new AMQException(AMQConstant.NOT_FOUND, "channel :" + channelId + " not found in protocol session", null);
-        }
-
-        this.channel = channel;
-        this.protocolSession = protocolSession;
-        this.consumerTag = consumerTag;
-        _sessionKey = protocolSession.getKey();
-        _acks = acks;
-        _noLocal = noLocal;
-        _queue = queue;
-
-        _filters = FilterManagerFactory.createManager(filters);
-
-
-        if (_filters != null)
-        {
-            Object isBrowser = filters.get(AMQPFilterTypes.NO_CONSUME.getValue());
-            if (isBrowser != null)
-            {
-                _isBrowser = (Boolean) isBrowser;
-            }
-            else
-            {
-                _isBrowser = false;
-            }
-        }
-        else
-        {
-            _isBrowser = false;
-        }
-
-
-        if (_filters != null)
-        {
-            Object autoClose = filters.get(AMQPFilterTypes.AUTO_CLOSE.getValue());
-            if (autoClose != null)
-            {
-                _autoClose = (Boolean) autoClose;
-            }
-            else
-            {
-                _autoClose = false;
-            }
-        }
-        else
-        {
-            _autoClose = false;
-        }
-
-
-        if (filtersMessages())
-        {
-            _messages = new ConcurrentLinkedMessageQueueAtomicSize<AMQMessage>();
-        }
-        else
-        {
-            // Reference the DeliveryManager
-            _messages = null;
-        }
-    }
-
-
-    public SubscriptionImpl(int channel, AMQProtocolSession protocolSession,
-                            AMQShortString consumerTag)
-            throws AMQException
-    {
-        this(channel, protocolSession, consumerTag, false);
-    }
-
-    public boolean equals(Object o)
-    {
-        return (o instanceof SubscriptionImpl) && equals((SubscriptionImpl) o);
-    }
-
-    /**
-     * Equality holds if the session matches and the channel and consumer tag are the same.
-     *
-     * @param psc The subscriptionImpl to compare
-     *
-     * @return equality
-     */
-    private boolean equals(SubscriptionImpl psc)
-    {
-        return _sessionKey.equals(psc._sessionKey)
-               && psc.channel == channel
-               && psc.consumerTag.equals(consumerTag);
-    }
-
-    public int hashCode()
-    {
-        return _sessionKey.hashCode();
-    }
-
-    public String toString()
-    {
-        String subscriber = "[channel=" + channel +
-                            ", consumerTag=" + consumerTag +
-                            ", session=" + protocolSession.getKey() +
-                            ", resendQueue=" + (_resendQueue != null);
-
-        if (_resendQueue != null)
-        {
-            subscriber += ", resendSize=" + _resendQueue.size();
-        }
-
-
-        return subscriber + "]";
-    }
-
-    /**
-     * This method can be called by each of the publisher threads. As a result all changes to the channel object must be
-     * thread safe.
-     *
-     * @param msg   The message to send
-     * @param queue the Queue it has been sent from
-     *
-     * @throws AMQException
-     */
-    public void send(AMQMessage msg, AMQQueue queue) throws AMQException
-    {
-        if (msg != null)
-        {
-            if (_isBrowser)
-            {
-                sendToBrowser(msg, queue);
-            }
-            else
-            {
-                sendToConsumer(channel.getStoreContext(), msg, queue);
-            }
-        }
-        else
-        {
-            _logger.error("Attempt to send Null message", new NullPointerException());
-        }
-    }
-
-    private void sendToBrowser(AMQMessage msg, AMQQueue queue) throws AMQException
-    {
-        // We don't decrement the reference here as we don't want to consume the message
-        // but we do want to send it to the client.
-
-        synchronized (channel)
-        {
-            long deliveryTag = channel.getNextDeliveryTag();
-
-            // We don't need to add the message to the unacknowledgedMap as we don't need to know if the client
-            // received the message. If it is lost in transit that is not important.
-//            if (_acks)
-//            {
-//                channel.addUnacknowledgedBrowsedMessage(msg, deliveryTag, consumerTag, queue);
-//            }
-
-            if (_sendLock.get())
-            {
-                _logger.error("Sending " + msg + " when subscriber(" + this + ") is closed!");
-            }
-
-            protocolSession.getProtocolOutputConverter().writeDeliver(msg, channel.getChannelId(), deliveryTag, consumerTag);
-        }
-    }
-
-    private void sendToConsumer(StoreContext storeContext, AMQMessage msg, AMQQueue queue)
-            throws AMQException
-    {
-        try
-        { // if we do not need to wait for client acknowledgements
-            // we can decrement the reference count immediately.
-
-            // By doing this _before_ the send we ensure that it
-            // doesn't get sent if it can't be dequeued, preventing
-            // duplicate delivery on recovery.
-
-            // The send may of course still fail, in which case, as
-            // the message is unacked, it will be lost.
-            if (!_acks)
-            {
-                if (_logger.isDebugEnabled())
-                {
-                    _logger.debug("No ack mode so dequeuing message immediately: " + msg.getMessageId());
-                }
-                queue.dequeue(storeContext, msg);
-            }
-
-            synchronized (channel)
-            {
-                long deliveryTag = channel.getNextDeliveryTag();
-
-                if (_sendLock.get())
-                {
-                    _logger.error("Sending " + msg + " when subscriber(" + this + ") is closed!");
-                }
-
-                if (_acks)
-                {
-                    channel.addUnacknowledgedMessage(msg, deliveryTag, consumerTag, queue);
-                }
-
-                protocolSession.getProtocolOutputConverter().writeDeliver(msg, channel.getChannelId(), deliveryTag, consumerTag);
-
-            }
-        }
-        finally
-        {
-            //Only set delivered if it actually was writen successfully..
-            // using a try->finally would set it even if an error occured.
-            // Is this what we want? 
-
-            msg.setDeliveredToConsumer();
-        }
-    }
-
-    public boolean isSuspended()
-    {
-//        if (_suspensionlogger.isInfoEnabled())
-//        {
-//            if (channel.isSuspended())
-//            {
-//                _suspensionlogger.debug("Subscription(" + debugIdentity() + ") channel's is susupended");
-//            }
-//            if (_sendLock.get())
-//            {
-//                _suspensionlogger.debug("Subscription(" + debugIdentity() + ") has sendLock set so closing.");
-//            }
-//        }
-        return channel.isSuspended() || _sendLock.get();
-    }
-
-    /**
-     * Callback indicating that a queue has been deleted.
-     *
-     * @param queue The queue to delete
-     */
-    public void queueDeleted(AMQQueue queue) throws AMQException
-    {
-        channel.queueDeleted(queue);
-    }
-
-    public boolean filtersMessages()
-    {
-        return _filters != null || _noLocal;
-    }
-
-    public boolean hasInterest(AMQMessage msg)
-    {
-        //check that the message hasn't been rejected
-        if (msg.isRejectedBy(this))
-        {
-            if (_logger.isDebugEnabled())
-            {
-                _logger.debug("Subscription:" + debugIdentity() + " rejected message:" + msg.debugIdentity());
-            }
-//            return false;
-        }
-
-        final AMQProtocolSession publisher = msg.getPublisher();
-
-        //todo - client id should be recoreded and this test removed but handled below
-        if (_noLocal && publisher != null)
-        {
-            // We don't want local messages so check to see if message is one we sent
-            Object localInstance;
-            Object msgInstance;
-
-            if ((protocolSession.getClientProperties() != null) &&
-                (localInstance = protocolSession.getClientProperties().getObject(CLIENT_PROPERTIES_INSTANCE)) != null)
-            {
-
-                if ((publisher.getClientProperties() != null) &&
-                    (msgInstance = publisher.getClientProperties().getObject(CLIENT_PROPERTIES_INSTANCE)) != null)
-                {
-                    if (localInstance == msgInstance || localInstance.equals(msgInstance))
-                    {
-//                        if (_logger.isTraceEnabled())
-//                        {
-//                            _logger.trace("(" + debugIdentity() + ") has no interest as it is a local message(" +
-//                                          msg.debugIdentity() + ")");
-//                        }
-                        return false;
-                    }
-                }
-            }
-            else
-            {
-
-                localInstance = protocolSession.getClientIdentifier();
-                //todo - client id should be recoreded and this test removed but handled here
-
-                msgInstance = publisher.getClientIdentifier();
-                if (localInstance == msgInstance || ((localInstance != null) && localInstance.equals(msgInstance)))
-                {
-//                    if (_logger.isTraceEnabled())
-//                    {
-//                        _logger.trace("(" + debugIdentity() + ") has no interest as it is a local message(" +
-//                                      msg.debugIdentity() + ")");
-//                    }
-                    return false;
-                }
-            }
-
-
-        }
-
-
-        if (_logger.isTraceEnabled())
-        {
-            _logger.trace("(" + debugIdentity() + ") checking filters for message (" + msg.debugIdentity());
-        }
-        return checkFilters(msg);
-
-    }
-
-    private String id = String.valueOf(System.identityHashCode(this));
-
-    private String debugIdentity()
-    {
-        return id;
-    }
-
-    private boolean checkFilters(AMQMessage msg)
-    {
-        if (_filters != null)
-        {
-//            if (_logger.isTraceEnabled())
-//            {
-//                _logger.trace("(" + debugIdentity() + ") has filters.");
-//            }
-            return _filters.allAllow(msg);
-        }
-        else
-        {
-//            if (_logger.isTraceEnabled())
-//            {
-//                _logger.trace("(" + debugIdentity() + ") has no filters");
-//            }
-
-            return true;
-        }
-    }
-
-    public Queue<AMQMessage> getPreDeliveryQueue()
-    {
-        return _messages;
-    }
-
-    public void enqueueForPreDelivery(AMQMessage msg, boolean deliverFirst)
-    {
-        if (_messages != null)
-        {
-            if (deliverFirst)
-            {
-                _messages.pushHead(msg);
-            }
-            else
-            {
-                _messages.offer(msg);
-            }
-        }
-    }
-
-    public boolean isAutoClose()
-    {
-        return _autoClose;
-    }
-
-    public void close()
-    {
-        boolean closed = false;
-        synchronized (_sendLock)
-        {
-            if (_logger.isDebugEnabled())
-            {
-                _logger.debug("Setting SendLock true:" + debugIdentity());
-            }
-
-            closed = _sendLock.getAndSet(true);
-        }
-
-        if (closed)
-        {
-            if (_logger.isDebugEnabled())
-            {
-                _logger.debug("Called close() on a closed subscription");
-            }
-
-            return;
-        }
-
-        if (_logger.isInfoEnabled())
-        {
-            _logger.info("Closing subscription (" + debugIdentity() + "):" + this);
-        }
-
-        if (_resendQueue != null && !_resendQueue.isEmpty())
-        {
-            if (_logger.isInfoEnabled())
-            {
-                _logger.info("Requeuing closing subscription (" + debugIdentity() + "):" + this);
-            }
-            requeue();
-        }
-
-        //remove references in PDQ
-        if (_messages != null)
-        {
-            if (_logger.isInfoEnabled())
-            {
-                _logger.info("Clearing PDQ (" + debugIdentity() + "):" + this);
-            }
-
-            _messages.clear();
-        }
-    }
-
-    private void autoclose()
-    {
-        close();
-
-        if (_autoClose && !_sentClose)
-        {
-            _logger.info("Closing autoclose subscription (" + debugIdentity() + "):" + this);
-
-            ProtocolOutputConverter converter = protocolSession.getProtocolOutputConverter();
-            converter.confirmConsumerAutoClose(channel.getChannelId(), consumerTag);
-            _sentClose = true;
-
-            //fixme JIRA do this better
-            try
-            {
-                channel.unsubscribeConsumer(protocolSession, consumerTag);
-            }
-            catch (AMQException e)
-            {
-                // Occurs if we cannot find the subscriber in the channel with protocolSession and consumerTag.
-            }
-        }
-    }
-
-    private void requeue()
-    {
-        if (_queue != null)
-        {
-            if (_logger.isDebugEnabled())
-            {
-                _logger.debug("Requeuing :" + _resendQueue.size() + " messages");
-            }
-
-            while (!_resendQueue.isEmpty())
-            {
-                AMQMessage resent = _resendQueue.poll();
-
-                if (_logger.isTraceEnabled())
-                {
-                    _logger.trace("Removed for resending:" + resent.debugIdentity());
-                }
-
-                resent.release(_queue);
-                _queue.subscriberHasPendingResend(false, this, resent);
-
-                try
-                {
-                    channel.getTransactionalContext().deliver(resent, _queue, true);
-                }
-                catch (AMQException e)
-                {
-                    _logger.error("MESSAGE LOSS : Unable to re-deliver messages", e);
-                }
-            }
-
-            if (!_resendQueue.isEmpty())
-            {
-                _logger.error("[MESSAGES LOST]Unable to re-deliver messages as queue is null.");
-            }
-
-            _queue.subscriberHasPendingResend(false, this, null);
-        }
-        else
-        {
-            if (!_resendQueue.isEmpty())
-            {
-                _logger.error("Unable to re-deliver messages as queue is null.");
-            }
-        }
-
-        // Clear the messages
-        _resendQueue = null;
-    }
-
-
-    public boolean isClosed()
-    {
-        return _sendLock.get(); // This rather than _close is used to signify the subscriber is now closed.
-    }
-
-    public boolean isBrowser()
-    {
-        return _isBrowser;
-    }
-
-    public boolean wouldSuspend(AMQMessage msg)
-    {
-        return channel.wouldSuspend(msg);
-    }
-
-    public Queue<AMQMessage> getResendQueue()
-    {
-        if (_resendQueue == null)
-        {
-            _resendQueue = new ConcurrentLinkedQueueAtomicSize<AMQMessage>();
-        }
-        return _resendQueue;
-    }
-
-
-    public Queue<AMQMessage> getNextQueue(Queue<AMQMessage> messages)
-    {
-        if (_resendQueue != null && !_resendQueue.isEmpty())
-        {
-            return _resendQueue;
-        }
-
-        if (filtersMessages())
-        {
-            if (isAutoClose())
-            {
-                if (_messages.isEmpty())
-                {
-                    autoclose();
-                    return null;
-                }
-            }
-            return _messages;
-        }
-        else // we want the DM queue
-        {
-            return messages;
-        }
-    }
-
-    public void addToResendQueue(AMQMessage msg)
-    {
-        // add to our resend queue
-        getResendQueue().add(msg);
-
-        // Mark Queue has having content.
-        if (_queue == null)
-        {
-            _logger.error("Queue is null won't be able to resend messages");
-        }
-        else
-        {
-            _queue.subscriberHasPendingResend(true, this, msg);
-        }
-    }
-
-    public Object getSendLock()
-    {
-        return _sendLock;
-    }
-
-    public AMQChannel getChannel()
-    {
-        return channel;
-    }
-
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SubscriptionManager.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SubscriptionManager.java
deleted file mode 100644
index 4df88baebc..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SubscriptionManager.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.queue;
-
-import java.util.List;
-
-/**
- * Abstraction of actor that will determine the subscriber to whom
- * a message will be sent.
- */
-public interface SubscriptionManager
-{
-    public List<Subscription> getSubscriptions();
-    public boolean hasActiveSubscribers();
-    public Subscription nextSubscriber(AMQMessage msg);
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SubscriptionSet.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SubscriptionSet.java
deleted file mode 100644
index b500247fa4..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SubscriptionSet.java
+++ /dev/null
@@ -1,229 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.queue;
-
-import java.util.List;
-import java.util.ListIterator;
-import java.util.concurrent.CopyOnWriteArrayList;
-
-import org.apache.log4j.Logger;
-import org.apache.qpid.AMQException;
-
-/** Holds a set of subscriptions for a queue and manages the round robin-ing of deliver etc. */
-class SubscriptionSet implements WeightedSubscriptionManager
-{
-    private static final Logger _log = Logger.getLogger(SubscriptionSet.class);
-
-    /** List of registered subscribers */
-    private List<Subscription> _subscriptions = new CopyOnWriteArrayList<Subscription>();
-
-    /** Used to control the round robin delivery of content */
-    private int _currentSubscriber;
-    private final Object _subscriptionsChange = new Object();
-
-
-    /** Accessor for unit tests. */
-    int getCurrentSubscriber()
-    {
-        return _currentSubscriber;
-    }
-
-    public void addSubscriber(Subscription subscription)
-    {
-        synchronized (_subscriptionsChange)
-        {
-            _subscriptions.add(subscription);
-        }
-    }
-
-    /**
-     * Remove the subscription, returning it if it was found
-     *
-     * @param subscription
-     *
-     * @return null if no match was found
-     */
-    public Subscription removeSubscriber(Subscription subscription)
-    {
-        // TODO: possibly need O(1) operation here.
-
-        Subscription sub = null;
-        synchronized (_subscriptionsChange)
-        {
-            int subIndex = _subscriptions.indexOf(subscription);
-
-            if (subIndex != -1)
-            {
-                //we can't just return the passed in subscription as it is a new object
-                // and doesn't contain the stored state we need.
-                //NOTE while this may be removed now anyone with an iterator will still have it in the list!!
-                sub = _subscriptions.remove(subIndex);
-            }
-            else
-            {
-                _log.error("Unable to remove from index(" + subIndex + ")subscription:" + subscription);
-            }
-        }
-        if (sub != null)
-        {
-            return sub;
-        }
-        else
-        {
-            debugDumpSubscription(subscription);
-            return null;
-        }
-    }
-
-    private void debugDumpSubscription(Subscription subscription)
-    {
-        if (_log.isDebugEnabled())
-        {
-            _log.debug("Subscription " + subscription + " not found. Dumping subscriptions:");
-            for (Subscription s : _subscriptions)
-            {
-                _log.debug("Subscription: " + s);
-            }
-            _log.debug("Subscription dump complete");
-        }
-    }
-
-    /**
-     * Return the next unsuspended subscription or null if not found. <p/> Performance note: This method can scan all
-     * items twice when looking for a subscription that is not suspended. The worst case occcurs when all subscriptions
-     * are suspended. However, it is does this without synchronisation and subscriptions may be added and removed
-     * concurrently. Also note that because of race conditions and when subscriptions are removed between calls to
-     * nextSubscriber, the IndexOutOfBoundsException also causes the scan to start at the beginning.
-     */
-    public Subscription nextSubscriber(AMQMessage msg)
-    {
-        if (_subscriptions.isEmpty())
-        {
-            return null;
-        }
-
-        try
-        {
-            final Subscription result = nextSubscriberImpl(msg);
-            if (result == null)
-            {
-                _currentSubscriber = 0;
-                return nextSubscriberImpl(msg);
-            }
-            else
-            {
-                return result;
-            }
-        }
-        catch (IndexOutOfBoundsException e)
-        {
-            _currentSubscriber = 0;
-            return nextSubscriber(msg);
-        }
-    }
-
-    private Subscription nextSubscriberImpl(AMQMessage msg)
-    {
-        final ListIterator<Subscription> iterator = _subscriptions.listIterator(_currentSubscriber);
-        while (iterator.hasNext())
-        {
-            Subscription subscription = iterator.next();
-            ++_currentSubscriber;
-            subscriberScanned();
-
-            if (!(subscription.isSuspended() || subscription.wouldSuspend(msg)))
-            {
-                if (subscription.hasInterest(msg))
-                {
-                    // if the queue is not empty then this client is ready to receive a message.
-                    //FIXME the queue could be full of sent messages.
-                    // Either need to clean all PDQs after sending a message
-                    // OR have a clean up thread that runs the PDQs expunging the messages.
-                    if (!subscription.filtersMessages() || subscription.getPreDeliveryQueue().isEmpty())
-                    {
-                        return subscription;
-                    }
-                }
-            }
-        }
-
-        return null;
-    }
-
-    /** Overridden in test classes. */
-    protected void subscriberScanned()
-    {
-    }
-
-    public boolean isEmpty()
-    {
-        return _subscriptions.isEmpty();
-    }
-
-    public List<Subscription> getSubscriptions()
-    {
-        return _subscriptions;
-    }
-
-    public boolean hasActiveSubscribers()
-    {
-        for (Subscription s : _subscriptions)
-        {
-            if (!s.isSuspended())
-            {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    public int getWeight()
-    {
-        int count = 0;
-        for (Subscription s : _subscriptions)
-        {
-            if (!s.isSuspended())
-            {
-                count++;
-            }
-        }
-        return count;
-    }
-
-    /**
-     * Notification that a queue has been deleted. This is called so that the subscription can inform the channel, which
-     * in turn can update its list of unacknowledged messages.
-     *
-     * @param queue
-     */
-    public void queueDeleted(AMQQueue queue) throws AMQException
-    {
-        for (Subscription s : _subscriptions)
-        {
-            s.queueDeleted(queue);
-        }
-    }
-
-    int size()
-    {
-        return _subscriptions.size();
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/TransientMessageData.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/TransientMessageData.java
deleted file mode 100644
index 79ee6b93a3..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/TransientMessageData.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.queue;
-
-import java.util.LinkedList;
-import java.util.List;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.abstraction.MessagePublishInfo;
-import org.apache.qpid.framing.BasicContentHeaderProperties;
-import org.apache.qpid.framing.ContentHeaderBody;
-
-/**
- * Contains data that is only used in AMQMessage transiently, e.g. while the content
- * body fragments are arriving.
- *
- * Having this data stored in a separate class means that the AMQMessage class avoids
- * the small overhead of numerous guaranteed-null references.
- *
- * @author Apache Software Foundation
- */
-public class TransientMessageData
-{
-    /**
-     * Stored temporarily until the header has been received at which point it is used when
-     * constructing the handle
-     */
-    private MessagePublishInfo _messagePublishInfo;
-
-    /**
-     * Also stored temporarily.
-     */
-    private ContentHeaderBody _contentHeaderBody;
-
-    /**
-     * Keeps a track of how many bytes we have received in body frames
-     */
-    private long _bodyLengthReceived = 0;
-
-    /**
-     * This is stored during routing, to know the queues to which this message should immediately be
-     * delivered. It is <b>cleared after delivery has been attempted</b>. Any persistent record of destinations is done
-     * by the message handle.
-     */
-    private List<AMQQueue> _destinationQueues = new LinkedList<AMQQueue>();
-
-    public MessagePublishInfo getMessagePublishInfo()
-    {
-        return _messagePublishInfo;
-    }
-
-    public void setMessagePublishInfo(MessagePublishInfo messagePublishInfo)
-    {
-        _messagePublishInfo = messagePublishInfo;
-    }
-
-    public List<AMQQueue> getDestinationQueues()
-    {
-        return _destinationQueues;
-    }
-
-    public void setDestinationQueues(List<AMQQueue> destinationQueues)
-    {
-        _destinationQueues = destinationQueues;
-    }
-
-    public ContentHeaderBody getContentHeaderBody()
-    {
-        return _contentHeaderBody;
-    }
-
-    public void setContentHeaderBody(ContentHeaderBody contentHeaderBody)
-    {
-        _contentHeaderBody = contentHeaderBody;
-    }
-
-    public long getBodyLengthReceived()
-    {
-        return _bodyLengthReceived;
-    }
-
-    public void addBodyLength(int value)
-    {
-        _bodyLengthReceived += value;
-    }
-
-    public boolean isAllContentReceived() throws AMQException
-    {
-        return _bodyLengthReceived == _contentHeaderBody.bodySize;
-    }
-
-    public void addDestinationQueue(AMQQueue queue)
-    {
-        _destinationQueues.add(queue);
-    }
-
-    public boolean isPersistent()
-    {
-        //todo remove literal values to a constant file such as AMQConstants in common
-        return _contentHeaderBody.properties instanceof BasicContentHeaderProperties &&
-             ((BasicContentHeaderProperties) _contentHeaderBody.properties).getDeliveryMode() == 2;
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/WeakReferenceMessageHandle.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/WeakReferenceMessageHandle.java
deleted file mode 100644
index 88eb891a20..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/WeakReferenceMessageHandle.java
+++ /dev/null
@@ -1,232 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.queue;
-
-import java.lang.ref.WeakReference;
-import java.util.ArrayList;
-import java.util.LinkedList;
-import java.util.List;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.BasicContentHeaderProperties;
-import org.apache.qpid.framing.ContentHeaderBody;
-import org.apache.qpid.framing.abstraction.MessagePublishInfo;
-import org.apache.qpid.framing.abstraction.ContentChunk;
-import org.apache.qpid.server.store.MessageStore;
-import org.apache.qpid.server.store.StoreContext;
-
-/**
- */
-public class WeakReferenceMessageHandle implements AMQMessageHandle
-{
-    private WeakReference<ContentHeaderBody> _contentHeaderBody;
-
-    private WeakReference<MessagePublishInfo> _messagePublishInfo;
-
-    private List<WeakReference<ContentChunk>> _contentBodies;
-
-    private boolean _redelivered;
-
-    private final MessageStore _messageStore;
-
-    private long _arrivalTime;
-
-
-    public WeakReferenceMessageHandle(MessageStore messageStore)
-    {
-        _messageStore = messageStore;
-    }
-
-    public ContentHeaderBody getContentHeaderBody(StoreContext context, Long messageId) throws AMQException
-    {
-        ContentHeaderBody chb = (_contentHeaderBody != null ? _contentHeaderBody.get() : null);
-        if (chb == null)
-        {
-            MessageMetaData mmd = loadMessageMetaData(context, messageId);
-            chb = mmd.getContentHeaderBody();
-        }
-        return chb;
-    }
-
-    private MessageMetaData loadMessageMetaData(StoreContext context, Long messageId)
-            throws AMQException
-    {
-        MessageMetaData mmd = _messageStore.getMessageMetaData(context, messageId);
-        populateFromMessageMetaData(mmd);
-        return mmd;
-    }
-
-    private void populateFromMessageMetaData(MessageMetaData mmd)
-    {
-        _arrivalTime = mmd.getArrivalTime();
-        _contentHeaderBody = new WeakReference<ContentHeaderBody>(mmd.getContentHeaderBody());
-        _messagePublishInfo = new WeakReference<MessagePublishInfo>(mmd.getMessagePublishInfo());
-    }
-
-    public int getBodyCount(StoreContext context, Long messageId) throws AMQException
-    {
-        if (_contentBodies == null)
-        {
-            MessageMetaData mmd = _messageStore.getMessageMetaData(context, messageId);
-            int chunkCount = mmd.getContentChunkCount();
-            _contentBodies = new ArrayList<WeakReference<ContentChunk>>(chunkCount);
-            for (int i = 0; i < chunkCount; i++)
-            {
-                _contentBodies.add(new WeakReference<ContentChunk>(null));
-            }
-        }
-        return _contentBodies.size();
-    }
-
-    public long getBodySize(StoreContext context, Long messageId) throws AMQException
-    {
-        return getContentHeaderBody(context, messageId).bodySize;
-    }
-
-    public ContentChunk getContentChunk(StoreContext context, Long messageId, int index) throws AMQException, IllegalArgumentException
-    {
-        if (index > _contentBodies.size() - 1)
-        {
-            throw new IllegalArgumentException("Index " + index + " out of valid range 0 to " +
-                                               (_contentBodies.size() - 1));
-        }
-        WeakReference<ContentChunk> wr = _contentBodies.get(index);
-        ContentChunk cb = wr.get();
-        if (cb == null)
-        {
-            cb = _messageStore.getContentBodyChunk(context, messageId, index);
-            _contentBodies.set(index, new WeakReference<ContentChunk>(cb));
-        }
-        return cb;
-    }
-
-    /**
-     * Content bodies are set <i>before</i> the publish and header frames
-     *
-     * @param storeContext
-     * @param messageId
-     * @param contentChunk
-     * @param isLastContentBody
-     * @throws AMQException
-     */
-    public void addContentBodyFrame(StoreContext storeContext, Long messageId, ContentChunk contentChunk, boolean isLastContentBody) throws AMQException
-    {
-        if (_contentBodies == null && isLastContentBody)
-        {
-            _contentBodies = new ArrayList<WeakReference<ContentChunk>>(1);
-        }
-        else
-        {
-            if (_contentBodies == null)
-            {
-                _contentBodies = new LinkedList<WeakReference<ContentChunk>>();
-            }
-        }
-        _contentBodies.add(new WeakReference<ContentChunk>(contentChunk));
-        _messageStore.storeContentBodyChunk(storeContext, messageId, _contentBodies.size() - 1,
-                                            contentChunk, isLastContentBody);
-    }
-
-    public MessagePublishInfo getMessagePublishInfo(StoreContext context, Long messageId) throws AMQException
-    {
-        MessagePublishInfo bpb = (_messagePublishInfo != null ? _messagePublishInfo.get() : null);
-        if (bpb == null)
-        {
-            MessageMetaData mmd = loadMessageMetaData(context, messageId);
-
-            bpb = mmd.getMessagePublishInfo();
-        }
-        return bpb;
-    }
-
-    public boolean isRedelivered()
-    {
-        return _redelivered;
-    }
-
-    public void setRedelivered(boolean redelivered)
-    {
-        _redelivered = redelivered;
-    }
-
-    public boolean isPersistent(StoreContext context, Long messageId) throws AMQException
-    {
-        //todo remove literal values to a constant file such as AMQConstants in common
-        ContentHeaderBody chb = getContentHeaderBody(context, messageId);
-        return chb.properties instanceof BasicContentHeaderProperties &&
-               ((BasicContentHeaderProperties) chb.properties).getDeliveryMode() == 2;
-    }
-
-    /**
-     * This is called when all the content has been received.
-     *
-     * @param publishBody
-     * @param contentHeaderBody
-     * @throws AMQException
-     */
-    public void setPublishAndContentHeaderBody(StoreContext storeContext, Long messageId, MessagePublishInfo publishBody,
-                                               ContentHeaderBody contentHeaderBody)
-            throws AMQException
-    {
-        // if there are no content bodies the list will be null so we must
-        // create en empty list here
-        if (contentHeaderBody.bodySize == 0)
-        {
-            _contentBodies = new LinkedList<WeakReference<ContentChunk>>();
-        }
-
-        final long arrivalTime = System.currentTimeMillis();
-
-
-        MessageMetaData mmd = new MessageMetaData(publishBody, contentHeaderBody, _contentBodies.size(), arrivalTime);
-
-        _messageStore.storeMessageMetaData(storeContext, messageId, mmd);
-
-        populateFromMessageMetaData(mmd);
-    }
-
-    public void removeMessage(StoreContext storeContext, Long messageId) throws AMQException
-    {
-        _messageStore.removeMessage(storeContext, messageId);
-    }
-
-    public void enqueue(StoreContext storeContext, Long messageId, AMQQueue queue) throws AMQException
-    {
-        _messageStore.enqueueMessage(storeContext, queue.getName(), messageId);
-    }
-
-    public void dequeue(StoreContext storeContext, Long messageId, AMQQueue queue) throws AMQException
-    {
-        _messageStore.dequeueMessage(storeContext, queue.getName(), messageId);
-    }
-
-    public long getArrivalTime()
-    {
-        return _arrivalTime;
-    }
-
-
-    // added by Arnaud
-    public byte[] getMessagePayload()
-    {
-        return new byte[0];  //To change body of implemented methods use File | Settings | File Templates.
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/WeightedSubscriptionManager.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/WeightedSubscriptionManager.java
deleted file mode 100644
index 6c71571807..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/WeightedSubscriptionManager.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.queue;
-
-public interface WeightedSubscriptionManager extends SubscriptionManager
-{
-    public int getWeight();        
-}
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
deleted file mode 100644
index a70505ff6c..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java
+++ /dev/null
@@ -1,219 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.registry;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.apache.commons.configuration.Configuration;
-import org.apache.log4j.Logger;
-import org.apache.qpid.server.configuration.Configurator;
-import org.apache.qpid.server.virtualhost.VirtualHost;
-
-/**
- * An abstract application registry that provides access to configuration information and handles the
- * construction and caching of configurable objects.
- * <p/>
- * Subclasses should handle the construction of the "registered objects" such as the exchange registry.
- */
-public abstract class ApplicationRegistry implements IApplicationRegistry
-{
-    private static final Logger _logger = Logger.getLogger(ApplicationRegistry.class);
-
-    private static Map<Integer, IApplicationRegistry> _instanceMap = new HashMap<Integer, IApplicationRegistry>();
-
-    private final Map<Class<?>, Object> _configuredObjects = new HashMap<Class<?>, Object>();
-
-    protected final Configuration _configuration;
-
-    public static final int DEFAULT_INSTANCE = 1;
-    public static final String DEFAULT_APPLICATION_REGISTRY = "org.apache.qpid.server.util.NullApplicationRegistry";
-    public static String _APPLICATION_REGISTRY = DEFAULT_APPLICATION_REGISTRY;
-
-    static
-    {
-        Runtime.getRuntime().addShutdownHook(new Thread(new ShutdownService()));
-    }
-
-    private static class ShutdownService implements Runnable
-    {
-        public void run()
-        {
-            _logger.info("Shutting down application registries...");
-            try
-            {
-                synchronized (_instanceMap)
-                {
-                    Iterator<IApplicationRegistry> keyIterator = _instanceMap.values().iterator();
-
-                    while (keyIterator.hasNext())
-                    {
-                        IApplicationRegistry instance = keyIterator.next();
-
-                        instance.close();
-                    }
-                }
-            }
-            catch (Exception e)
-            {
-                _logger.error("Error shutting down message store: " + e, e);
-            }
-        }
-    }
-
-    public static void initialise(IApplicationRegistry instance) throws Exception
-    {
-        initialise(instance, DEFAULT_INSTANCE);
-    }
-
-    public static void initialise(IApplicationRegistry instance, int instanceID) throws Exception
-    {
-        synchronized (_instanceMap)
-        {
-            if (instance != null)
-            {
-                _logger.info("Initialising Application Registry:" + instanceID);
-                _instanceMap.put(instanceID, instance);
-
-                try
-                {
-                    instance.initialise();
-                }
-                catch (Exception e)
-                {
-                    _instanceMap.remove(instanceID);
-                    throw e;
-                }
-            }
-            else
-            {
-                remove(instanceID);
-            }
-        }
-    }
-
-    public static void remove(int instanceID)
-    {
-        synchronized (_instanceMap)
-        {
-            try
-            {
-                _instanceMap.get(instanceID).close();
-            }
-            catch (Exception e)
-            {
-
-            }
-            finally
-            {
-                _instanceMap.remove(instanceID);
-            }
-        }
-    }
-
-
-    protected ApplicationRegistry(Configuration configuration)
-    {
-        _configuration = configuration;
-    }
-
-    public static IApplicationRegistry getInstance()
-    {
-        return getInstance(DEFAULT_INSTANCE);
-    }
-
-    public static IApplicationRegistry getInstance(int instanceID)
-    {
-        synchronized (_instanceMap)
-        {
-            IApplicationRegistry instance = _instanceMap.get(instanceID);
-
-            if (instance == null)
-            {
-                try
-                {
-                    _logger.info("Creating DEFAULT_APPLICATION_REGISTRY: " + _APPLICATION_REGISTRY + " : Instance:" + instanceID);
-                    IApplicationRegistry registry = (IApplicationRegistry) Class.forName(_APPLICATION_REGISTRY).getConstructor((Class[]) null).newInstance((Object[]) null);
-                    ApplicationRegistry.initialise(registry, instanceID);
-                    _logger.info("Initialised Application Registry:" + instanceID);
-                    return registry;
-                }
-                catch (Exception e)
-                {
-                    _logger.error("Error configuring application: " + e, e);
-                    //throw new AMQBrokerCreationException(instanceID, "Unable to create Application Registry instance " + instanceID);
-                    throw new RuntimeException("Unable to create Application Registry", e);
-                }
-            }
-            else
-            {
-                return instance;
-            }
-        }
-    }
-
-    public void close() throws Exception
-    {
-        for(VirtualHost virtualHost : getVirtualHostRegistry().getVirtualHosts())
-        {
-            virtualHost.close();
-        }
-
-        // close the rmi registry(if any) started for management
-        if (getInstance().getManagedObjectRegistry() != null)
-        {
-            getInstance().getManagedObjectRegistry().close();
-        }
-    }
-
-    public Configuration getConfiguration()
-    {
-        return _configuration;
-    }
-
-    public <T> T getConfiguredObject(Class<T> instanceType)
-    {
-        T instance = (T) _configuredObjects.get(instanceType);
-        if (instance == null)
-        {
-            try
-            {
-                instance = instanceType.newInstance();
-            }
-            catch (Exception e)
-            {
-                _logger.error("Unable to instantiate configuration class " + instanceType + " - ensure it has a public default constructor");
-                throw new IllegalArgumentException("Unable to instantiate configuration class " + instanceType + " - ensure it has a public default constructor", e);
-            }
-            Configurator.configure(instance);
-            _configuredObjects.put(instanceType, instance);
-        }
-        return instance;
-    }
-
-    
-
-    public static void setDefaultApplicationRegistry(String clazz)
-    {
-        _APPLICATION_REGISTRY = clazz;
-    }
-}
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
deleted file mode 100644
index 1cca259a8d..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ConfigurationFileApplicationRegistry.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.registry;
-
-import java.io.File;
-import java.util.Collection;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-import org.apache.commons.configuration.CompositeConfiguration;
-import org.apache.commons.configuration.Configuration;
-import org.apache.commons.configuration.ConfigurationException;
-import org.apache.commons.configuration.SystemConfiguration;
-import org.apache.commons.configuration.XMLConfiguration;
-import org.apache.qpid.server.management.JMXManagedObjectRegistry;
-import org.apache.qpid.server.management.ManagedObjectRegistry;
-import org.apache.qpid.server.management.ManagementConfiguration;
-import org.apache.qpid.server.management.NoopManagedObjectRegistry;
-import org.apache.qpid.server.security.auth.manager.AuthenticationManager;
-import org.apache.qpid.server.security.auth.database.ConfigurationFilePrincipalDatabaseManager;
-import org.apache.qpid.server.security.auth.database.PrincipalDatabaseManager;
-import org.apache.qpid.server.security.auth.manager.PrincipalDatabaseAuthenticationManager;
-import org.apache.qpid.server.security.access.AccessManager;
-import org.apache.qpid.server.security.access.AccessManagerImpl;
-import org.apache.qpid.server.virtualhost.VirtualHost;
-import org.apache.qpid.server.virtualhost.VirtualHostRegistry;
-import org.apache.qpid.AMQException;
-
-public class ConfigurationFileApplicationRegistry extends ApplicationRegistry
-{
-
-    private ManagedObjectRegistry _managedObjectRegistry;
-
-    private AuthenticationManager _authenticationManager;
-
-    private AccessManager _accessManager;
-
-    private PrincipalDatabaseManager _databaseManager;
-
-    private VirtualHostRegistry _virtualHostRegistry;
-
-
-    private final Map<String, VirtualHost> _virtualHosts = new ConcurrentHashMap<String, VirtualHost>();
-
-
-    public ConfigurationFileApplicationRegistry(File configurationURL) throws ConfigurationException
-    {
-        super(config(configurationURL));
-    }
-
-    // Our configuration class needs to make the interpolate method
-    // public so it can be called below from the config method.
-    private static class MyConfiguration extends CompositeConfiguration
-    {
-        public String interpolate(String obj)
-        {
-            return super.interpolate(obj);
-        }
-    }
-
-    private static final Configuration config(File url) throws ConfigurationException
-    {
-        // We have to override the interpolate methods so that
-        // interpolation takes place accross the entirety of the
-        // composite configuration. Without doing this each
-        // configuration object only interpolates variables defined
-        // inside itself.
-        final MyConfiguration conf = new MyConfiguration();
-        conf.addConfiguration(new SystemConfiguration()
-        {
-            protected String interpolate(String o)
-            {
-                return conf.interpolate(o);
-            }
-        });
-        conf.addConfiguration(new XMLConfiguration(url)
-        {
-            protected String interpolate(String o)
-            {
-                return conf.interpolate(o);
-            }
-        });
-        return conf;
-    }
-
-    public void initialise() throws Exception
-    {
-        initialiseManagedObjectRegistry();
-
-        _virtualHostRegistry = new VirtualHostRegistry();
-
-        _accessManager = new AccessManagerImpl("default", _configuration);
-
-        _databaseManager = new ConfigurationFilePrincipalDatabaseManager();
-
-        _authenticationManager = new PrincipalDatabaseAuthenticationManager(null, null);
-
-        _databaseManager.initialiseManagement(_configuration);
-
-        _managedObjectRegistry.start();
-
-        initialiseVirtualHosts();
-
-    }
-
-    private void initialiseVirtualHosts() throws Exception
-    {
-        for (String name : getVirtualHostNames())
-        {
-
-            _virtualHostRegistry.registerVirtualHost(new VirtualHost(name, getConfiguration().subset("virtualhosts.virtualhost." + name)));
-        }
-    }
-
-    private void initialiseManagedObjectRegistry() throws AMQException
-    {
-        ManagementConfiguration config = getConfiguredObject(ManagementConfiguration.class);
-        if (config.enabled)
-        {
-            _managedObjectRegistry = new JMXManagedObjectRegistry();
-        }
-        else
-        {
-            _managedObjectRegistry = new NoopManagedObjectRegistry();
-        }
-    }
-
-
-    public VirtualHostRegistry getVirtualHostRegistry()
-    {
-        return _virtualHostRegistry;
-    }
-
-    public AccessManager getAccessManager()
-    {
-        return _accessManager;
-    }
-
-    public ManagedObjectRegistry getManagedObjectRegistry()
-    {
-        return _managedObjectRegistry;
-    }
-
-    public PrincipalDatabaseManager getDatabaseManager()
-    {
-        return _databaseManager;
-    }
-
-    public AuthenticationManager getAuthenticationManager()
-    {
-        return _authenticationManager;
-    }
-
-    public Collection<String> getVirtualHostNames()
-    {
-        return getConfiguration().getList("virtualhosts.virtualhost.name");
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/IApplicationRegistry.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/IApplicationRegistry.java
deleted file mode 100644
index 5a48431288..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/IApplicationRegistry.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.registry;
-
-import java.util.Collection;
-
-import org.apache.commons.configuration.Configuration;
-import org.apache.qpid.server.management.ManagedObjectRegistry;
-import org.apache.qpid.server.security.auth.manager.AuthenticationManager;
-import org.apache.qpid.server.security.auth.database.PrincipalDatabaseManager;
-import org.apache.qpid.server.security.access.AccessManager;
-import org.apache.qpid.server.virtualhost.VirtualHostRegistry;
-
-public interface IApplicationRegistry
-{
-    /**
-     * Initialise the application registry. All initialisation must be done in this method so that any components
-     * that need access to the application registry itself for initialisation are able to use it. Attempting to
-     * initialise in the constructor will lead to failures since the registry reference will not have been set.
-     */
-    void initialise() throws Exception;
-
-    void close() throws Exception;
-
-    /**
-     * This gets access to a "configured object". A configured object has fields populated from a the configuration
-     * object (Commons Configuration) automatically, where it has the appropriate attributes defined on fields.
-     * Application registry implementations can choose the refresh strategy or caching approach.
-     * @param instanceType the type of object you want initialised. This must be unique - i.e. you can only
-     * have a single object of this type in the system.
-     * @return the configured object
-     */
-    <T> T getConfiguredObject(Class<T> instanceType);
-
-    /**
-     * Get the low level configuration. For use cases where the configured object approach is not required
-     * you can get the complete configuration information.
-     * @return a Commons Configuration instance
-     */
-    Configuration getConfiguration();
-
-    ManagedObjectRegistry getManagedObjectRegistry();
-
-    PrincipalDatabaseManager getDatabaseManager();
-
-    AuthenticationManager getAuthenticationManager();
-
-    Collection<String> getVirtualHostNames();
-
-    VirtualHostRegistry getVirtualHostRegistry();
-
-    AccessManager getAccessManager();
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/Passwd.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/Passwd.java
deleted file mode 100644
index f9e093dba7..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/Passwd.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.    
- *
- * 
- */
-package org.apache.qpid.server.security;
-
-import org.apache.commons.codec.binary.Base64;
-
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.security.DigestException;
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.PrintStream;
-
-public class Passwd
-{
-    public static void main(String args[]) throws NoSuchAlgorithmException, DigestException, IOException
-    {
-        if (args.length != 2)
-        {
-            System.out.println("Passwd <username> <password>");
-            System.exit(0);
-        }
-
-        byte[] data = args[1].getBytes("utf-8");
-
-        MessageDigest md = MessageDigest.getInstance("MD5");
-
-        for (byte b : data)
-        {
-            md.update(b);
-        }
-
-        byte[] digest = md.digest();
-
-        Base64 b64 = new Base64();
-
-        byte[] encoded = b64.encode(digest);
-
-        output(args[0], encoded);
-    }
-
-    private static void output(String user, byte[] encoded) throws IOException
-    {
-
-//        File passwdFile = new File("qpid.passwd");
-
-        PrintStream ps = new PrintStream(System.out);
-
-        user += ":";
-        ps.write(user.getBytes("utf-8"));
-
-        for (byte b : encoded)
-        {
-            ps.write(b);
-        }
-
-        ps.println();
-
-        ps.flush();
-        ps.close();
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/AMQUserManagementMBean.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/AMQUserManagementMBean.java
deleted file mode 100644
index 2dc7fcbc1e..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/AMQUserManagementMBean.java
+++ /dev/null
@@ -1,467 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.    
- *
- * 
- */
-package org.apache.qpid.server.security.access;
-
-import org.apache.qpid.server.management.MBeanDescription;
-import org.apache.qpid.server.management.AMQManagedObject;
-import org.apache.qpid.server.management.MBeanOperation;
-import org.apache.qpid.server.management.MBeanInvocationHandlerImpl;
-import org.apache.qpid.server.security.auth.database.PrincipalDatabase;
-import org.apache.qpid.server.security.auth.sasl.UsernamePrincipal;
-import org.apache.log4j.Logger;
-import org.apache.commons.configuration.ConfigurationException;
-
-import javax.management.JMException;
-import javax.management.remote.JMXPrincipal;
-import javax.management.openmbean.TabularData;
-import javax.management.openmbean.TabularDataSupport;
-import javax.management.openmbean.TabularType;
-import javax.management.openmbean.SimpleType;
-import javax.management.openmbean.CompositeType;
-import javax.management.openmbean.OpenType;
-import javax.management.openmbean.OpenDataException;
-import javax.management.openmbean.CompositeData;
-import javax.management.openmbean.CompositeDataSupport;
-import javax.security.auth.login.AccountNotFoundException;
-import javax.security.auth.Subject;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.FileOutputStream;
-import java.util.Properties;
-import java.util.List;
-import java.util.Enumeration;
-import java.util.Set;
-import java.util.concurrent.locks.ReentrantLock;
-import java.security.Principal;
-import java.security.AccessControlContext;
-import java.security.AccessController;
-
-/** MBean class for AMQUserManagementMBean. It implements all the management features exposed for managing users. */
-@MBeanDescription("User Management Interface")
-public class AMQUserManagementMBean extends AMQManagedObject implements UserManagement
-{
-
-    private static final Logger _logger = Logger.getLogger(AMQUserManagementMBean.class);
-
-    private PrincipalDatabase _principalDatabase;
-    private String _accessFileName;
-    private Properties _accessRights;
-    //    private File _accessFile;
-    private ReentrantLock _accessRightsUpdate = new ReentrantLock();
-
-    // Setup for the TabularType
-    static TabularType _userlistDataType; // Datatype for representing User Lists
-
-    static CompositeType _userDataType; // Composite type for representing User
-    static String[] _userItemNames = {"Username", "read", "write", "admin"};
-
-    static
-    {
-        String[] userItemDesc = {"Broker Login username", "Management Console Read Permission",
-                                 "Management Console Write Permission", "Management Console Admin Permission"};
-
-        OpenType[] userItemTypes = new OpenType[4]; // User item types.
-        userItemTypes[0] = SimpleType.STRING;  // For Username
-        userItemTypes[1] = SimpleType.BOOLEAN; // For Rights - Read
-        userItemTypes[2] = SimpleType.BOOLEAN; // For Rights - Write
-        userItemTypes[3] = SimpleType.BOOLEAN; // For Rights - Admin
-        String[] userDataIndex = {_userItemNames[0]};
-
-        try
-        {
-            _userDataType =
-                    new CompositeType("User", "User Data", _userItemNames, userItemDesc, userItemTypes);
-
-            _userlistDataType = new TabularType("Users", "List of users", _userDataType, userDataIndex);
-        }
-        catch (OpenDataException e)
-        {
-            _logger.error("Tabular data setup for viewing users incorrect.");
-            _userlistDataType = null;
-        }
-    }
-
-
-    public AMQUserManagementMBean() throws JMException
-    {
-        super(UserManagement.class, UserManagement.TYPE);
-    }
-
-    public String getObjectInstanceName()
-    {
-        return UserManagement.TYPE;
-    }
-
-    public boolean setPassword(String username, char[] password)
-    {
-        try
-        {
-            //delegate password changes to the Principal Database
-            return _principalDatabase.updatePassword(new UsernamePrincipal(username), password);
-        }
-        catch (AccountNotFoundException e)
-        {
-            _logger.warn("Attempt to set password of non-existant user'" + username + "'");
-            return false;
-        }
-    }
-
-    public boolean setRights(String username, boolean read, boolean write, boolean admin)
-    {
-
-        if (_accessRights.get(username) == null)
-        {
-            // If the user doesn't exist in the user rights file check that they at least have an account.
-            if (_principalDatabase.getUser(username) == null)
-            {
-                return false;
-            }
-        }
-
-        try
-        {
-
-            _accessRightsUpdate.lock();
-
-            // Update the access rights
-            if (admin)
-            {
-                _accessRights.put(username, MBeanInvocationHandlerImpl.ADMIN);
-            }
-            else
-            {
-                if (read | write)
-                {
-                    if (read)
-                    {
-                        _accessRights.put(username, MBeanInvocationHandlerImpl.READONLY);
-                    }
-                    if (write)
-                    {
-                        _accessRights.put(username, MBeanInvocationHandlerImpl.READWRITE);
-                    }
-                }
-                else
-                {
-                    _accessRights.remove(username);
-                }
-            }
-
-            saveAccessFile();
-        }
-        finally
-        {
-            if (_accessRightsUpdate.isHeldByCurrentThread())
-            {
-                _accessRightsUpdate.unlock();
-            }
-        }
-
-        return true;
-    }
-
-    public boolean createUser(String username, char[] password, boolean read, boolean write, boolean admin)
-    {
-        if (_principalDatabase.createPrincipal(new UsernamePrincipal(username), password))
-        {
-            _accessRights.put(username, "");
-
-            return setRights(username, read, write, admin);
-        }
-
-        return false;
-    }
-
-    public boolean deleteUser(String username)
-    {
-
-        try
-        {
-            if (_principalDatabase.deletePrincipal(new UsernamePrincipal(username)))
-            {
-                try
-                {
-                    _accessRightsUpdate.lock();
-
-                    _accessRights.remove(username);
-                    saveAccessFile();
-                }
-                finally
-                {
-                    if (_accessRightsUpdate.isHeldByCurrentThread())
-                    {
-                        _accessRightsUpdate.unlock();
-                    }
-                }
-                return true;
-            }
-        }
-        catch (AccountNotFoundException e)
-        {
-            _logger.warn("Attempt to delete user (" + username + ") that doesn't exist");
-        }
-
-        return false;
-    }
-
-    public boolean reloadData()
-    {
-        try
-        {
-            try
-            {
-                loadAccessFile();
-            }
-            catch (ConfigurationException e)
-            {
-                _logger.info("Reload failed due to:" + e);
-                return false;
-            }
-
-            // Reload successful
-            return true;
-        }
-        catch (IOException e)
-        {
-            _logger.info("Reload failed due to:" + e);
-            // Reload unsuccessful
-            return false;
-        }
-    }
-
-
-    @MBeanOperation(name = "viewUsers", description = "All users with access rights to the system.")
-    public TabularData viewUsers()
-    {
-        // Table of users
-        // Username(string), Access rights Read,Write,Admin(bool,bool,bool)
-
-        if (_userlistDataType == null)
-        {
-            _logger.warn("TabluarData not setup correctly");
-            return null;
-        }
-
-        List<Principal> users = _principalDatabase.getUsers();
-
-        TabularDataSupport userList = new TabularDataSupport(_userlistDataType);
-
-        try
-        {
-            // Create the tabular list of message header contents
-            for (Principal user : users)
-            {
-                // Create header attributes list
-
-                String rights = (String) _accessRights.get(user.getName());
-
-                Boolean read = false;
-                Boolean write = false;
-                Boolean admin = false;
-
-                if (rights != null)
-                {
-                    read = rights.equals(MBeanInvocationHandlerImpl.READONLY)
-                           || rights.equals(MBeanInvocationHandlerImpl.READWRITE);
-                    write = rights.equals(MBeanInvocationHandlerImpl.READWRITE);
-                    admin = rights.equals(MBeanInvocationHandlerImpl.ADMIN);
-                }
-
-                Object[] itemData = {user.getName(), read, write, admin};
-                CompositeData messageData = new CompositeDataSupport(_userDataType, _userItemNames, itemData);
-                userList.put(messageData);
-            }
-        }
-        catch (OpenDataException e)
-        {
-            _logger.warn("Unable to create user list due to :" + e);
-            return null;
-        }
-
-        return userList;
-    }
-
-    /*** Broker Methods **/
-
-    /**
-     * setPrincipalDatabase
-     *
-     * @param database set The Database to use for user lookup
-     */
-    public void setPrincipalDatabase(PrincipalDatabase database)
-    {
-        _principalDatabase = database;
-    }
-
-    /**
-     * setAccessFile
-     *
-     * @param accessFile the file to use for updating.
-     *
-     * @throws java.io.IOException If the file cannot be accessed
-     * @throws org.apache.commons.configuration.ConfigurationException
-     *                             if checks on the file fail.
-     */
-    public void setAccessFile(String accessFile) throws IOException, ConfigurationException
-    {
-        _accessFileName = accessFile;
-
-        if (_accessFileName != null)
-        {
-            loadAccessFile();
-        }
-        else
-        {
-            _logger.warn("Access rights file specified is null. Access rights not changed.");
-        }
-    }
-
-    private void loadAccessFile() throws IOException, ConfigurationException
-    {
-        try
-        {
-            _accessRightsUpdate.lock();
-
-            Properties accessRights = new Properties();
-
-            File accessFile = new File(_accessFileName);
-
-            if (!accessFile.exists())
-            {
-                throw new ConfigurationException("'" + _accessFileName + "' does not exist");
-            }
-
-            if (!accessFile.canRead())
-            {
-                throw new ConfigurationException("Cannot read '" + _accessFileName + "'.");
-            }
-
-            if (!accessFile.canWrite())
-            {
-                _logger.warn("Unable to write to access file '" + _accessFileName + "' changes will not be preserved.");
-            }
-
-            accessRights.load(new FileInputStream(accessFile));
-            checkAccessRights(accessRights);
-            setAccessRights(accessRights);
-        }
-        finally
-        {
-            if (_accessRightsUpdate.isHeldByCurrentThread())
-            {
-                _accessRightsUpdate.unlock();
-            }
-        }
-    }
-
-    private void checkAccessRights(Properties accessRights)
-    {
-        Enumeration values = accessRights.propertyNames();
-
-        while (values.hasMoreElements())
-        {
-            String user = (String) values.nextElement();
-
-            if (_principalDatabase.getUser(user) == null)
-            {
-                _logger.warn("Access rights contains user '" + user + "' but there is no authentication data for that user");
-            }
-        }
-    }
-
-    private void saveAccessFile()
-    {
-        try
-        {
-            _accessRightsUpdate.lock();
-            try
-            {
-                // remove old temporary file
-                File tmp = new File(_accessFileName + ".tmp");
-                if (tmp.exists())
-                {
-                    tmp.delete();
-                }
-
-                //remove old backup
-                File old = new File(_accessFileName + ".old");
-                if (old.exists())
-                {
-                    old.delete();
-                }
-
-                // Rename current file
-                File rights = new File(_accessFileName);
-                rights.renameTo(old);
-
-                FileOutputStream output = new FileOutputStream(tmp);
-                _accessRights.store(output, "Generated by AMQUserManagementMBean Console : Last edited by user:" + getCurrentJMXUser());
-                output.close();
-
-                // Rename new file to main file
-                tmp.renameTo(rights);
-
-                // delete tmp
-                tmp.delete();
-            }
-            catch (IOException e)
-            {
-                _logger.warn("Problem occured saving '" + _accessFileName + "' changes may not be preserved. :" + e);
-            }
-        }
-        finally
-        {
-            if (_accessRightsUpdate.isHeldByCurrentThread())
-            {
-                _accessRightsUpdate.unlock();
-            }
-        }
-    }
-
-    private String getCurrentJMXUser()
-    {
-        AccessControlContext acc = AccessController.getContext();
-        Subject subject = Subject.getSubject(acc);
-
-        // Retrieve JMXPrincipal from Subject
-        Set<JMXPrincipal> principals = subject.getPrincipals(JMXPrincipal.class);
-        if (principals == null || principals.isEmpty())
-        {
-            return "Unknown user principals were null";
-        }
-
-        Principal principal = principals.iterator().next();
-        return principal.getName();
-    }
-
-    /**
-     * user=read user=write user=readwrite user=admin
-     *
-     * @param accessRights The properties list of access rights to process
-     */
-    private void setAccessRights(Properties accessRights)
-    {
-        _logger.debug("Setting Access Rights:" + accessRights);
-        _accessRights = accessRights;
-        MBeanInvocationHandlerImpl.setAccessRights(_accessRights);
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/AccessManager.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/AccessManager.java
deleted file mode 100644
index d70a6dc8f4..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/AccessManager.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.    
- *
- * 
- */
-package org.apache.qpid.server.security.access;
-
-import java.security.Principal;
-
-public interface AccessManager
-{
-    AccessResult isAuthorized(Accessable accessObject, Principal username, AccessRights.Rights rights);
-
-    @Deprecated
-    AccessResult isAuthorized(Accessable accessObject, String username);
-
-    String getName();
-
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/AccessManagerImpl.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/AccessManagerImpl.java
deleted file mode 100644
index 35d036d20f..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/AccessManagerImpl.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.    
- *
- * 
- */
-package org.apache.qpid.server.security.access;
-
-import org.apache.commons.configuration.Configuration;
-import org.apache.commons.configuration.ConfigurationException;
-import org.apache.qpid.server.registry.ApplicationRegistry;
-import org.apache.qpid.server.security.auth.sasl.UsernamePrincipal;
-import org.apache.qpid.configuration.PropertyUtils;
-import org.apache.log4j.Logger;
-
-import java.util.List;
-import java.lang.reflect.Method;
-import java.security.Principal;
-
-public class AccessManagerImpl implements AccessManager
-{
-    private static final Logger _logger = Logger.getLogger(AccessManagerImpl.class);
-
-    AccessManager _accessManager;
-
-    public AccessManagerImpl(String name, Configuration hostConfig) throws ConfigurationException
-    {
-        if (hostConfig == null)
-        {
-            _logger.warn("No Configuration specified. Using default access controls for VirtualHost:'" + name + "'");
-            return;
-        }
-
-        String accessClass = hostConfig.getString("security.access.class");
-        if (accessClass == null)
-        {
-            _logger.warn("No access control specified. Using default access controls for VirtualHost:'" + name + "'");
-            return;
-        }
-
-        Object o;
-        try
-        {
-            o = Class.forName(accessClass).newInstance();
-        }
-        catch (Exception e)
-        {
-            throw new ConfigurationException("Error initialising access control: " + e, e);
-        }
-
-        if (!(o instanceof AccessManager))
-        {
-            throw new ConfigurationException("Access control must implement the VirtualHostAccess interface");
-        }
-
-        initialiseAccessControl((AccessManager) o, hostConfig);
-
-        _accessManager = (AccessManager) o;
-
-        _logger.info("Initialised access control for virtualhost '" + name + "' successfully");
-
-    }
-
-
-    private void initialiseAccessControl(AccessManager accessManager, Configuration config)
-            throws ConfigurationException
-    {
-        String baseName = "security.access.attributes.attribute.";
-        List<String> argumentNames = config.getList(baseName + "name");
-        List<String> argumentValues = config.getList(baseName + "value");
-        for (int i = 0; i < argumentNames.size(); i++)
-        {
-            String argName = argumentNames.get(i);
-            if (argName == null || argName.length() == 0)
-            {
-                throw new ConfigurationException("Access Control argument names must have length >= 1 character");
-            }
-            if (Character.isLowerCase(argName.charAt(0)))
-            {
-                argName = Character.toUpperCase(argName.charAt(0)) + argName.substring(1);
-            }
-            String methodName = "set" + argName;
-            Method method = null;
-            try
-            {
-                method = accessManager.getClass().getMethod(methodName, String.class);
-            }
-            catch (NoSuchMethodException e)
-            {
-                //do nothing as method will be null
-            }
-
-            if (method == null)
-            {
-                throw new ConfigurationException("No method " + methodName + " found in class " + accessManager.getClass() +
-                                                 " hence unable to configure access control. The method must be public and " +
-                                                 "have a single String argument with a void return type");
-            }
-            try
-            {
-                method.invoke(accessManager, PropertyUtils.replaceProperties(argumentValues.get(i)));
-            }
-            catch (Exception e)
-            {
-                ConfigurationException ce = new ConfigurationException(e.getMessage(), e.getCause());
-                ce.initCause(e);
-                throw ce;
-            }
-        }
-    }
-
-    public AccessResult isAuthorized(Accessable accessObject, String username)
-    {
-        return isAuthorized(accessObject, new UsernamePrincipal(username), AccessRights.Rights.READ);
-    }
-
-    public AccessResult isAuthorized(Accessable accessObject, Principal user, AccessRights.Rights rights)
-    {
-        if (_accessManager == null)
-        {
-            if (ApplicationRegistry.getInstance().getAccessManager() == this)
-            {
-                _logger.warn("No Default access manager specified DENYING ALL ACCESS");
-                return new AccessResult(this, AccessResult.AccessStatus.REFUSED);
-            }
-            else
-            {
-                return ApplicationRegistry.getInstance().getAccessManager().isAuthorized(accessObject, user, rights);
-            }
-        }
-        else
-        {
-            return _accessManager.isAuthorized(accessObject, user, rights);
-        }
-    }
-
-    public String getName()
-    {
-        return "AccessManagerImpl";
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/AccessResult.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/AccessResult.java
deleted file mode 100644
index b8d8fc605a..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/AccessResult.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.    
- *
- * 
- */
-package org.apache.qpid.server.security.access;
-
-public class AccessResult
-{
-    public enum AccessStatus
-    {
-        GRANTED, REFUSED
-    }
-
-    StringBuilder _authorizer;
-    AccessStatus _status;
-
-    public AccessResult(AccessManager authorizer, AccessStatus status)
-    {
-        _status = status;
-        _authorizer = new StringBuilder(authorizer.getName());        
-    }
-
-    public void setAuthorizer(AccessManager authorizer)
-    {
-        _authorizer.append(authorizer.getName());
-    }
-
-    public String getAuthorizer()
-    {
-        return _authorizer.toString();
-    }
-
-    public void setStatus(AccessStatus status)
-    {
-        _status = status;
-    }
-
-    public AccessStatus getStatus()
-    {
-        return _status;
-    }
-
-    public void addAuthorizer(AccessManager accessManager)
-    {
-        _authorizer.insert(0, "->");
-        _authorizer.insert(0, accessManager.getName());
-    }
-
-
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/AccessRights.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/AccessRights.java
deleted file mode 100644
index 1b79a5a0e0..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/AccessRights.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.    
- *
- * 
- */
-package org.apache.qpid.server.security.access;
-
-public class AccessRights
-{
-    public enum Rights
-    {
-        ANY,
-        READ,
-        WRITE,
-        READWRITE
-    }
-
-    Rights _right;
-
-    public AccessRights(Rights right)
-    {
-        _right = right;
-    }
-
-    public boolean allows(Rights rights)
-    {
-        switch (_right)
-        {
-            case ANY:
-                return (rights.equals(Rights.WRITE)
-                        || rights.equals(Rights.READ)
-                        || rights.equals(Rights.READWRITE)
-                        || rights.equals(Rights.ANY));
-            case READ:
-                return rights.equals(Rights.READ) || rights.equals(Rights.ANY);
-            case WRITE:
-                return rights.equals(Rights.WRITE) || rights.equals(Rights.ANY);
-            case READWRITE:
-                return true;
-        }
-        return false;
-    }
-
-    public Rights getRights()
-    {
-        return _right;
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/Accessable.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/Accessable.java
deleted file mode 100644
index f51cf24caa..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/Accessable.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.    
- *
- * 
- */
-package org.apache.qpid.server.security.access;
-
-public interface Accessable
-{
-    void setAccessableName(String name);
-    String getAccessableName();    
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/AllowAll.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/AllowAll.java
deleted file mode 100644
index 1ddca3a64e..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/AllowAll.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.    
- *
- * 
- */
-package org.apache.qpid.server.security.access;
-
-import java.security.Principal;
-
-public class AllowAll implements AccessManager
-{
-
-    public AccessResult isAuthorized(Accessable accessObject, Principal username, AccessRights.Rights rights)
-    {
-        return new AccessResult(this, AccessResult.AccessStatus.GRANTED);
-    }
-
-    public AccessResult isAuthorized(Accessable accessObject, String username)
-    {
-        return new AccessResult(this, AccessResult.AccessStatus.GRANTED);
-    }
-
-    public String getName()
-    {
-        return "AllowAll";
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/DenyAll.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/DenyAll.java
deleted file mode 100644
index bf40eeba4e..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/DenyAll.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.    
- *
- * 
- */
-package org.apache.qpid.server.security.access;
-
-import java.security.Principal;
-
-public class DenyAll implements AccessManager
-{
-    public AccessResult isAuthorized(Accessable accessObject, Principal username, AccessRights.Rights rights)
-    {
-        return new AccessResult(this, AccessResult.AccessStatus.REFUSED);
-    }
-
-    public AccessResult isAuthorized(Accessable accessObject, String username)
-    {
-        return new AccessResult(this, AccessResult.AccessStatus.REFUSED);
-    }
-
-    public String getName()
-    {
-        return "DenyAll";
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/FileAccessManager.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/FileAccessManager.java
deleted file mode 100644
index 291bc714ed..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/FileAccessManager.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- *
- *
- */
-package org.apache.qpid.server.security.access;
-
-import org.apache.qpid.server.virtualhost.VirtualHost;
-import org.apache.qpid.server.security.auth.sasl.UsernamePrincipal;
-import org.apache.log4j.Logger;
-
-import java.io.IOException;
-import java.io.BufferedReader;
-import java.io.FileReader;
-import java.io.FileNotFoundException;
-import java.io.File;
-import java.util.regex.Pattern;
-import java.security.Principal;
-
-/**
- * Represents a user database where the account information is stored in a simple flat file.
- *
- * The file is expected to be in the form: username:password username1:password1 ... usernamen:passwordn
- *
- * where a carriage return separates each username/password pair. Passwords are assumed to be in plain text.
- */
-public class FileAccessManager implements AccessManager
-{
-    private static final Logger _logger = Logger.getLogger(FileAccessManager.class);
-
-    protected File _accessFile;
-
-    protected Pattern _regexp = Pattern.compile(":");
-
-    private static final short USER_INDEX = 0;
-    private static final short VIRTUALHOST_INDEX = 1;
-
-    public void setAccessFile(String accessFile) throws FileNotFoundException
-    {
-        File f = new File(accessFile);
-        _logger.info("FileAccessManager using file " + f.getAbsolutePath());
-        _accessFile = f;
-        if (!f.exists())
-        {
-            throw new FileNotFoundException("Cannot find access file " + f);
-        }
-        if (!f.canRead())
-        {
-            throw new FileNotFoundException("Cannot read access file " + f +
-                                            ". Check permissions.");
-        }
-    }
-
-    /**
-     * Looks up the virtual hosts for a specified user in the access file.
-     *
-     * @param user The user to lookup
-     *
-     * @return a list of virtualhosts
-     */
-    private VirtualHostAccess[] lookupVirtualHost(String user)
-    {
-        String[] results = lookup(user, VIRTUALHOST_INDEX);
-        VirtualHostAccess vhosts[] = new VirtualHostAccess[results.length];
-
-        for (int index = 0; index < results.length; index++)
-        {
-            vhosts[index] = new VirtualHostAccess(results[index]);
-        }
-
-        return vhosts;
-    }
-
-
-    private String[] lookup(String user, int index)
-    {
-        try
-        {
-            BufferedReader reader = null;
-            try
-            {
-                reader = new BufferedReader(new FileReader(_accessFile));
-                String line;
-
-                while ((line = reader.readLine()) != null)
-                {
-                    String[] result = _regexp.split(line);
-                    if (result == null || result.length < (index + 1))
-                    {
-                        continue;
-                    }
-
-                    if (user.equals(result[USER_INDEX]))
-                    {
-                        return result[index].split(",");
-                    }
-                }
-                return null;
-            }
-            finally
-            {
-                if (reader != null)
-                {
-                    reader.close();
-                }
-            }
-        }
-        catch (IOException ioe)
-        {
-            //ignore
-        }
-        return null;
-    }
-
-    public AccessResult isAuthorized(Accessable accessObject, String username)
-    {
-        return isAuthorized(accessObject, new UsernamePrincipal(username), AccessRights.Rights.READ);
-    }
-
-    public AccessResult isAuthorized(Accessable accessObject, Principal user, AccessRights.Rights rights)
-    {
-        if (accessObject instanceof VirtualHost)
-        {
-            VirtualHostAccess[] hosts = lookupVirtualHost(user.getName());
-
-            if (hosts != null)
-            {
-                for (VirtualHostAccess host : hosts)
-                {
-                    if (accessObject.getAccessableName().equals(host.getVirtualHost()))
-                    {
-                        if (host.getAccessRights().allows(rights))
-                        {
-                            return new AccessResult(this, AccessResult.AccessStatus.GRANTED);
-                        }
-                        else
-                        {
-                            return new AccessResult(this, AccessResult.AccessStatus.REFUSED);
-                        }
-                    }
-                }
-            }
-        }
-//        else if (accessObject instanceof AMQQueue)
-//        {
-//            String[] queues = lookupQueue(username, ((AMQQueue) accessObject).getVirtualHost());
-//
-//            if (queues != null)
-//            {
-//                for (String queue : queues)
-//                {
-//                    if (accessObject.getAccessableName().equals(queue))
-//                    {
-//                        return new AccessResult(this, AccessResult.AccessStatus.GRANTED);
-//                    }
-//                }
-//            }
-//        }
-
-        return new AccessResult(this, AccessResult.AccessStatus.REFUSED);
-    }
-
-    public String getName()
-    {
-        return "FileAccessManager";
-    }
-
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/PrincipalDatabaseAccessManager.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/PrincipalDatabaseAccessManager.java
deleted file mode 100644
index 6ccadb2e7d..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/PrincipalDatabaseAccessManager.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.    
- *
- * 
- */
-package org.apache.qpid.server.security.access;
-
-import org.apache.qpid.server.registry.ApplicationRegistry;
-import org.apache.qpid.server.security.auth.database.PrincipalDatabase;
-import org.apache.qpid.server.security.auth.sasl.UsernamePrincipal;
-import org.apache.log4j.Logger;
-
-import java.security.Principal;
-
-public class PrincipalDatabaseAccessManager implements AccessManager
-{
-    private static final Logger _logger = Logger.getLogger(PrincipalDatabaseAccessManager.class);
-
-    PrincipalDatabase _database;
-    AccessManager _default;
-
-    public PrincipalDatabaseAccessManager()
-    {
-        _default = null;
-    }
-
-    public void setDefaultAccessManager(String defaultAM)
-    {
-        if (defaultAM.equals("AllowAll"))
-        {
-            _default = new AllowAll();
-        }
-
-        if (defaultAM.equals("DenyAll"))
-        {
-            _default = new DenyAll();
-        }
-    }
-
-    public void setPrincipalDatabase(String database)
-    {
-        _database = ApplicationRegistry.getInstance().getDatabaseManager().getDatabases().get(database);
-        if (!(_database instanceof AccessManager))
-        {
-            _logger.warn("Database '" + database + "' cannot perform access management");
-        }
-    }
-
-
-    public AccessResult isAuthorized(Accessable accessObject, String username)
-    {
-        return isAuthorized(accessObject, new UsernamePrincipal(username), AccessRights.Rights.READ);
-    }
-
-    public AccessResult isAuthorized(Accessable accessObject, Principal username, AccessRights.Rights rights)
-    {
-        AccessResult result;
-
-        if (_database == null)
-        {
-            if (_default != null)
-            {
-                result = _default.isAuthorized(accessObject, username, rights);
-            }
-            else
-            {
-                throw new RuntimeException("Principal Database and default Access Manager are both null unable to perform Access Control");
-            }
-        }
-        else
-        {
-            if (!(_database instanceof AccessManager))
-            {
-                _logger.warn("Specified PrincipalDatabase is not an AccessManager so using default AccessManager");
-                result = _default.isAuthorized(accessObject, username, rights);
-            }
-            else
-            {
-                result = ((AccessManager) _database).isAuthorized(accessObject, username, rights);
-            }
-        }
-
-        result.addAuthorizer(this);
-
-        return result;
-    }
-
-    public String getName()
-    {
-        return "PrincipalDatabaseFileAccessManager";
-    }
-
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/UserManagement.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/UserManagement.java
deleted file mode 100644
index b8762aa43b..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/UserManagement.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.    
- *
- * 
- */
-package org.apache.qpid.server.security.access;
-
-import org.apache.qpid.server.management.MBeanOperation;
-import org.apache.qpid.server.management.MBeanOperationParameter;
-import org.apache.qpid.server.management.MBeanAttribute;
-import org.apache.qpid.AMQException;
-
-import javax.management.openmbean.TabularData;
-import javax.management.openmbean.CompositeData;
-import javax.management.JMException;
-import javax.management.MBeanOperationInfo;
-import java.io.IOException;
-
-public interface UserManagement
-{
-    String TYPE = "UserManagement";
-
-    //********** Operations *****************//
-    /**
-     * set password for user
-     *
-     * @param username The username to create
-     * @param password The password for the user
-     *
-     * @return The result of the operation
-     */
-    @MBeanOperation(name = "setPassword", description = "Set password for user.",
-                    impact = MBeanOperationInfo.ACTION)
-    boolean setPassword(@MBeanOperationParameter(name = "username", description = "Username")String username,
-                        @MBeanOperationParameter(name = "password", description = "Password")char[] password);
-
-    /**
-     * set rights for users with given details
-     *
-     * @param username The username to create
-     * @param read     The set of permission to give the new user
-     * @param write    The set of permission to give the new user
-     * @param admin    The set of permission to give the new user
-     *
-     * @return The result of the operation
-     */
-    @MBeanOperation(name = "setRights", description = "Set access rights for user.",
-                    impact = MBeanOperationInfo.ACTION)
-    boolean setRights(@MBeanOperationParameter(name = "username", description = "Username")String username,
-                      @MBeanOperationParameter(name = "read", description = "Administration read")boolean read,
-                      @MBeanOperationParameter(name = "readAndWrite", description = "Administration write")boolean write,
-                      @MBeanOperationParameter(name = "admin", description = "Administration rights")boolean admin);
-
-    /**
-     * Create users with given details
-     *
-     * @param username The username to create
-     * @param password The password for the user
-     * @param read     The set of permission to give the new user
-     * @param write    The set of permission to give the new user
-     * @param admin    The set of permission to give the new user
-     *
-     * @return The result of the operation
-     */
-    @MBeanOperation(name = "createUser", description = "Create new user from system.",
-                    impact = MBeanOperationInfo.ACTION)
-    boolean createUser(@MBeanOperationParameter(name = "username", description = "Username")String username,
-                       @MBeanOperationParameter(name = "password", description = "Password")char[] password,
-                       @MBeanOperationParameter(name = "read", description = "Administration read")boolean read,
-                       @MBeanOperationParameter(name = "readAndWrite", description = "Administration write")boolean write,
-                       @MBeanOperationParameter(name = "admin", description = "Administration rights")boolean admin);
-
-    /**
-     * View users returns all the users that are currently available to the system.
-     *
-     * @param username The user to delete
-     *
-     * @return The result of the operation
-     */
-    @MBeanOperation(name = "deleteUser", description = "Delete user from system.",
-                    impact = MBeanOperationInfo.ACTION)
-    boolean deleteUser(@MBeanOperationParameter(name = "username", description = "Username")String username);
-
-
-    /**
-     * Reload the date from disk
-     *
-     * @return The result of the operation
-     */
-    @MBeanOperation(name = "reloadData", description = "Reload the authentication file from disk.",
-                    impact = MBeanOperationInfo.ACTION)
-    boolean reloadData();
-
-    /**
-     * View users returns all the users that are currently available to the system.
-     *
-     * @return a table of users data (Username, read, write, admin)
-     */
-    @MBeanOperation(name = "viewUsers", description = "All users with access rights to the system.",
-                    impact = MBeanOperationInfo.INFO)
-    TabularData viewUsers();
-
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/VirtualHostAccess.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/VirtualHostAccess.java
deleted file mode 100644
index 13151a66b8..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/VirtualHostAccess.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.    
- *
- * 
- */
-package org.apache.qpid.server.security.access;
-
-public class VirtualHostAccess
-{
-    private String _vhost;
-    private AccessRights _rights;
-
-    public VirtualHostAccess(String vhostaccess)
-    {
-        //format <vhost>(<rights>)
-        int hostend = vhostaccess.indexOf('(');
-
-        if (hostend == -1)
-        {
-            throw new IllegalArgumentException("VirtualHostAccess format string contains no access _rights");
-        }
-
-        _vhost = vhostaccess.substring(0, hostend);
-
-        String rights = vhostaccess.substring(hostend);
-
-        if (rights.indexOf('r') != -1)
-        {
-            if (rights.indexOf('w') != -1)
-            {
-                _rights = new AccessRights(AccessRights.Rights.READWRITE);
-            }
-            else
-            {
-                _rights = new AccessRights(AccessRights.Rights.READ);
-            }
-        }
-        else if (rights.indexOf('w') != -1)
-        {
-            _rights = new AccessRights(AccessRights.Rights.WRITE);
-        }
-    }
-
-    public AccessRights getAccessRights()
-    {
-        return _rights;
-    }
-
-    public String getVirtualHost()
-    {
-        return _vhost;
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/AuthenticationResult.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/AuthenticationResult.java
deleted file mode 100644
index 0e3aea4de0..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/AuthenticationResult.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.security.auth;
-
-public class AuthenticationResult
-{
-    public enum AuthenticationStatus
-    {
-        SUCCESS, CONTINUE, ERROR
-    }
-
-    public AuthenticationStatus status;
-    public byte[] challenge;
-
-    public AuthenticationResult(byte[] challenge, AuthenticationStatus status)
-    {
-        this.status = status;
-        this.challenge = challenge;
-    }
-
-    public AuthenticationResult(AuthenticationStatus status)
-    {
-        this.status = status;
-    }
-}
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
deleted file mode 100644
index 10adfdd9fc..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabase.java
+++ /dev/null
@@ -1,599 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.    
- *
- * 
- */
-package org.apache.qpid.server.security.auth.database;
-
-import org.apache.log4j.Logger;
-import org.apache.qpid.server.security.auth.sasl.AuthenticationProviderInitialiser;
-import org.apache.qpid.server.security.auth.sasl.UsernamePrincipal;
-import org.apache.qpid.server.security.auth.sasl.crammd5.CRAMMD5HashedInitialiser;
-import org.apache.qpid.server.security.access.AMQUserManagementMBean;
-import org.apache.commons.codec.binary.Base64;
-import org.apache.commons.codec.EncoderException;
-
-import javax.security.auth.callback.PasswordCallback;
-import javax.security.auth.login.AccountNotFoundException;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.BufferedReader;
-import java.io.FileReader;
-import java.io.UnsupportedEncodingException;
-import java.io.PrintStream;
-import java.util.regex.Pattern;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.List;
-import java.util.LinkedList;
-import java.util.concurrent.locks.ReentrantLock;
-import java.security.Principal;
-import java.security.NoSuchAlgorithmException;
-import java.security.MessageDigest;
-
-/**
- * Represents a user database where the account information is stored in a simple flat file.
- *
- * The file is expected to be in the form: username:password username1:password1 ... usernamen:passwordn
- *
- * where a carriage return separates each username/password pair. Passwords are assumed to be in plain text.
- */
-public class Base64MD5PasswordFilePrincipalDatabase implements PrincipalDatabase
-{
-    private static final Logger _logger = Logger.getLogger(Base64MD5PasswordFilePrincipalDatabase.class);
-
-    private File _passwordFile;
-
-    private Pattern _regexp = Pattern.compile(":");
-
-    private Map<String, AuthenticationProviderInitialiser> _saslServers;
-
-    AMQUserManagementMBean _mbean;
-    private static final String DEFAULT_ENCODING = "utf-8";
-    private Map<String, User> _users = new HashMap<String, User>();
-    private ReentrantLock _userUpdate = new ReentrantLock();
-
-    public Base64MD5PasswordFilePrincipalDatabase()
-    {
-        _saslServers = new HashMap<String, AuthenticationProviderInitialiser>();
-
-        /**
-         *  Create Authenticators for MD5 Password file.
-         */
-
-        // Accept Plain incomming and hash it for comparison to the file.
-        CRAMMD5HashedInitialiser cram = new CRAMMD5HashedInitialiser();
-        cram.initialise(this);
-        _saslServers.put(cram.getMechanismName(), cram);
-
-        //fixme The PDs should setup a PD Mangement MBean
-//        try
-//        {
-//            _mbean = new AMQUserManagementMBean();
-//            _mbean.setPrincipalDatabase(this);
-//        }
-//        catch (JMException e)
-//        {
-//            _logger.warn("User management disabled as unable to create MBean:" + e);
-//        }
-    }
-
-    public void setPasswordFile(String passwordFile) throws IOException
-    {
-        File f = new File(passwordFile);
-        _logger.info("PasswordFilePrincipalDatabase using file " + f.getAbsolutePath());
-        _passwordFile = f;
-        if (!f.exists())
-        {
-            throw new FileNotFoundException("Cannot find password file " + f);
-        }
-        if (!f.canRead())
-        {
-            throw new FileNotFoundException("Cannot read password file " + f +
-                                            ". Check permissions.");
-        }
-
-        loadPasswordFile();
-    }
-
-    /**
-     * SASL Callback Mechanism - sets the Password in the PasswordCallback based on the value in the PasswordFile
-     *
-     * @param principal The Principal to set the password for
-     * @param callback  The PasswordCallback to call setPassword on
-     *
-     * @throws AccountNotFoundException If the Principal cannont be found in this Database
-     */
-    public void setPassword(Principal principal, PasswordCallback callback) throws AccountNotFoundException
-    {
-        if (_passwordFile == null)
-        {
-            throw new AccountNotFoundException("Unable to locate principal since no password file was specified during initialisation");
-        }
-        if (principal == null)
-        {
-            throw new IllegalArgumentException("principal must not be null");
-        }
-
-        char[] pwd = lookupPassword(principal.getName());
-
-        if (pwd != null)
-        {
-            callback.setPassword(pwd);
-        }
-        else
-        {
-            throw new AccountNotFoundException("No account found for principal " + principal);
-        }
-    }
-
-    /**
-     * Used to verify that the presented Password is correct. Currently only used by Management Console
-     *
-     * @param principal The principal to authenticate
-     * @param password  The password to check
-     *
-     * @return true if password is correct
-     *
-     * @throws AccountNotFoundException if the principal cannot be found
-     */
-    public boolean verifyPassword(String principal, char[] password) throws AccountNotFoundException
-    {
-        char[] pwd = lookupPassword(principal);
-
-        int index = 0;
-        boolean verified = true;
-
-        while (verified & index < password.length)
-        {
-            verified = (pwd[index] == password[index]);
-            index++;
-        }
-        return verified;
-    }
-
-    public boolean updatePassword(Principal principal, char[] password) throws AccountNotFoundException
-    {
-        User user = _users.get(principal.getName());
-
-        if (user == null)
-        {
-            throw new AccountNotFoundException(principal.getName());
-        }
-
-        try
-        {
-            try
-            {
-                _userUpdate.lock();
-                char[] orig = user.getPassword();
-                user.setPassword(password);
-
-                try
-                {
-                    savePasswordFile();
-                }
-                catch (IOException e)
-                {
-                    _logger.error("Unable to save password file, password change for user'"
-                                  + principal + "' will revert at restart");
-                    //revert the password change
-                    user.setPassword(orig);
-                    return false;
-                }
-                return true;
-            }
-            finally
-            {
-                if (_userUpdate.isHeldByCurrentThread())
-                {
-                    _userUpdate.unlock();
-                }
-            }
-        }
-        catch (Exception e)
-        {
-            return false;
-        }
-    }
-
-    public boolean createPrincipal(Principal principal, char[] password)
-    {
-        if (_users.get(principal.getName()) != null)
-        {
-            return false;
-        }
-
-        User user = new User(principal.getName(), password);
-
-        try
-        {
-            _userUpdate.lock();
-            _users.put(user.getName(), user);
-
-            try
-            {
-                savePasswordFile();
-                return true;
-            }
-            catch (IOException e)
-            {
-                //remove the use on failure.
-                _users.remove(user.getName());
-                return false;
-            }
-        }
-        finally
-        {
-            if (_userUpdate.isHeldByCurrentThread())
-            {
-                _userUpdate.unlock();
-            }
-        }
-    }
-
-    public boolean deletePrincipal(Principal principal) throws AccountNotFoundException
-    {
-        User user = _users.get(principal.getName());
-
-        if (user == null)
-        {
-            throw new AccountNotFoundException(principal.getName());
-        }
-
-        try
-        {
-            _userUpdate.lock();
-            user.delete();
-
-            try
-            {
-                savePasswordFile();
-            }
-            catch (IOException e)
-            {
-                _logger.warn("Unable to remove user '" + user.getName() + "' from password file.");
-                return false;
-            }
-
-            _users.remove(user.getName());
-        }
-        finally
-        {
-            if (_userUpdate.isHeldByCurrentThread())
-            {
-                _userUpdate.unlock();
-            }
-        }
-
-        return true;
-    }
-
-
-    public Map<String, AuthenticationProviderInitialiser> getMechanisms()
-    {
-        return _saslServers;
-    }
-
-    public List<Principal> getUsers()
-    {
-        return new LinkedList<Principal>(_users.values());
-    }
-
-    public Principal getUser(String username)
-    {
-        if (_users.containsKey(username))
-        {
-            return new UsernamePrincipal(username);
-        }
-        return null;
-    }
-
-    /**
-     * Looks up the password for a specified user in the password file. Note this code is <b>not</b> secure since it
-     * creates strings of passwords. It should be modified to create only char arrays which get nulled out.
-     *
-     * @param name The principal name to lookup
-     *
-     * @return a char[] for use in SASL.
-     */
-    private char[] lookupPassword(String name)
-    {
-        User user = _users.get(name);
-        if (user == null)
-        {
-            return null;
-        }
-        else
-        {
-            return user.getPassword();
-        }
-    }
-
-
-    private void loadPasswordFile() throws IOException
-    {
-        try
-        {
-            _userUpdate.lock();
-            _users.clear();
-
-            BufferedReader reader = null;
-            try
-            {
-                reader = new BufferedReader(new FileReader(_passwordFile));
-                String line;
-
-                while ((line = reader.readLine()) != null)
-                {
-                    String[] result = _regexp.split(line);
-                    if (result == null || result.length < 2 || result[0].startsWith("#"))
-                    {
-                        continue;
-                    }
-
-                    User user = new User(result);
-                    _logger.info("Created user:" + user);
-                    _users.put(user.getName(), user);
-                }
-            }
-            finally
-            {
-                if (reader != null)
-                {
-                    reader.close();
-                }
-            }
-        }
-        finally
-        {
-            if (_userUpdate.isHeldByCurrentThread())
-            {
-                _userUpdate.unlock();
-            }
-        }
-    }
-
-    private void savePasswordFile() throws IOException
-    {
-        try
-        {
-            _userUpdate.lock();
-
-            BufferedReader reader = null;
-            PrintStream writer = null;
-            File tmp = new File(_passwordFile.getAbsolutePath() + ".tmp");
-            if (tmp.exists())
-            {
-                tmp.delete();
-            }
-            try
-            {
-                writer = new PrintStream(tmp);
-                reader = new BufferedReader(new FileReader(_passwordFile));
-                String line;
-
-                while ((line = reader.readLine()) != null)
-                {
-                    String[] result = _regexp.split(line);
-                    if (result == null || result.length < 2 || result[0].startsWith("#"))
-                    {
-                        writer.write(line.getBytes(DEFAULT_ENCODING));
-                        continue;
-                    }
-
-                    User user = _users.get(result[0]);
-
-                    if (user == null)
-                    {
-                        writer.write(line.getBytes(DEFAULT_ENCODING));
-                        writer.println();
-                    }
-                    else if (!user.isDeleted())
-                    {
-                        if (!user.isModified())
-                        {
-                            writer.write(line.getBytes(DEFAULT_ENCODING));
-                            writer.println();
-                        }
-                        else
-                        {
-                            try
-                            {
-                                byte[] encodedPassword = user.getEncodePassword();
-
-                                writer.write((user.getName() + ":").getBytes(DEFAULT_ENCODING));
-                                writer.write(encodedPassword);
-                                writer.println();
-
-                                user.saved();
-                            }
-                            catch (Exception e)
-                            {
-                                _logger.warn("Unable to encode new password reverting to old password.");
-                                writer.write(line.getBytes(DEFAULT_ENCODING));
-                                writer.println();
-                            }
-                        }
-                    }
-                }
-
-                for (User user : _users.values())
-                {
-                    if (user.isModified())
-                    {
-                        byte[] encodedPassword;
-                        try
-                        {
-                            encodedPassword = user.getEncodePassword();
-                            writer.write((user.getName() + ":").getBytes(DEFAULT_ENCODING));
-                            writer.write(encodedPassword);
-                            writer.println();
-                            user.saved();
-                        }
-                        catch (Exception e)
-                        {
-                            _logger.warn("Unable to get Encoded password for user'" + user.getName() + "' password not saved");
-                        }
-                    }
-                }
-            }
-            finally
-            {
-                if (reader != null)
-                {
-                    reader.close();
-                }
-
-                if (writer != null)
-                {
-                    writer.close();
-                }
-
-                // Swap temp file to main password file.
-                File old = new File(_passwordFile.getAbsoluteFile() + ".old");
-                if (old.exists())
-                {
-                    old.delete();
-                }
-                _passwordFile.renameTo(old);
-                tmp.renameTo(_passwordFile);
-                tmp.delete();
-            }
-        }
-        finally
-        {
-            if (_userUpdate.isHeldByCurrentThread())
-            {
-                _userUpdate.unlock();
-            }
-        }
-    }
-
-    private class User implements Principal
-    {
-        String _name;
-        char[] _password;
-        byte[] _encodedPassword = null;
-        private boolean _modified = false;
-        private boolean _deleted = false;
-
-        User(String[] data) throws UnsupportedEncodingException
-        {
-            if (data.length != 2)
-            {
-                throw new IllegalArgumentException("User Data should be lenght 2, username, password");
-            }
-
-            _name = data[0];
-
-            byte[] encoded_password = data[1].getBytes(DEFAULT_ENCODING);
-
-            Base64 b64 = new Base64();
-            byte[] decoded = b64.decode(encoded_password);
-
-            _encodedPassword = encoded_password;
-
-            _password = new char[decoded.length];
-
-            int index = 0;
-            for (byte c : decoded)
-            {
-                _password[index++] = (char) c;
-            }
-        }
-
-        public User(String name, char[] password)
-        {
-            _name = name;
-            setPassword(password);
-        }
-
-        public String getName()
-        {
-            return _name;
-        }
-
-        public String toString()
-        {
-            if (_logger.isDebugEnabled())
-            {
-                return getName() + ((_encodedPassword == null) ? "" : ":" + new String(_encodedPassword));
-            }
-            else
-            {
-                return _name;
-            }
-        }
-
-        char[] getPassword()
-        {
-            return _password;
-        }
-
-        void setPassword(char[] password)
-        {
-            _password = password;
-            _modified = true;
-            _encodedPassword = null;
-        }
-
-
-        byte[] getEncodePassword() throws EncoderException, UnsupportedEncodingException, NoSuchAlgorithmException
-        {
-            if (_encodedPassword == null)
-            {
-                encodePassword();
-            }
-            return _encodedPassword;
-        }
-
-        private void encodePassword() throws EncoderException, UnsupportedEncodingException, NoSuchAlgorithmException
-        {
-            byte[] byteArray = new byte[_password.length];
-            int index = 0;
-            for (char c : _password)
-            {
-                byteArray[index++] = (byte) c;
-            }
-            _encodedPassword = (new Base64()).encode(byteArray);
-        }
-
-        public boolean isModified()
-        {
-            return _modified;
-        }
-
-        public boolean isDeleted()
-        {
-            return _deleted;
-        }
-
-        public void delete()
-        {
-            _deleted = true;
-        }
-
-        public void saved()
-        {
-            _modified = false;
-        }
-
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/ConfigurationFilePrincipalDatabaseManager.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/ConfigurationFilePrincipalDatabaseManager.java
deleted file mode 100644
index 06eb9329a6..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/ConfigurationFilePrincipalDatabaseManager.java
+++ /dev/null
@@ -1,238 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.security.auth.database;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.lang.reflect.Method;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.management.JMException;
-
-import org.apache.commons.configuration.Configuration;
-import org.apache.commons.configuration.ConfigurationException;
-
-import org.apache.log4j.Logger;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.configuration.PropertyException;
-import org.apache.qpid.configuration.PropertyUtils;
-import org.apache.qpid.server.registry.ApplicationRegistry;
-import org.apache.qpid.server.security.access.AMQUserManagementMBean;
-import org.apache.qpid.server.security.auth.database.PrincipalDatabase;
-import org.apache.qpid.server.security.auth.database.PrincipalDatabaseManager;
-
-public class ConfigurationFilePrincipalDatabaseManager implements PrincipalDatabaseManager
-{
-    private static final Logger _logger = Logger.getLogger(ConfigurationFilePrincipalDatabaseManager.class);
-
-    private static final String _base = "security.principal-databases.principal-database";
-
-    Map<String, PrincipalDatabase> _databases;
-
-    public ConfigurationFilePrincipalDatabaseManager() throws Exception
-    {
-        _logger.info("Initialising PrincipleDatabase authentication manager");
-        _databases = initialisePrincipalDatabases();
-    }
-
-    private Map<String, PrincipalDatabase> initialisePrincipalDatabases() throws Exception
-    {
-        Configuration config = ApplicationRegistry.getInstance().getConfiguration();
-        List<String> databaseNames = config.getList(_base + ".name");
-        List<String> databaseClasses = config.getList(_base + ".class");
-        Map<String, PrincipalDatabase> databases = new HashMap<String, PrincipalDatabase>();
-
-        if (databaseNames.size() == 0)
-        {
-            _logger.warn("No Principal databases specified. Broker running with NO AUTHENTICATION");
-        }
-
-        for (int i = 0; i < databaseNames.size(); i++)
-        {
-            Object o;
-            try
-            {
-                o = Class.forName(databaseClasses.get(i)).newInstance();
-            }
-            catch (Exception e)
-            {
-                throw new Exception("Error initialising principal database: " + e, e);
-            }
-
-            if (!(o instanceof PrincipalDatabase))
-            {
-                throw new Exception("Principal databases must implement the PrincipalDatabase interface");
-            }
-
-            initialisePrincipalDatabase((PrincipalDatabase) o, config, i);
-
-            String name = databaseNames.get(i);
-            if ((name == null) || (name.length() == 0))
-            {
-                throw new Exception("Principal database names must have length greater than or equal to one character");
-            }
-
-            PrincipalDatabase pd = databases.get(name);
-            if (pd != null)
-            {
-                throw new Exception("Duplicate principal database name not provided");
-            }
-
-            _logger.info("Initialised principal database '" + name + "' successfully");
-            databases.put(name, (PrincipalDatabase) o);
-        }
-
-        return databases;
-    }
-
-    private void initialisePrincipalDatabase(PrincipalDatabase principalDatabase, Configuration config, int index)
-            throws FileNotFoundException, ConfigurationException
-    {
-        String baseName = _base + "(" + index + ").attributes.attribute.";
-        List<String> argumentNames = config.getList(baseName + "name");
-        List<String> argumentValues = config.getList(baseName + "value");
-        for (int i = 0; i < argumentNames.size(); i++)
-        {
-            String argName = argumentNames.get(i);
-            if ((argName == null) || (argName.length() == 0))
-            {
-                throw new ConfigurationException("Argument names must have length >= 1 character");
-            }
-
-            if (Character.isLowerCase(argName.charAt(0)))
-            {
-                argName = Character.toUpperCase(argName.charAt(0)) + argName.substring(1);
-            }
-
-            String methodName = "set" + argName;
-            Method method = null;
-            try
-            {
-                method = principalDatabase.getClass().getMethod(methodName, String.class);
-            }
-            catch (Exception e)
-            {
-                // do nothing.. as on error method will be null
-            }
-
-            if (method == null)
-            {
-                throw new ConfigurationException("No method " + methodName + " found in class "
-                                                 + principalDatabase.getClass()
-                                                 + " hence unable to configure principal database. The method must be public and "
-                                                 + "have a single String argument with a void return type");
-            }
-
-            try
-            {
-                method.invoke(principalDatabase, PropertyUtils.replaceProperties(argumentValues.get(i)));
-            }
-            catch (Exception ite)
-            {
-                if (ite instanceof ConfigurationException)
-                {
-                    throw(ConfigurationException) ite;
-                }
-                else
-                {
-                    throw new ConfigurationException(ite.getMessage(), ite);
-                }
-            }
-        }
-    }
-
-    public Map<String, PrincipalDatabase> getDatabases()
-    {
-        return _databases;
-    }
-
-    public void initialiseManagement(Configuration config) throws ConfigurationException
-    {
-        try
-        {
-            AMQUserManagementMBean _mbean = new AMQUserManagementMBean();
-
-            String baseSecurity = "security.jmx";
-            List<String> principalDBs = config.getList(baseSecurity + ".principal-database");
-
-            if (principalDBs.size() == 0)
-            {
-                throw new ConfigurationException("No principal-database specified for jmx security(" + baseSecurity
-                    + ".principal-database)");
-            }
-
-            String databaseName = principalDBs.get(0);
-
-            PrincipalDatabase database = getDatabases().get(databaseName);
-
-            if (database == null)
-            {
-                throw new ConfigurationException("Principal-database '" + databaseName + "' not found");
-            }
-
-            _mbean.setPrincipalDatabase(database);
-
-            List<String> jmxaccesslist = config.getList(baseSecurity + ".access");
-
-            if (jmxaccesslist.size() == 0)
-            {
-                throw new ConfigurationException("No access control files specified for jmx security(" + baseSecurity
-                    + ".access)");
-            }
-
-            String jmxaccesssFile = null;
-
-            try
-            {
-                jmxaccesssFile = PropertyUtils.replaceProperties(jmxaccesslist.get(0));
-            }
-            catch (PropertyException e)
-            {
-                throw new ConfigurationException("Unable to parse access control filename '" + jmxaccesssFile + "'", e);
-            }
-
-            try
-            {
-                _mbean.setAccessFile(jmxaccesssFile);
-            }
-            catch (IOException e)
-            {
-                _logger.warn("Unable to load access file:" + jmxaccesssFile);
-            }
-
-            try
-            {
-                _mbean.register();
-            }
-            catch (AMQException e)
-            {
-                _logger.warn("Unable to register user management MBean");
-            }
-        }
-        catch (JMException e)
-        {
-            _logger.warn("User management disabled as unable to create MBean:" + e);
-        }
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PlainPasswordFilePrincipalDatabase.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PlainPasswordFilePrincipalDatabase.java
deleted file mode 100644
index 352d41a0ba..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PlainPasswordFilePrincipalDatabase.java
+++ /dev/null
@@ -1,240 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.    
- *
- * 
- */
-package org.apache.qpid.server.security.auth.database;
-
-import org.apache.log4j.Logger;
-import org.apache.qpid.server.security.auth.sasl.AuthenticationProviderInitialiser;
-import org.apache.qpid.server.security.auth.sasl.UsernamePrincipal;
-import org.apache.qpid.server.security.auth.sasl.amqplain.AmqPlainInitialiser;
-import org.apache.qpid.server.security.auth.sasl.crammd5.CRAMMD5Initialiser;
-import org.apache.qpid.server.security.auth.sasl.plain.PlainInitialiser;
-
-import javax.security.auth.callback.PasswordCallback;
-import javax.security.auth.login.AccountNotFoundException;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.IOException;
-import java.security.Principal;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.regex.Pattern;
-
-/**
- * Represents a user database where the account information is stored in a simple flat file.
- *
- * The file is expected to be in the form: username:password username1:password1 ... usernamen:passwordn
- *
- * where a carriage return separates each username/password pair. Passwords are assumed to be in plain text.
- */
-public class PlainPasswordFilePrincipalDatabase implements PrincipalDatabase
-{
-    private static final Logger _logger = Logger.getLogger(PlainPasswordFilePrincipalDatabase.class);
-
-    protected File _passwordFile;
-
-    protected Pattern _regexp = Pattern.compile(":");
-
-    protected Map<String, AuthenticationProviderInitialiser> _saslServers;
-
-    public PlainPasswordFilePrincipalDatabase()
-    {
-        _saslServers = new HashMap<String, AuthenticationProviderInitialiser>();
-
-        /**
-         *  Create Authenticators for Plain Password file.
-         */
-
-        // Accept AMQPlain incomming and compare it to the file.
-        AmqPlainInitialiser amqplain = new AmqPlainInitialiser();
-        amqplain.initialise(this);
-
-        // Accept Plain incomming and compare it to the file.
-        PlainInitialiser plain = new PlainInitialiser();
-        plain.initialise(this);
-
-        //  Accept MD5 incomming and Hash file value for comparison
-        CRAMMD5Initialiser cram = new CRAMMD5Initialiser();
-        cram.initialise(this);
-
-        _saslServers.put(amqplain.getMechanismName(), amqplain);
-        _saslServers.put(plain.getMechanismName(), plain);
-        _saslServers.put(cram.getMechanismName(), cram);
-    }
-
-    public void setPasswordFile(String passwordFile) throws FileNotFoundException
-    {
-        File f = new File(passwordFile);
-        _logger.info("PlainPasswordFile using file " + f.getAbsolutePath());
-        _passwordFile = f;
-        if (!f.exists())
-        {
-            throw new FileNotFoundException("Cannot find password file " + f);
-        }
-        if (!f.canRead())
-        {
-            throw new FileNotFoundException("Cannot read password file " + f +
-                                            ". Check permissions.");
-        }
-    }
-
-    public void setPassword(Principal principal, PasswordCallback callback) throws IOException,
-                                                                                   AccountNotFoundException
-    {
-        if (_passwordFile == null)
-        {
-            throw new AccountNotFoundException("Unable to locate principal since no password file was specified during initialisation");
-        }
-        if (principal == null)
-        {
-            throw new IllegalArgumentException("principal must not be null");
-        }
-        char[] pwd = lookupPassword(principal.getName());
-        if (pwd != null)
-        {
-            callback.setPassword(pwd);
-        }
-        else
-        {
-            throw new AccountNotFoundException("No account found for principal " + principal);
-        }
-    }
-
-    public boolean verifyPassword(String principal, char[] password) throws AccountNotFoundException
-    {
-        try
-        {
-            char[] pwd = lookupPassword(principal);
-
-            return compareCharArray(pwd, password);
-        }
-        catch (IOException e)
-        {
-            return false;
-        }
-    }
-
-    public boolean updatePassword(Principal principal, char[] password) throws AccountNotFoundException
-    {
-        return false; // updates denied
-    }
-
-    public boolean createPrincipal(Principal principal, char[] password)
-    {
-        return false; // updates denied
-    }
-
-    public boolean deletePrincipal(Principal principal) throws AccountNotFoundException
-    {
-        return false; // updates denied
-    }
-
-    public Map<String, AuthenticationProviderInitialiser> getMechanisms()
-    {
-        return _saslServers;
-    }
-
-    public List<Principal> getUsers()
-    {
-        return new LinkedList<Principal>(); //todo
-    }
-
-    public Principal getUser(String username)
-    {
-        try
-        {
-            if (lookupPassword(username) != null)
-            {
-                return new UsernamePrincipal(username);
-            }
-        }
-        catch (IOException e)
-        {
-            //fall through to null return
-        }
-        return null;
-    }
-
-    private boolean compareCharArray(char[] a, char[] b)
-    {
-        boolean equal = false;
-        if (a.length == b.length)
-        {
-            equal = true;
-            int index = 0;
-            while (equal && index < a.length)
-            {
-                equal = a[index] == b[index];
-                index++;
-            }
-        }
-        return equal;
-    }
-
-
-    /**
-     * Looks up the password for a specified user in the password file. Note this code is <b>not</b> secure since it
-     * creates strings of passwords. It should be modified to create only char arrays which get nulled out.
-     *
-     * @param name the name of the principal to lookup
-     *
-     * @return char[] of the password
-     *
-     * @throws java.io.IOException whilst accessing the file
-     */
-    private char[] lookupPassword(String name) throws IOException
-    {
-        BufferedReader reader = null;
-        try
-        {
-            reader = new BufferedReader(new FileReader(_passwordFile));
-            String line;
-
-            while ((line = reader.readLine()) != null)
-            {
-                if (!line.startsWith("#"))
-                {
-                    String[] result = _regexp.split(line);
-                    if (result == null || result.length < 2)
-                    {
-                        continue;
-                    }
-
-                    if (name.equals(result[0]))
-                    {
-                        return result[1].toCharArray();
-                    }
-                }
-            }
-            return null;
-        }
-        finally
-        {
-            if (reader != null)
-            {
-                reader.close();
-            }
-        }
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PlainPasswordVhostFilePrincipalDatabase.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PlainPasswordVhostFilePrincipalDatabase.java
deleted file mode 100644
index 5c372f6c2c..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PlainPasswordVhostFilePrincipalDatabase.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.    
- *
- * 
- */
-package org.apache.qpid.server.security.auth.database;
-
-import org.apache.log4j.Logger;
-import org.apache.qpid.server.security.access.AccessManager;
-import org.apache.qpid.server.security.access.AccessResult;
-import org.apache.qpid.server.security.access.AccessRights;
-import org.apache.qpid.server.security.access.Accessable;
-import org.apache.qpid.server.security.auth.sasl.UsernamePrincipal;
-import org.apache.qpid.server.virtualhost.VirtualHost;
-
-import java.io.BufferedReader;
-import java.io.FileReader;
-import java.io.IOException;
-import java.security.Principal;
-
-/**
- * Represents a user database where the account information is stored in a simple flat file.
- *
- * The file is expected to be in the form: username:password username1:password1 ... usernamen:passwordn
- *
- * where a carriage return separates each username/password pair. Passwords are assumed to be in plain text.
- */
-public class PlainPasswordVhostFilePrincipalDatabase extends PlainPasswordFilePrincipalDatabase implements AccessManager
-{
-    private static final Logger _logger = Logger.getLogger(PlainPasswordVhostFilePrincipalDatabase.class);
-
-    /**
-     * Looks up the virtual hosts for a specified user in the password file.
-     *
-     * @param user The user to lookup
-     *
-     * @return a list of virtualhosts
-     */
-    private String[] lookupVirtualHost(String user)
-    {
-        try
-        {
-            BufferedReader reader = null;
-            try
-            {
-                reader = new BufferedReader(new FileReader(_passwordFile));
-                String line;
-
-                while ((line = reader.readLine()) != null)
-                {
-                    if (!line.startsWith("#"))
-                    {
-                        String[] result = _regexp.split(line);
-                        if (result == null || result.length < 3)
-                        {
-                            continue;
-                        }
-
-                        if (user.equals(result[0]))
-                        {
-                            return result[2].split(",");
-                        }
-                    }
-                }
-                return null;
-            }
-            finally
-            {
-                if (reader != null)
-                {
-                    reader.close();
-                }
-            }
-        }
-        catch (IOException ioe)
-        {
-            //ignore
-        }
-        return null;
-    }
-
-
-    public AccessResult isAuthorized(Accessable accessObject, String username)
-    {
-        return isAuthorized(accessObject, new UsernamePrincipal(username), AccessRights.Rights.READ);
-    }
-
-    public AccessResult isAuthorized(Accessable accessObject, Principal user, AccessRights.Rights rights)
-    {
-
-        if (accessObject instanceof VirtualHost)
-        {
-            String[] hosts = lookupVirtualHost(user.getName());
-
-            if (hosts != null)
-            {
-                for (String host : hosts)
-                {
-                    if (accessObject.getAccessableName().equals(host))
-                    {
-                        return new AccessResult(this, AccessResult.AccessStatus.GRANTED);
-                    }
-                }
-            }
-        }
-
-        return new AccessResult(this, AccessResult.AccessStatus.REFUSED);
-    }
-
-    public String getName()
-    {
-        return "PlainPasswordVhostFile";
-    }
-
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PrincipalDatabase.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PrincipalDatabase.java
deleted file mode 100644
index a82f9ed40b..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PrincipalDatabase.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.security.auth.database;
-
-import org.apache.qpid.server.security.auth.sasl.AuthenticationProviderInitialiser;
-
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.security.Principal;
-import java.util.Map;
-import java.util.List;
-
-import javax.security.auth.callback.PasswordCallback;
-import javax.security.auth.login.AccountNotFoundException;
-
-/** Represents a "user database" which is really a way of storing principals (i.e. usernames) and passwords. */
-public interface PrincipalDatabase
-{
-    /**
-     * Set the password for a given principal in the specified callback. This is used for certain SASL providers. The
-     * user database implementation should look up the password in any way it chooses and set it in the callback by
-     * calling its setPassword method.
-     *
-     * @param principal the principal
-     * @param callback  the password callback that wants to receive the password
-     *
-     * @throws AccountNotFoundException if the account for specified principal could not be found
-     * @throws IOException              if there was an error looking up the principal
-     */
-    void setPassword(Principal principal, PasswordCallback callback)
-            throws IOException, AccountNotFoundException;
-
-     /**
-     * Used to verify that the presented Password is correct. Currently only used by Management Console
-     * @param principal The principal to authenticate
-     * @param password The password to check
-     * @return true if password is correct
-     * @throws AccountNotFoundException if the principal cannot be found
-     */
-    boolean verifyPassword(String principal, char[] password)
-            throws AccountNotFoundException;
-
-    /**
-     * Update(Change) the password for the given principal
-     * @param principal Who's password is to be changed
-     * @param password The new password to use
-     * @return True if change was successful
-     * @throws AccountNotFoundException If the given principal doesn't exist in the Database
-     */
-    boolean updatePassword(Principal principal, char[] password)
-            throws AccountNotFoundException;
-
-    /**
-     * Create a new principal in the database
-     * @param principal The principal to create
-     * @param password The password to set for the principal
-     * @return True on a successful creation
-     */
-    boolean createPrincipal(Principal principal, char[] password);
-
-    /**
-     * Delete a principal
-     * @param principal The principal to delete
-     * @return True on a successful creation
-     * @throws AccountNotFoundException If the given principal doesn't exist in the Database
-     */
-    boolean deletePrincipal(Principal principal)
-            throws AccountNotFoundException;
-
-    /**
-     * Get the principal from the database with the given username
-     * @param username of the principal to lookup
-     * @return The Principal object for the given username or null if not found.
-     */
-    Principal getUser(String username);
-
-
-    public Map<String, AuthenticationProviderInitialiser> getMechanisms();
-
-
-    List<Principal> getUsers();
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PrincipalDatabaseManager.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PrincipalDatabaseManager.java
deleted file mode 100644
index 2c553ae76a..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PrincipalDatabaseManager.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.    
- *
- * 
- */
-package org.apache.qpid.server.security.auth.database;
-
-import org.apache.qpid.server.security.auth.database.PrincipalDatabase;
-import org.apache.commons.configuration.Configuration;
-import org.apache.commons.configuration.ConfigurationException;
-
-import java.util.Map;
-
-public interface PrincipalDatabaseManager
-{
-    public Map<String, PrincipalDatabase> getDatabases();
-
-    public void initialiseManagement(Configuration config) throws ConfigurationException;
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PropertiesPrincipalDatabase.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PropertiesPrincipalDatabase.java
deleted file mode 100644
index 73d58ca489..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PropertiesPrincipalDatabase.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.    
- *
- * 
- */
-package org.apache.qpid.server.security.auth.database;
-
-import org.apache.qpid.server.security.auth.sasl.AuthenticationProviderInitialiser;
-import org.apache.qpid.server.security.auth.sasl.UsernamePrincipal;
-import org.apache.qpid.server.security.auth.sasl.crammd5.CRAMMD5Initialiser;
-import org.apache.qpid.server.security.auth.sasl.plain.PlainInitialiser;
-
-import javax.security.auth.callback.PasswordCallback;
-import javax.security.auth.login.AccountNotFoundException;
-import java.util.Properties;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.List;
-import java.util.LinkedList;
-import java.security.Principal;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-
-public class PropertiesPrincipalDatabase implements PrincipalDatabase
-{
-    private Properties _users;
-
-    private Map<String, AuthenticationProviderInitialiser> _saslServers;
-
-    public PropertiesPrincipalDatabase(Properties users)
-    {
-        _users = users;
-
-        _saslServers = new HashMap<String, AuthenticationProviderInitialiser>();
-
-        /**
-         *  Create Authenticators for Properties Principal Database.
-         */
-
-        //  Accept MD5 incomming and use plain comparison with the file
-        PlainInitialiser cram = new PlainInitialiser();
-        cram.initialise(this);
-        // Accept Plain incomming and hash it for comparison to the file.
-        CRAMMD5Initialiser plain = new CRAMMD5Initialiser();
-        plain.initialise(this, CRAMMD5Initialiser.HashDirection.INCOMMING);
-
-        _saslServers.put(plain.getMechanismName(), cram);
-        _saslServers.put(cram.getMechanismName(), plain);
-    }
-
-    public void setPassword(Principal principal, PasswordCallback callback) throws IOException, AccountNotFoundException
-    {
-        if (principal == null)
-        {
-            throw new IllegalArgumentException("principal must not be null");
-        }
-        char[] pwd = _users.getProperty(principal.getName()).toCharArray();
-        if (pwd != null)
-        {
-            callback.setPassword(pwd);
-        }
-        else
-        {
-            throw new AccountNotFoundException("No account found for principal " + principal);
-        }
-    }
-
-    public boolean verifyPassword(String principal, char[] password) throws AccountNotFoundException
-    {
-        //fixme this is not correct as toCharArray is not safe based on the type of string.
-        char[] pwd = _users.getProperty(principal).toCharArray();
-
-        return compareCharArray(pwd, password);
-    }
-
-    public boolean updatePassword(Principal principal, char[] password) throws AccountNotFoundException
-    {
-        return false; // updates denied
-    }
-
-    public boolean createPrincipal(Principal principal, char[] password)
-    {
-        return false; // updates denied
-    }
-
-    public boolean deletePrincipal(Principal principal) throws AccountNotFoundException
-    {
-        return false; // updates denied
-    }
-
-    private boolean compareCharArray(char[] a, char[] b)
-    {
-        boolean equal = false;
-        if (a.length == b.length)
-        {
-            equal = true;
-            int index = 0;
-            while (equal && index < a.length)
-            {
-                equal = a[index] == b[index];
-                index++;
-            }
-        }
-        return equal;
-    }
-
-    private char[] convertPassword(String password) throws UnsupportedEncodingException
-    {
-        byte[] passwdBytes = password.getBytes("utf-8");
-
-        char[] passwd = new char[passwdBytes.length];
-
-        int index = 0;
-
-        for (byte b : passwdBytes)
-        {
-            passwd[index++] = (char) b;
-        }
-
-        return passwd;
-    }
-
-
-    public Map<String, AuthenticationProviderInitialiser> getMechanisms()
-    {
-        return _saslServers;
-    }
-
-    public List<Principal> getUsers()
-    {
-        return new LinkedList<Principal>(); //todo
-    }
-
-    public Principal getUser(String username)
-    {
-        if (_users.getProperty(username) != null)
-        {
-            return new UsernamePrincipal(username);
-        }
-        else
-        {
-            return null;
-        }
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PropertiesPrincipalDatabaseManager.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PropertiesPrincipalDatabaseManager.java
deleted file mode 100644
index 6b86a46bd2..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PropertiesPrincipalDatabaseManager.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.    
- *
- * 
- */
-package org.apache.qpid.server.security.auth.database;
-
-import org.apache.commons.configuration.Configuration;
-
-import java.util.Map;
-import java.util.Properties;
-import java.util.HashMap;
-
-public class PropertiesPrincipalDatabaseManager implements PrincipalDatabaseManager
-{
-
-    Map<String, PrincipalDatabase> _databases = new HashMap<String, PrincipalDatabase>();
-
-    public PropertiesPrincipalDatabaseManager(String name, Properties users)
-    {
-        _databases.put(name, new PropertiesPrincipalDatabase(users));
-    }
-
-    public Map<String, PrincipalDatabase> getDatabases()
-    {
-        return _databases;
-    }
-
-    public void initialiseManagement(Configuration config)
-    {
-        //todo
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/AuthenticationManager.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/AuthenticationManager.java
deleted file mode 100644
index bb94e0b7bf..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/AuthenticationManager.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.security.auth.manager;
-
-import org.apache.qpid.server.virtualhost.VirtualHost;
-import org.apache.qpid.server.security.auth.AuthenticationResult;
-
-import javax.security.sasl.SaslException;
-import javax.security.sasl.SaslServer;
-
-public interface AuthenticationManager
-{
-    String getMechanisms();
-
-    SaslServer createSaslServer(String mechanism, String localFQDN) throws SaslException;
-
-    AuthenticationResult authenticate(SaslServer server, byte[] response);
-
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java
deleted file mode 100644
index ce5e0cd748..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java
+++ /dev/null
@@ -1,249 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.    
- *
- * 
- */
-package org.apache.qpid.server.security.auth.manager;
-
-import org.apache.log4j.Logger;
-import org.apache.commons.configuration.Configuration;
-import org.apache.commons.configuration.ConfigurationException;
-import org.apache.commons.configuration.SubsetConfiguration;
-import org.apache.qpid.server.registry.ApplicationRegistry;
-import org.apache.qpid.server.virtualhost.VirtualHost;
-import org.apache.qpid.server.security.auth.manager.AuthenticationManager;
-import org.apache.qpid.server.security.auth.database.PrincipalDatabase;
-import org.apache.qpid.server.security.auth.sasl.JCAProvider;
-import org.apache.qpid.server.security.auth.sasl.AuthenticationProviderInitialiser;
-import org.apache.qpid.server.security.auth.AuthenticationResult;
-
-import javax.security.auth.callback.CallbackHandler;
-import javax.security.sasl.SaslServerFactory;
-import javax.security.sasl.SaslServer;
-import javax.security.sasl.SaslException;
-import javax.security.sasl.Sasl;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.TreeMap;
-import java.security.Security;
-
-public class PrincipalDatabaseAuthenticationManager implements AuthenticationManager
-{
-    private static final Logger _logger = Logger.getLogger(PrincipalDatabaseAuthenticationManager.class);
-
-    /** The list of mechanisms, in the order in which they are configured (i.e. preferred order) */
-    private String _mechanisms;
-
-    /** Maps from the mechanism to the callback handler to use for handling those requests */
-    private Map<String, CallbackHandler> _callbackHandlerMap = new HashMap<String, CallbackHandler>();
-
-    /**
-     * Maps from the mechanism to the properties used to initialise the server. See the method Sasl.createSaslServer for
-     * details of the use of these properties. This map is populated during initialisation of each provider.
-     */
-    private Map<String, Map<String, ?>> _serverCreationProperties = new HashMap<String, Map<String, ?>>();
-
-    private AuthenticationManager _default = null;
-
-    public PrincipalDatabaseAuthenticationManager(String name, Configuration hostConfig) throws Exception
-    {
-        _logger.info("Initialising " + (name == null ? "Default" : "'" + name + "'")
-                     + " PrincipleDatabase authentication manager.");
-
-        // Fixme This should be done per Vhost but allowing global hack isn't right but ...
-        // required as authentication is done before Vhost selection
-
-        Map<String, Class<? extends SaslServerFactory>> providerMap = new TreeMap<String, Class<? extends SaslServerFactory>>();
-
-
-        if (name == null || hostConfig == null)
-        {
-            initialiseAuthenticationMechanisms(providerMap, ApplicationRegistry.getInstance().getDatabaseManager().getDatabases());
-        }
-        else
-        {
-            String databaseName = hostConfig.getString("security.authentication.name");
-
-            if (databaseName == null)
-            {
-
-                if (hostConfig instanceof SubsetConfiguration)
-                {
-                    _logger.warn("No authentication specified for '" + ((SubsetConfiguration) hostConfig).getPrefix() + "'. Using Default authentication manager");
-                }
-                else
-                {
-                    _logger.warn("No authentication specified. Using Default authentication manager");
-                }
-                _default = ApplicationRegistry.getInstance().getAuthenticationManager();
-                return;
-            }
-            else
-            {
-                PrincipalDatabase database = ApplicationRegistry.getInstance().getDatabaseManager().getDatabases().get(databaseName);
-
-                if (database == null)
-                {
-                    throw new ConfigurationException("Requested database:" + databaseName + " was not found");
-                }
-
-                initialiseAuthenticationMechanisms(providerMap, database);
-            }
-        }
-
-        if (providerMap.size() > 0)
-        {
-            // Ensure we are used before the defaults
-            if (Security.insertProviderAt(new JCAProvider(providerMap), 1) == -1)
-            {
-                _logger.warn("Unable to set order of providers.");
-            }
-        }
-        else
-        {
-            _logger.warn("No additional SASL providers registered.");
-        }
-
-    }
-
-
-    private void initialiseAuthenticationMechanisms(Map<String, Class<? extends SaslServerFactory>> providerMap, Map<String, PrincipalDatabase> databases) throws Exception
-    {
-//        Configuration config = ApplicationRegistry.getInstance().getConfiguration();
-//        List<String> mechanisms = config.getList("security.sasl.mechanisms.mechanism.initialiser.class");
-//
-//        // Maps from the mechanism to the properties used to initialise the server. See the method
-//        // Sasl.createSaslServer for details of the use of these properties. This map is populated during initialisation
-//        // of each provider.
-
-
-        if (databases.size() > 1)
-        {
-            _logger.warn("More than one principle database provided currently authentication mechanism will override each other.");
-        }
-
-        for (Map.Entry<String, PrincipalDatabase> entry : databases.entrySet())
-        {
-
-            // fixme As the database now provide the mechanisms they support, they will ...
-            // overwrite each other in the map. There should only be one database per vhost.
-            // But currently we must have authentication before vhost definition.
-            initialiseAuthenticationMechanisms(providerMap, entry.getValue());
-        }
-
-    }
-
-    private void initialiseAuthenticationMechanisms(Map<String, Class<? extends SaslServerFactory>> providerMap, PrincipalDatabase database) throws Exception
-    {
-        if (database == null || database.getMechanisms().size() == 0)
-        {
-            _logger.warn("No Database or no mechanisms to initialise authentication");
-            return;
-        }
-
-        for (Map.Entry<String, AuthenticationProviderInitialiser> mechanism : database.getMechanisms().entrySet())
-        {
-            initialiseAuthenticationMechanism(mechanism.getKey(), mechanism.getValue(), providerMap);
-        }
-    }
-
-    private void initialiseAuthenticationMechanism(String mechanism, AuthenticationProviderInitialiser initialiser,
-                                                   Map<String, Class<? extends SaslServerFactory>> providerMap)
-            throws Exception
-    {
-        if (_mechanisms == null)
-        {
-            _mechanisms = mechanism;
-        }
-        else
-        {
-            // simple append should be fine since the number of mechanisms is small and this is a one time initialisation
-            _mechanisms = _mechanisms + " " + mechanism;
-        }
-        _callbackHandlerMap.put(mechanism, initialiser.getCallbackHandler());
-        _serverCreationProperties.put(mechanism, initialiser.getProperties());
-        Class<? extends SaslServerFactory> factory = initialiser.getServerFactoryClassForJCARegistration();
-        if (factory != null)
-        {
-            providerMap.put(mechanism, factory);
-        }
-        _logger.info("Initialised " + mechanism + " SASL provider successfully");
-    }
-
-    public String getMechanisms()
-    {
-        if (_default != null)
-        {
-            // Use the default AuthenticationManager if present
-            return _default.getMechanisms();
-        }
-        else
-        {
-            return _mechanisms;
-        }
-    }
-
-    public SaslServer createSaslServer(String mechanism, String localFQDN) throws SaslException
-    {
-        if (_default != null)
-        {
-            // Use the default AuthenticationManager if present
-            return _default.createSaslServer(mechanism, localFQDN);
-        }
-        else
-        {
-            return Sasl.createSaslServer(mechanism, "AMQP", localFQDN, _serverCreationProperties.get(mechanism),
-                                         _callbackHandlerMap.get(mechanism));
-        }
-
-    }
-
-    public AuthenticationResult authenticate(SaslServer server, byte[] response)
-    {
-        // Use the default AuthenticationManager if present
-        if (_default != null)
-        {
-            return _default.authenticate(server, response);
-        }
-
-
-        try
-        {
-            // Process response from the client
-            byte[] challenge = server.evaluateResponse(response != null ? response : new byte[0]);
-
-            if (server.isComplete())
-            {
-                return new AuthenticationResult(challenge, AuthenticationResult.AuthenticationStatus.SUCCESS);
-            }
-            else
-            {
-                return new AuthenticationResult(challenge, AuthenticationResult.AuthenticationStatus.CONTINUE);
-            }
-        }
-        catch (SaslException e)
-        {
-            return new AuthenticationResult(AuthenticationResult.AuthenticationStatus.ERROR);
-        }
-    }
-
-    public AuthenticationResult isAuthorize(VirtualHost vhost, String username)
-    {
-        return new AuthenticationResult(AuthenticationResult.AuthenticationStatus.ERROR);
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/AuthenticationProviderInitialiser.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/AuthenticationProviderInitialiser.java
deleted file mode 100644
index 89e545d6f5..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/AuthenticationProviderInitialiser.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.security.auth.sasl;
-
-import java.util.Map;
-
-import javax.security.auth.callback.CallbackHandler;
-import javax.security.sasl.SaslServerFactory;
-
-import org.apache.commons.configuration.Configuration;
-import org.apache.qpid.server.security.auth.database.PrincipalDatabase;
-
-public interface AuthenticationProviderInitialiser
-{
-    /**
-     * @return the mechanism's name. This will be used in the list of mechanism's advertised to the
-     * client.
-     */
-    String getMechanismName();
-
-    /**
-     * Initialise the authentication provider.
-     * @param baseConfigPath the path in the config file that points to any config options for this provider. Each
-     * provider can have its own set of configuration options
-     * @param configuration the Apache Commons Configuration instance used to configure this provider
-     * @param principalDatabases the set of principal databases that are available
-     * @throws Exception needs refined Exception is too broad.
-     */
-    void initialise(String baseConfigPath, Configuration configuration,
-                    Map<String, PrincipalDatabase> principalDatabases) throws Exception;
-
-    /**
-     * Initialise the authentication provider.     
-     * @param db The principal database to initialise with
-     */
-    void initialise(PrincipalDatabase db);
-
-
-    /**
-     * @return the callback handler that should be used to process authentication requests for this mechanism. This will
-     * be called after initialise and will be stored by the authentication manager. The callback handler <b>must</b> be
-     * fully threadsafe.
-     */
-    CallbackHandler getCallbackHandler();
-
-    /**
-     * Get the properties that must be passed in to the Sasl.createSaslServer method.
-     * @return the properties, which may be null
-     */
-    Map<String, ?> getProperties();
-
-    /**
-     * Get the class that is the server factory. This is used for the JCA registration.
-     * @return null if no JCA registration is required, otherwise return the class
-     * that will be used in JCA registration
-     */
-    Class<? extends SaslServerFactory> getServerFactoryClassForJCARegistration();
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/JCAProvider.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/JCAProvider.java
deleted file mode 100644
index fd4ad86055..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/JCAProvider.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.security.auth.sasl;
-
-import java.security.Provider;
-import java.security.Security;
-import java.util.Map;
-
-import javax.security.sasl.SaslServerFactory;
-
-public final class JCAProvider extends Provider
-{
-    public JCAProvider(Map<String, Class<? extends SaslServerFactory>> providerMap)
-    {
-        super("AMQSASLProvider", 1.0, "A JCA provider that registers all " +
-              "AMQ SASL providers that want to be registered");
-        register(providerMap);
-        //Security.addProvider(this);
-    }
-
-    private void register(Map<String, Class<? extends SaslServerFactory>> providerMap)
-    {
-        for (Map.Entry<String, Class<? extends SaslServerFactory>> me :
-             providerMap.entrySet())
-        {
-            put("SaslServerFactory." + me.getKey(), me.getValue().getName());
-        }
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/UsernamePasswordInitialiser.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/UsernamePasswordInitialiser.java
deleted file mode 100644
index dd0bd096c3..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/UsernamePasswordInitialiser.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.security.auth.sasl;
-
-import java.io.IOException;
-import java.security.Principal;
-import java.util.Map;
-
-import javax.security.auth.callback.Callback;
-import javax.security.auth.callback.CallbackHandler;
-import javax.security.auth.callback.NameCallback;
-import javax.security.auth.callback.PasswordCallback;
-import javax.security.auth.callback.UnsupportedCallbackException;
-import javax.security.auth.login.AccountNotFoundException;
-import javax.security.sasl.AuthorizeCallback;
-
-import org.apache.commons.configuration.Configuration;
-
-import org.apache.log4j.Logger;
-
-import org.apache.qpid.server.security.auth.database.PrincipalDatabase;
-import org.apache.qpid.server.security.auth.sasl.AuthenticationProviderInitialiser;
-import org.apache.qpid.server.security.auth.sasl.UsernamePrincipal;
-
-public abstract class UsernamePasswordInitialiser implements AuthenticationProviderInitialiser
-{
-    protected static final Logger _logger = Logger.getLogger(UsernamePasswordInitialiser.class);
-
-    private ServerCallbackHandler _callbackHandler;
-
-    private class ServerCallbackHandler implements CallbackHandler
-    {
-        private final PrincipalDatabase _principalDatabase;
-
-        protected ServerCallbackHandler(PrincipalDatabase database)
-        {
-            _principalDatabase = database;
-        }
-
-        public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException
-        {
-            Principal username = null;
-            for (Callback callback : callbacks)
-            {
-                if (callback instanceof NameCallback)
-                {
-                    username = new UsernamePrincipal(((NameCallback) callback).getDefaultName());
-                }
-                else if (callback instanceof PasswordCallback)
-                {
-                    try
-                    {
-                        _principalDatabase.setPassword(username, (PasswordCallback) callback);
-                    }
-                    catch (AccountNotFoundException e)
-                    {
-                        // very annoyingly the callback handler does not throw anything more appropriate than
-                        // IOException
-                        IOException ioe = new IOException("Error looking up user " + e);
-                        ioe.initCause(e);
-                        throw ioe;
-                    }
-                }
-                else if (callback instanceof AuthorizeCallback)
-                {
-                    ((AuthorizeCallback) callback).setAuthorized(true);
-                }
-                else
-                {
-                    throw new UnsupportedCallbackException(callback);
-                }
-            }
-        }
-    }
-
-    public void initialise(String baseConfigPath, Configuration configuration,
-        Map<String, PrincipalDatabase> principalDatabases) throws Exception
-    {
-        String principalDatabaseName = configuration.getString(baseConfigPath + ".principal-database");
-        PrincipalDatabase db = principalDatabases.get(principalDatabaseName);
-
-        initialise(db);
-    }
-
-    public void initialise(PrincipalDatabase db)
-    {
-        if (db == null)
-        {
-            throw new NullPointerException("Cannot initialise with a null Principal database.");
-        }
-
-        _callbackHandler = new ServerCallbackHandler(db);
-    }
-
-    public CallbackHandler getCallbackHandler()
-    {
-        return _callbackHandler;
-    }
-
-    public Map<String, ?> getProperties()
-    {
-        // there are no properties required for the CRAM-MD5 implementation
-        return null;
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/UsernamePrincipal.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/UsernamePrincipal.java
deleted file mode 100644
index d7c8383690..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/UsernamePrincipal.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.security.auth.sasl;
-
-import java.security.Principal;
-
-/** A principal that is just a wrapper for a simple username. */
-public class UsernamePrincipal implements Principal
-{
-    private String _name;
-
-    public UsernamePrincipal(String name)
-    {
-        _name = name;
-    }
-
-    public String getName()
-    {
-        return _name;
-    }
-
-    public String toString()
-    {
-        return _name;
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/amqplain/AmqPlainInitialiser.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/amqplain/AmqPlainInitialiser.java
deleted file mode 100644
index 7acc6322d1..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/amqplain/AmqPlainInitialiser.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.security.auth.sasl.amqplain;
-
-import javax.security.sasl.SaslServerFactory;
-
-import org.apache.qpid.server.security.auth.sasl.UsernamePasswordInitialiser;
-
-public class AmqPlainInitialiser extends UsernamePasswordInitialiser
-{
-    public String getMechanismName()
-    {
-        return "AMQPLAIN";
-    }
-
-    public Class<? extends SaslServerFactory> getServerFactoryClassForJCARegistration()
-    {
-        return AmqPlainSaslServerFactory.class;
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/amqplain/AmqPlainSaslServer.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/amqplain/AmqPlainSaslServer.java
deleted file mode 100644
index 7842f376fb..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/amqplain/AmqPlainSaslServer.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.security.auth.sasl.amqplain;
-
-import java.io.IOException;
-
-import javax.security.auth.callback.Callback;
-import javax.security.auth.callback.CallbackHandler;
-import javax.security.auth.callback.NameCallback;
-import javax.security.auth.callback.PasswordCallback;
-import javax.security.auth.callback.UnsupportedCallbackException;
-import javax.security.sasl.AuthorizeCallback;
-import javax.security.sasl.SaslException;
-import javax.security.sasl.SaslServer;
-
-import org.apache.mina.common.ByteBuffer;
-import org.apache.qpid.framing.AMQFrameDecodingException;
-import org.apache.qpid.framing.FieldTable;
-import org.apache.qpid.framing.FieldTableFactory;
-
-public class AmqPlainSaslServer implements SaslServer
-{
-    public static final String MECHANISM = "AMQPLAIN";
-
-    private CallbackHandler _cbh;
-
-    private String _authorizationId;
-
-    private boolean _complete = false;
-
-    public AmqPlainSaslServer(CallbackHandler cbh)
-    {
-        _cbh = cbh;
-    }
-
-    public String getMechanismName()
-    {
-        return MECHANISM;
-    }
-
-    public byte[] evaluateResponse(byte[] response) throws SaslException
-    {
-        try
-        {
-            final FieldTable ft = FieldTableFactory.newFieldTable(ByteBuffer.wrap(response), response.length);
-            String username = (String) ft.getString("LOGIN");
-            // we do not care about the prompt but it throws if null
-            NameCallback nameCb = new NameCallback("prompt", username);
-            // we do not care about the prompt but it throws if null
-            PasswordCallback passwordCb = new PasswordCallback("prompt", false);
-            // TODO: should not get pwd as a String but as a char array...
-            String pwd = (String) ft.getString("PASSWORD");
-            passwordCb.setPassword(pwd.toCharArray());
-            AuthorizeCallback authzCb = new AuthorizeCallback(username, username);
-            Callback[] callbacks = new Callback[]{nameCb, passwordCb, authzCb};
-            _cbh.handle(callbacks);
-            _complete = true;
-            if (authzCb.isAuthorized())
-            {
-                _authorizationId = authzCb.getAuthenticationID();
-                return null;
-            }
-            else
-            {
-                throw new SaslException("Authentication failed");
-            }
-        }
-        catch (AMQFrameDecodingException e)
-        {
-            throw new SaslException("Unable to decode response: " + e, e);
-        }
-        catch (IOException e)
-        {
-            throw new SaslException("Error processing data: " + e, e);
-        }
-        catch (UnsupportedCallbackException e)
-        {
-            throw new SaslException("Unable to obtain data from callback handler: " + e, e);
-        }
-    }
-
-    public boolean isComplete()
-    {
-        return _complete;
-    }
-
-    public String getAuthorizationID()
-    {
-        return _authorizationId;
-    }
-
-    public byte[] unwrap(byte[] incoming, int offset, int len) throws SaslException
-    {
-        throw new SaslException("Unsupported operation");
-    }
-
-    public byte[] wrap(byte[] outgoing, int offset, int len) throws SaslException
-    {
-        throw new SaslException("Unsupported operation");
-    }
-
-    public Object getNegotiatedProperty(String propName)
-    {
-        return null;
-    }
-
-    public void dispose() throws SaslException
-    {
-        _cbh = null;
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/amqplain/AmqPlainSaslServerFactory.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/amqplain/AmqPlainSaslServerFactory.java
deleted file mode 100644
index 67d20136bf..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/amqplain/AmqPlainSaslServerFactory.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.security.auth.sasl.amqplain;
-
-import java.util.Map;
-
-import javax.security.auth.callback.CallbackHandler;
-import javax.security.sasl.Sasl;
-import javax.security.sasl.SaslException;
-import javax.security.sasl.SaslServer;
-import javax.security.sasl.SaslServerFactory;
-
-public class AmqPlainSaslServerFactory implements SaslServerFactory
-{
-    public SaslServer createSaslServer(String mechanism, String protocol, String serverName, Map props,
-                                       CallbackHandler cbh) throws SaslException
-    {
-        if (AmqPlainSaslServer.MECHANISM.equals(mechanism))
-        {
-            return new AmqPlainSaslServer(cbh);
-        }
-        else
-        {
-            return null;
-        }
-    }
-
-    public String[] getMechanismNames(Map props)
-    {
-        if (props.containsKey(Sasl.POLICY_NOPLAINTEXT) ||
-            props.containsKey(Sasl.POLICY_NODICTIONARY) ||
-            props.containsKey(Sasl.POLICY_NOACTIVE))
-        {
-            // returned array must be non null according to interface documentation
-            return new String[0];
-        }
-        else
-        {
-            return new String[]{AmqPlainSaslServer.MECHANISM};
-        }
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HashedInitialiser.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HashedInitialiser.java
deleted file mode 100644
index 97f9a4e91a..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HashedInitialiser.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.security.auth.sasl.crammd5;
-
-import org.apache.qpid.server.security.auth.sasl.UsernamePasswordInitialiser;
-import org.apache.qpid.server.security.auth.database.PrincipalDatabase;
-
-import javax.security.sasl.SaslServerFactory;
-import java.util.Map;
-
-public class CRAMMD5HashedInitialiser extends UsernamePasswordInitialiser
-{
-    public String getMechanismName()
-    {
-        return CRAMMD5HashedSaslServer.MECHANISM;
-    }
-
-    public Class<? extends SaslServerFactory> getServerFactoryClassForJCARegistration()
-    {
-        return CRAMMD5HashedServerFactory.class;
-    }
-
-    public void initialise(PrincipalDatabase passwordFile)
-    {
-        super.initialise(passwordFile);
-    }
-
-    public Map<String, ?> getProperties()
-    {
-        return null;
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HashedSaslServer.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HashedSaslServer.java
deleted file mode 100644
index f6cab084ea..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HashedSaslServer.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.    
- *
- * 
- */
-package org.apache.qpid.server.security.auth.sasl.crammd5;
-
-import javax.security.sasl.SaslServer;
-import javax.security.sasl.SaslException;
-import javax.security.sasl.Sasl;
-import javax.security.sasl.SaslServerFactory;
-import javax.security.auth.callback.CallbackHandler;
-import java.util.Enumeration;
-import java.util.Map;
-
-public class CRAMMD5HashedSaslServer implements SaslServer
-{
-    public static final String MECHANISM = "CRAM-MD5-HASHED";
-
-    private SaslServer _realServer;
-
-    public CRAMMD5HashedSaslServer(String mechanism, String protocol, String serverName, Map<String, ?> props,
-                                   CallbackHandler cbh) throws SaslException
-    {
-        Enumeration factories = Sasl.getSaslServerFactories();
-
-        while (factories.hasMoreElements())
-        {
-            SaslServerFactory factory = (SaslServerFactory) factories.nextElement();
-
-            if (factory instanceof CRAMMD5HashedServerFactory)
-            {
-                continue;
-            }
-            
-            String[] mechs = factory.getMechanismNames(props);
-
-            for (String mech : mechs)
-            {
-                if (mech.equals("CRAM-MD5"))
-                {
-                    _realServer = factory.createSaslServer("CRAM-MD5", protocol, serverName, props, cbh);
-                    return;
-                }
-            }
-        }
-
-        throw new RuntimeException("No default SaslServer found for mechanism:" + "CRAM-MD5");
-    }
-
-    public String getMechanismName()
-    {
-        return MECHANISM;
-    }
-
-    public byte[] evaluateResponse(byte[] response) throws SaslException
-    {
-        return _realServer.evaluateResponse(response);
-    }
-
-    public boolean isComplete()
-    {
-        return _realServer.isComplete();
-    }
-
-    public String getAuthorizationID()
-    {
-        return _realServer.getAuthorizationID();
-    }
-
-    public byte[] unwrap(byte[] incoming, int offset, int len) throws SaslException
-    {
-        return _realServer.unwrap(incoming, offset, len);
-    }
-
-    public byte[] wrap(byte[] outgoing, int offset, int len) throws SaslException
-    {
-        return _realServer.wrap(outgoing, offset, len);
-    }
-
-    public Object getNegotiatedProperty(String propName)
-    {
-        return _realServer.getNegotiatedProperty(propName);
-    }
-
-    public void dispose() throws SaslException
-    {
-        _realServer.dispose();
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HashedServerFactory.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HashedServerFactory.java
deleted file mode 100644
index 5298b5cc63..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HashedServerFactory.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.security.auth.sasl.crammd5;
-
-import java.util.Map;
-
-import javax.security.auth.callback.CallbackHandler;
-import javax.security.sasl.Sasl;
-import javax.security.sasl.SaslException;
-import javax.security.sasl.SaslServer;
-import javax.security.sasl.SaslServerFactory;
-
-public class CRAMMD5HashedServerFactory implements SaslServerFactory
-{
-    public SaslServer createSaslServer(String mechanism, String protocol, String serverName, Map<String, ?> props,
-                                       CallbackHandler cbh) throws SaslException
-    {
-        if (mechanism.equals(CRAMMD5HashedSaslServer.MECHANISM))
-        {
-            return new CRAMMD5HashedSaslServer(mechanism, protocol, serverName, props, cbh);
-        }
-        else
-        {
-            return null;
-        }
-    }
-
-    public String[] getMechanismNames(Map props)
-    {
-        if (props != null)
-        {
-            if (props.containsKey(Sasl.POLICY_NOPLAINTEXT) ||
-                props.containsKey(Sasl.POLICY_NODICTIONARY) ||
-                props.containsKey(Sasl.POLICY_NOACTIVE))
-            {
-                // returned array must be non null according to interface documentation
-                return new String[0];
-            }
-        }
-
-        return new String[]{CRAMMD5HashedSaslServer.MECHANISM};
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5Initialiser.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5Initialiser.java
deleted file mode 100644
index 264832888d..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5Initialiser.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.security.auth.sasl.crammd5;
-
-import org.apache.qpid.server.security.auth.sasl.UsernamePasswordInitialiser;
-import org.apache.qpid.server.security.auth.database.PrincipalDatabase;
-
-import javax.security.sasl.SaslServerFactory;
-
-public class CRAMMD5Initialiser extends UsernamePasswordInitialiser
-{
-    private HashDirection _hashDirection;
-
-    public enum HashDirection
-    {
-        INCOMMING, PASSWORD_FILE
-    }
-
-
-    public String getMechanismName()
-    {
-        return "CRAM-MD5";
-    }
-
-    public Class<? extends SaslServerFactory> getServerFactoryClassForJCARegistration()
-    {
-        // since the CRAM-MD5 provider is registered as part of the JDK, we do not
-        // return the factory class here since we do not need to register it ourselves.
-        if (_hashDirection == HashDirection.PASSWORD_FILE)
-        {
-            return null;
-        }
-        else
-        {
-            //fixme we need a server that will correctly has the incomming plain text for comparison to file.
-            _logger.warn("we need a server that will correctly convert the incomming plain text for comparison to file.");
-            return null;
-        }
-    }
-
-    public void initialise(PrincipalDatabase passwordFile)
-    {
-        initialise(passwordFile, HashDirection.PASSWORD_FILE);
-    }
-
-    public void initialise(PrincipalDatabase passwordFile, HashDirection direction)
-    {
-        super.initialise(passwordFile);
-
-        _hashDirection = direction;
-    }
-
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/plain/PlainInitialiser.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/plain/PlainInitialiser.java
deleted file mode 100644
index 1d16cd8755..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/plain/PlainInitialiser.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.security.auth.sasl.plain;
-
-import javax.security.sasl.SaslServerFactory;
-
-import org.apache.qpid.server.security.auth.sasl.UsernamePasswordInitialiser;
-
-public class PlainInitialiser extends UsernamePasswordInitialiser
-{
-    public String getMechanismName()
-    {
-        return "PLAIN";
-    }
-
-    public Class<? extends SaslServerFactory> getServerFactoryClassForJCARegistration()
-    {
-        return PlainSaslServerFactory.class;
-    }    
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/plain/PlainSaslServer.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/plain/PlainSaslServer.java
deleted file mode 100644
index 36aeb77fe1..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/plain/PlainSaslServer.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.security.auth.sasl.plain;
-
-import java.io.IOException;
-
-import javax.security.auth.callback.Callback;
-import javax.security.auth.callback.CallbackHandler;
-import javax.security.auth.callback.NameCallback;
-import javax.security.auth.callback.PasswordCallback;
-import javax.security.auth.callback.UnsupportedCallbackException;
-import javax.security.sasl.AuthorizeCallback;
-import javax.security.sasl.SaslException;
-import javax.security.sasl.SaslServer;
-
-public class PlainSaslServer implements SaslServer
-{
-    public static final String MECHANISM = "PLAIN";
-
-    private CallbackHandler _cbh;
-
-    private String _authorizationId;
-
-    private boolean _complete = false;
-
-    public PlainSaslServer(CallbackHandler cbh)
-    {
-        _cbh = cbh;
-    }
-
-    public String getMechanismName()
-    {
-        return MECHANISM;
-    }
-
-    public byte[] evaluateResponse(byte[] response) throws SaslException
-    {
-        try
-        {
-            int authzidNullPosition = findNullPosition(response, 0);
-            if (authzidNullPosition < 0)
-            {
-                throw new SaslException("Invalid PLAIN encoding, authzid null terminator not found");
-            }
-            int authcidNullPosition = findNullPosition(response, authzidNullPosition + 1);
-            if (authcidNullPosition < 0)
-            {
-                throw new SaslException("Invalid PLAIN encoding, authcid null terminator not found");
-            }
-
-            // we do not currently support authcid in any meaningful way
-            // String authcid = new String(response, 0, authzidNullPosition, "utf8");
-            String authzid = new String(response, authzidNullPosition + 1, authcidNullPosition - 1, "utf8");
-
-            // we do not care about the prompt but it throws if null
-            NameCallback nameCb = new NameCallback("prompt", authzid);
-            // we do not care about the prompt but it throws if null
-            PasswordCallback passwordCb = new PasswordCallback("prompt", false);
-            // TODO: should not get pwd as a String but as a char array...
-            int passwordLen = response.length - authcidNullPosition - 1;
-            String pwd = new String(response, authcidNullPosition + 1, passwordLen, "utf8");
-            passwordCb.setPassword(pwd.toCharArray());
-            AuthorizeCallback authzCb = new AuthorizeCallback(authzid, authzid);
-            Callback[] callbacks = new Callback[]{nameCb, passwordCb, authzCb};
-            _cbh.handle(callbacks);
-            _complete = true;
-            if (authzCb.isAuthorized())
-            {
-                _authorizationId = authzCb.getAuthenticationID();
-                return null;
-            }
-            else
-            {
-                throw new SaslException("Authentication failed");
-            }
-        }
-        catch (IOException e)
-        {
-            throw new SaslException("Error processing data: " + e, e);
-        }
-        catch (UnsupportedCallbackException e)
-        {
-            throw new SaslException("Unable to obtain data from callback handler: " + e, e);
-        }
-    }
-
-    private int findNullPosition(byte[] response, int startPosition)
-    {
-        int position = startPosition;
-        while (position < response.length)
-        {
-            if (response[position] == (byte) 0)
-            {
-                return position;
-            }
-            position++;
-        }
-        return -1;
-    }
-
-    public boolean isComplete()
-    {
-        return _complete;
-    }
-
-    public String getAuthorizationID()
-    {
-        return _authorizationId;
-    }
-
-    public byte[] unwrap(byte[] incoming, int offset, int len) throws SaslException
-    {
-        throw new SaslException("Unsupported operation");
-    }
-
-    public byte[] wrap(byte[] outgoing, int offset, int len) throws SaslException
-    {
-        throw new SaslException("Unsupported operation");
-    }
-
-    public Object getNegotiatedProperty(String propName)
-    {
-        return null;
-    }
-
-    public void dispose() throws SaslException
-    {
-        _cbh = null;
-    }
-
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/plain/PlainSaslServerFactory.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/plain/PlainSaslServerFactory.java
deleted file mode 100644
index f0dd9eeb6d..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/plain/PlainSaslServerFactory.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.security.auth.sasl.plain;
-
-import java.util.Map;
-
-import javax.security.auth.callback.CallbackHandler;
-import javax.security.sasl.Sasl;
-import javax.security.sasl.SaslException;
-import javax.security.sasl.SaslServer;
-import javax.security.sasl.SaslServerFactory;
-
-public class PlainSaslServerFactory implements SaslServerFactory
-{
-    public SaslServer createSaslServer(String mechanism, String protocol, String serverName, Map props,
-                                       CallbackHandler cbh) throws SaslException
-    {
-        if (PlainSaslServer.MECHANISM.equals(mechanism))
-        {
-            return new PlainSaslServer(cbh);
-        }
-        else
-        {
-            return null;
-        }
-    }
-
-    public String[] getMechanismNames(Map props)
-    {
-        if (props.containsKey(Sasl.POLICY_NOPLAINTEXT) ||
-            props.containsKey(Sasl.POLICY_NODICTIONARY) ||
-            props.containsKey(Sasl.POLICY_NOACTIVE))
-        {
-            // returned array must be non null according to interface documentation
-            return new String[0];
-        }
-        else
-        {
-            return new String[]{PlainSaslServer.MECHANISM};
-        }
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/state/AMQState.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/state/AMQState.java
deleted file mode 100644
index f427cc7206..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/state/AMQState.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.state;
-
-/**
- * States used in the AMQ protocol. Used by the finite state machine to determine
- * valid responses.
- */
-public enum AMQState
-{
-    CONNECTION_NOT_STARTED,
-    CONNECTION_NOT_AUTH,
-    CONNECTION_NOT_TUNED,
-    CONNECTION_NOT_OPENED,
-    CONNECTION_OPEN,
-    CONNECTION_CLOSING,
-    CONNECTION_CLOSED    
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/state/AMQStateManager.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/state/AMQStateManager.java
deleted file mode 100644
index f96900d0a9..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/state/AMQStateManager.java
+++ /dev/null
@@ -1,284 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.state;
-
-import java.util.EnumMap;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.CopyOnWriteArraySet;
-
-import org.apache.log4j.Logger;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.AMQMethodBody;
-import org.apache.qpid.framing.BasicAckBody;
-import org.apache.qpid.framing.BasicCancelBody;
-import org.apache.qpid.framing.BasicConsumeBody;
-import org.apache.qpid.framing.BasicGetBody;
-import org.apache.qpid.framing.BasicPublishBody;
-import org.apache.qpid.framing.BasicQosBody;
-import org.apache.qpid.framing.BasicRecoverBody;
-import org.apache.qpid.framing.BasicRejectBody;
-import org.apache.qpid.framing.ChannelCloseBody;
-import org.apache.qpid.framing.ChannelCloseOkBody;
-import org.apache.qpid.framing.ChannelFlowBody;
-import org.apache.qpid.framing.ChannelOpenBody;
-import org.apache.qpid.framing.ConnectionCloseBody;
-import org.apache.qpid.framing.ConnectionCloseOkBody;
-import org.apache.qpid.framing.ConnectionOpenBody;
-import org.apache.qpid.framing.ConnectionSecureOkBody;
-import org.apache.qpid.framing.ConnectionStartOkBody;
-import org.apache.qpid.framing.ConnectionTuneOkBody;
-import org.apache.qpid.framing.ExchangeBoundBody;
-import org.apache.qpid.framing.ExchangeDeclareBody;
-import org.apache.qpid.framing.ExchangeDeleteBody;
-import org.apache.qpid.framing.QueueBindBody;
-import org.apache.qpid.framing.QueueDeclareBody;
-import org.apache.qpid.framing.QueueDeleteBody;
-import org.apache.qpid.framing.QueuePurgeBody;
-import org.apache.qpid.framing.TxCommitBody;
-import org.apache.qpid.framing.TxRollbackBody;
-import org.apache.qpid.framing.TxSelectBody;
-import org.apache.qpid.protocol.AMQMethodEvent;
-import org.apache.qpid.protocol.AMQMethodListener;
-import org.apache.qpid.server.handler.BasicAckMethodHandler;
-import org.apache.qpid.server.handler.BasicCancelMethodHandler;
-import org.apache.qpid.server.handler.BasicConsumeMethodHandler;
-import org.apache.qpid.server.handler.BasicGetMethodHandler;
-import org.apache.qpid.server.handler.BasicPublishMethodHandler;
-import org.apache.qpid.server.handler.BasicQosHandler;
-import org.apache.qpid.server.handler.BasicRecoverMethodHandler;
-import org.apache.qpid.server.handler.BasicRejectMethodHandler;
-import org.apache.qpid.server.handler.ChannelCloseHandler;
-import org.apache.qpid.server.handler.ChannelCloseOkHandler;
-import org.apache.qpid.server.handler.ChannelFlowHandler;
-import org.apache.qpid.server.handler.ChannelOpenHandler;
-import org.apache.qpid.server.handler.ConnectionCloseMethodHandler;
-import org.apache.qpid.server.handler.ConnectionCloseOkMethodHandler;
-import org.apache.qpid.server.handler.ConnectionOpenMethodHandler;
-import org.apache.qpid.server.handler.ConnectionSecureOkMethodHandler;
-import org.apache.qpid.server.handler.ConnectionStartOkMethodHandler;
-import org.apache.qpid.server.handler.ConnectionTuneOkMethodHandler;
-import org.apache.qpid.server.handler.ExchangeBoundHandler;
-import org.apache.qpid.server.handler.ExchangeDeclareHandler;
-import org.apache.qpid.server.handler.ExchangeDeleteHandler;
-import org.apache.qpid.server.handler.QueueBindHandler;
-import org.apache.qpid.server.handler.QueueDeclareHandler;
-import org.apache.qpid.server.handler.QueueDeleteHandler;
-import org.apache.qpid.server.handler.QueuePurgeHandler;
-import org.apache.qpid.server.handler.TxCommitHandler;
-import org.apache.qpid.server.handler.TxRollbackHandler;
-import org.apache.qpid.server.handler.TxSelectHandler;
-import org.apache.qpid.server.protocol.AMQProtocolSession;
-import org.apache.qpid.server.virtualhost.VirtualHostRegistry;
-
-/**
- * The state manager is responsible for managing the state of the protocol session. <p/> For each AMQProtocolHandler
- * there is a separate state manager.
- */
-public class AMQStateManager implements AMQMethodListener
-{
-    private static final Logger _logger = Logger.getLogger(AMQStateManager.class);
-
-    private final VirtualHostRegistry _virtualHostRegistry;
-    private final AMQProtocolSession _protocolSession;
-    /** The current state */
-    private AMQState _currentState;
-
-    /**
-     * Maps from an AMQState instance to a Map from Class to StateTransitionHandler. The class must be a subclass of
-     * AMQFrame.
-     */
-    private final EnumMap<AMQState, Map<Class<? extends AMQMethodBody>, StateAwareMethodListener<? extends AMQMethodBody>>> _state2HandlersMap =
-        new EnumMap<AMQState, Map<Class<? extends AMQMethodBody>, StateAwareMethodListener<? extends AMQMethodBody>>>(
-            AMQState.class);
-
-    private CopyOnWriteArraySet<StateListener> _stateListeners = new CopyOnWriteArraySet<StateListener>();
-
-    public AMQStateManager(VirtualHostRegistry virtualHostRegistry, AMQProtocolSession protocolSession)
-    {
-        this(AMQState.CONNECTION_NOT_STARTED, true, virtualHostRegistry, protocolSession);
-    }
-
-    protected AMQStateManager(AMQState initial, boolean register, VirtualHostRegistry virtualHostRegistry,
-        AMQProtocolSession protocolSession)
-    {
-        _virtualHostRegistry = virtualHostRegistry;
-        _protocolSession = protocolSession;
-        _currentState = initial;
-        if (register)
-        {
-            registerListeners();
-        }
-    }
-
-    protected void registerListeners()
-    {
-        Map<Class<? extends AMQMethodBody>, StateAwareMethodListener<? extends AMQMethodBody>> frame2handlerMap;
-
-        frame2handlerMap = new HashMap<Class<? extends AMQMethodBody>, StateAwareMethodListener<? extends AMQMethodBody>>();
-        frame2handlerMap.put(ConnectionStartOkBody.class, ConnectionStartOkMethodHandler.getInstance());
-        _state2HandlersMap.put(AMQState.CONNECTION_NOT_STARTED, frame2handlerMap);
-
-        frame2handlerMap = new HashMap<Class<? extends AMQMethodBody>, StateAwareMethodListener<? extends AMQMethodBody>>();
-        frame2handlerMap.put(ConnectionSecureOkBody.class, ConnectionSecureOkMethodHandler.getInstance());
-        _state2HandlersMap.put(AMQState.CONNECTION_NOT_AUTH, frame2handlerMap);
-
-        frame2handlerMap = new HashMap<Class<? extends AMQMethodBody>, StateAwareMethodListener<? extends AMQMethodBody>>();
-        frame2handlerMap.put(ConnectionTuneOkBody.class, ConnectionTuneOkMethodHandler.getInstance());
-        _state2HandlersMap.put(AMQState.CONNECTION_NOT_TUNED, frame2handlerMap);
-
-        frame2handlerMap = new HashMap<Class<? extends AMQMethodBody>, StateAwareMethodListener<? extends AMQMethodBody>>();
-        frame2handlerMap.put(ConnectionOpenBody.class, ConnectionOpenMethodHandler.getInstance());
-        _state2HandlersMap.put(AMQState.CONNECTION_NOT_OPENED, frame2handlerMap);
-
-        //
-        // ConnectionOpen handlers
-        //
-        frame2handlerMap = new HashMap<Class<? extends AMQMethodBody>, StateAwareMethodListener<? extends AMQMethodBody>>();
-        frame2handlerMap.put(ChannelOpenBody.class, ChannelOpenHandler.getInstance());
-        frame2handlerMap.put(ChannelCloseBody.class, ChannelCloseHandler.getInstance());
-        frame2handlerMap.put(ChannelCloseOkBody.class, ChannelCloseOkHandler.getInstance());
-        frame2handlerMap.put(ConnectionCloseBody.class, ConnectionCloseMethodHandler.getInstance());
-        frame2handlerMap.put(ExchangeDeclareBody.class, ExchangeDeclareHandler.getInstance());
-        frame2handlerMap.put(ExchangeDeleteBody.class, ExchangeDeleteHandler.getInstance());
-        frame2handlerMap.put(ExchangeBoundBody.class, ExchangeBoundHandler.getInstance());
-        frame2handlerMap.put(BasicAckBody.class, BasicAckMethodHandler.getInstance());
-        frame2handlerMap.put(BasicRecoverBody.class, BasicRecoverMethodHandler.getInstance());
-        frame2handlerMap.put(BasicConsumeBody.class, BasicConsumeMethodHandler.getInstance());
-        frame2handlerMap.put(BasicGetBody.class, BasicGetMethodHandler.getInstance());
-        frame2handlerMap.put(BasicCancelBody.class, BasicCancelMethodHandler.getInstance());
-        frame2handlerMap.put(BasicPublishBody.class, BasicPublishMethodHandler.getInstance());
-        frame2handlerMap.put(BasicQosBody.class, BasicQosHandler.getInstance());
-        frame2handlerMap.put(QueueBindBody.class, QueueBindHandler.getInstance());
-        frame2handlerMap.put(QueueDeclareBody.class, QueueDeclareHandler.getInstance());
-        frame2handlerMap.put(QueueDeleteBody.class, QueueDeleteHandler.getInstance());
-        frame2handlerMap.put(QueuePurgeBody.class, QueuePurgeHandler.getInstance());
-        frame2handlerMap.put(ChannelFlowBody.class, ChannelFlowHandler.getInstance());
-        frame2handlerMap.put(TxSelectBody.class, TxSelectHandler.getInstance());
-        frame2handlerMap.put(TxCommitBody.class, TxCommitHandler.getInstance());
-        frame2handlerMap.put(TxRollbackBody.class, TxRollbackHandler.getInstance());
-        frame2handlerMap.put(BasicRejectBody.class, BasicRejectMethodHandler.getInstance());
-
-        _state2HandlersMap.put(AMQState.CONNECTION_OPEN, frame2handlerMap);
-
-        frame2handlerMap = new HashMap<Class<? extends AMQMethodBody>, StateAwareMethodListener<? extends AMQMethodBody>>();
-        frame2handlerMap.put(ConnectionCloseOkBody.class, ConnectionCloseOkMethodHandler.getInstance());
-        _state2HandlersMap.put(AMQState.CONNECTION_CLOSING, frame2handlerMap);
-
-    }
-
-    public AMQState getCurrentState()
-    {
-        return _currentState;
-    }
-
-    public void changeState(AMQState newState) throws AMQException
-    {
-        _logger.debug("State changing to " + newState + " from old state " + _currentState);
-        final AMQState oldState = _currentState;
-        _currentState = newState;
-
-        for (StateListener l : _stateListeners)
-        {
-            l.stateChanged(oldState, newState);
-        }
-    }
-
-    public void error(Exception e)
-    {
-        _logger.error("State manager received error notification[Current State:" + _currentState + "]: " + e, e);
-        for (StateListener l : _stateListeners)
-        {
-            l.error(e);
-        }
-    }
-
-    public <B extends AMQMethodBody> boolean methodReceived(AMQMethodEvent<B> evt) throws AMQException
-    {
-        StateAwareMethodListener<B> handler = findStateTransitionHandler(_currentState, evt.getMethod());
-        if (handler != null)
-        {
-
-            checkChannel(evt, _protocolSession);
-
-            handler.methodReceived(this, evt);
-
-            return true;
-        }
-
-        return false;
-    }
-
-    private <B extends AMQMethodBody> void checkChannel(AMQMethodEvent<B> evt, AMQProtocolSession protocolSession)
-        throws AMQException
-    {
-        if ((evt.getChannelId() != 0) && !(evt.getMethod() instanceof ChannelOpenBody)
-                && (protocolSession.getChannel(evt.getChannelId()) == null)
-                && !protocolSession.channelAwaitingClosure(evt.getChannelId()))
-        {
-            throw evt.getMethod().getChannelNotFoundException(evt.getChannelId());
-        }
-    }
-
-    protected <B extends AMQMethodBody> StateAwareMethodListener<B> findStateTransitionHandler(AMQState currentState,
-        B frame)
-    // throws IllegalStateTransitionException
-    {
-        final Map<Class<? extends AMQMethodBody>, StateAwareMethodListener<? extends AMQMethodBody>> classToHandlerMap =
-            _state2HandlersMap.get(currentState);
-
-        final StateAwareMethodListener<B> handler =
-            (classToHandlerMap == null) ? null : (StateAwareMethodListener<B>) classToHandlerMap.get(frame.getClass());
-
-        if (handler == null)
-        {
-            _logger.debug("No state transition handler defined for receiving frame " + frame);
-
-            return null;
-        }
-        else
-        {
-            return handler;
-        }
-    }
-
-    public void addStateListener(StateListener listener)
-    {
-        _logger.debug("Adding state listener");
-        _stateListeners.add(listener);
-    }
-
-    public void removeStateListener(StateListener listener)
-    {
-        _stateListeners.remove(listener);
-    }
-
-    public VirtualHostRegistry getVirtualHostRegistry()
-    {
-        return _virtualHostRegistry;
-    }
-
-    public AMQProtocolSession getProtocolSession()
-    {
-        return _protocolSession;
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/state/StateAwareMethodListener.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/state/StateAwareMethodListener.java
deleted file mode 100644
index e3af0bc486..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/state/StateAwareMethodListener.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.state;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.AMQMethodBody;
-import org.apache.qpid.protocol.AMQMethodEvent;
-
-/**
- * A frame listener that is informed of the protocol state when invoked and has
- * the opportunity to update state.
- *
- */
-public interface StateAwareMethodListener <B extends AMQMethodBody>
-{
-    void methodReceived(AMQStateManager stateManager,  AMQMethodEvent<B> evt) throws AMQException;
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/state/StateListener.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/state/StateListener.java
deleted file mode 100644
index 00fc09867b..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/state/StateListener.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.state;
-
-import org.apache.qpid.AMQException;
-
-public interface StateListener
-{
-    void stateChanged(AMQState oldState, AMQState newState) throws AMQException;
-
-    void error(Throwable t);
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/store/MemoryMessageStore.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/store/MemoryMessageStore.java
deleted file mode 100644
index 8ccb0be0a8..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/store/MemoryMessageStore.java
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.store;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.atomic.AtomicLong;
-
-import org.apache.commons.configuration.Configuration;
-import org.apache.log4j.Logger;
-import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.framing.FieldTable;
-import org.apache.qpid.framing.abstraction.ContentChunk;
-import org.apache.qpid.server.queue.AMQQueue;
-import org.apache.qpid.server.queue.MessageMetaData;
-import org.apache.qpid.server.virtualhost.VirtualHost;
-import org.apache.qpid.server.exchange.Exchange;
-
-/**
- * A simple message store that stores the messages in a threadsafe structure in memory.
- */
-public class MemoryMessageStore implements MessageStore
-{
-    private static final Logger _log = Logger.getLogger(MemoryMessageStore.class);
-
-    private static final int DEFAULT_HASHTABLE_CAPACITY = 50000;
-
-    private static final String HASHTABLE_CAPACITY_CONFIG = "hashtable-capacity";
-
-    protected ConcurrentMap<Long, MessageMetaData> _metaDataMap;
-
-    protected ConcurrentMap<Long, List<ContentChunk>> _contentBodyMap;
-
-    private final AtomicLong _messageId = new AtomicLong(1);
-
-    public void configure()
-    {
-        _log.info("Using capacity " + DEFAULT_HASHTABLE_CAPACITY + " for hash tables");
-        _metaDataMap = new ConcurrentHashMap<Long, MessageMetaData>(DEFAULT_HASHTABLE_CAPACITY);
-        _contentBodyMap = new ConcurrentHashMap<Long, List<ContentChunk>>(DEFAULT_HASHTABLE_CAPACITY);
-    }
-
-    public void configure(String base, Configuration config)
-    {
-        int hashtableCapacity = config.getInt(base + "." + HASHTABLE_CAPACITY_CONFIG, DEFAULT_HASHTABLE_CAPACITY);
-        _log.info("Using capacity " + hashtableCapacity + " for hash tables");
-        _metaDataMap = new ConcurrentHashMap<Long, MessageMetaData>(hashtableCapacity);
-        _contentBodyMap = new ConcurrentHashMap<Long, List<ContentChunk>>(hashtableCapacity);
-    }
-
-    public void configure(VirtualHost virtualHost, String base, Configuration config) throws Exception
-    {
-        configure(base, config);
-    }
-
-    public void close() throws Exception
-    {
-        if (_metaDataMap != null)
-        {
-            _metaDataMap.clear();
-            _metaDataMap = null;
-        }
-        if (_contentBodyMap != null)
-        {
-            _contentBodyMap.clear();
-            _contentBodyMap = null;
-        }
-    }
-
-    public void removeMessage(StoreContext context, Long messageId)
-    {
-        if (_log.isDebugEnabled())
-        {
-            _log.debug("Removing message with id " + messageId);
-        }
-        _metaDataMap.remove(messageId);
-        _contentBodyMap.remove(messageId);
-    }
-
-    public void createExchange(Exchange exchange) throws AMQException
-    {
-
-    }
-
-    public void removeExchange(Exchange exchange) throws AMQException
-    {
-
-    }
-
-    public void bindQueue(Exchange exchange, AMQShortString routingKey, AMQQueue queue, FieldTable args) throws AMQException
-    {
-
-    }
-
-    public void unbindQueue(Exchange exchange, AMQShortString routingKey, AMQQueue queue, FieldTable args) throws AMQException
-    {
-
-    }
-
-    public void createQueue(AMQQueue queue) throws AMQException
-    {
-        // Not required to do anything
-    }
-
-    public void removeQueue(AMQShortString name) throws AMQException
-    {
-        // Not required to do anything
-    }
-
-    public void enqueueMessage(StoreContext context, AMQShortString name, Long messageId) throws AMQException
-    {
-        // Not required to do anything
-    }
-
-    public void dequeueMessage(StoreContext context, AMQShortString name, Long messageId) throws AMQException
-    {
-        // Not required to do anything
-    }
-
-    public void beginTran(StoreContext context) throws AMQException
-    {
-        // Not required to do anything
-    }
-
-    public void commitTran(StoreContext context) throws AMQException
-    {
-        // Not required to do anything
-    }
-
-    public void abortTran(StoreContext context) throws AMQException
-    {
-        // Not required to do anything
-    }
-
-    public boolean inTran(StoreContext context)
-    {
-        return false;
-    }
-
-    public List<AMQQueue> createQueues() throws AMQException
-    {
-        return null;
-    }
-
-    public Long getNewMessageId()
-    {
-        return _messageId.getAndIncrement();
-    }
-
-    public void storeContentBodyChunk(StoreContext context, Long messageId, int index, ContentChunk contentBody, boolean lastContentBody)
-            throws AMQException
-    {
-        List<ContentChunk> bodyList = _contentBodyMap.get(messageId);
-
-        if(bodyList == null && lastContentBody)
-        {
-            _contentBodyMap.put(messageId, Collections.singletonList(contentBody));
-        }
-        else
-        {
-            if (bodyList == null)
-            {
-                bodyList = new ArrayList<ContentChunk>();
-                _contentBodyMap.put(messageId, bodyList);
-            }
-
-            bodyList.add(index, contentBody);
-        }
-    }
-
-    public void storeMessageMetaData(StoreContext context, Long messageId, MessageMetaData messageMetaData)
-            throws AMQException
-    {
-        _metaDataMap.put(messageId, messageMetaData);
-    }
-
-    public MessageMetaData getMessageMetaData(StoreContext context,Long messageId) throws AMQException
-    {
-        return _metaDataMap.get(messageId);
-    }
-
-    public ContentChunk getContentBodyChunk(StoreContext context, Long messageId, int index) throws AMQException
-    {
-        List<ContentChunk> bodyList = _contentBodyMap.get(messageId);
-        return bodyList.get(index);
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/store/MessageStore.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/store/MessageStore.java
deleted file mode 100644
index 2a83d9b649..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/store/MessageStore.java
+++ /dev/null
@@ -1,261 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.store;
-
-import org.apache.commons.configuration.Configuration;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.framing.FieldTable;
-import org.apache.qpid.framing.abstraction.ContentChunk;
-import org.apache.qpid.server.exchange.Exchange;
-import org.apache.qpid.server.queue.AMQQueue;
-import org.apache.qpid.server.queue.MessageMetaData;
-import org.apache.qpid.server.virtualhost.VirtualHost;
-
-/**
- * MessageStore defines the interface to a storage area, which can be used to preserve the state of messages, queues
- * and exchanges in a transactional manner.
- *
- * <p/>All message store, remove, enqueue and dequeue operations are carried out against a {@link StoreContext} which
- * encapsulates the transactional context they are performed in. Many such operations can be carried out in a single
- * transaction.
- *
- * <p/>The storage and removal of queues and exchanges, are not carried out in a transactional context.
- *
- * <p/><table id="crc"><caption>CRC Card</caption>
- * <tr><th> Responsibilities
- * <tr><td> Accept transaction boundary demarcations: Begin, Commit, Abort.
- * <tr><td> Store and remove queues.
- * <tr><td> Store and remove exchanges.
- * <tr><td> Store and remove messages.
- * <tr><td> Bind and unbind queues to exchanges.
- * <tr><td> Enqueue and dequeue messages to queues.
- * <tr><td> Generate message identifiers.
- * </table>
- */
-public interface MessageStore
-{
-    /**
-     * Called after instantiation in order to configure the message store. A particular implementation can define
-     * whatever parameters it wants.
-     *
-     * @param virtualHost The virtual host using by this store
-     * @param base        The base element identifier from which all configuration items are relative. For example, if
-     *                    the base element is "store", the all elements used by concrete classes will be "store.foo" etc.
-     * @param config      The apache commons configuration object.
-     *
-     * @throws Exception If any error occurs that means the store is unable to configure itself.
-     */
-    void configure(VirtualHost virtualHost, String base, Configuration config) throws Exception;
-
-    /**
-     * Called to close and cleanup any resources used by the message store.
-     *
-     * @throws Exception If the close fails.
-     */
-    void close() throws Exception;
-
-    /**
-     * Removes the specified message from the store in the given transactional store context.
-     *
-     * @param storeContext The transactional context to remove the message in.
-     * @param messageId    Identifies the message to remove.
-     *
-     * @throws AMQException If the operation fails for any reason.
-     */
-    void removeMessage(StoreContext storeContext, Long messageId) throws AMQException;
-
-    /**
-     * Makes the specified exchange persistent.
-     *
-     * @param exchange The exchange to persist.
-     *
-     * @throws AMQException If the operation fails for any reason.
-     */
-    void createExchange(Exchange exchange) throws AMQException;
-
-    /**
-     * Removes the specified persistent exchange.
-     *
-     * @param exchange The exchange to remove.
-     *
-     * @throws AMQException If the operation fails for any reason.
-     */
-    void removeExchange(Exchange exchange) throws AMQException;
-
-    /**
-     * Binds the specified queue to an exchange with a routing key.
-     *
-     * @param exchange   The exchange to bind to.
-     * @param routingKey The routing key to bind by.
-     * @param queue      The queue to bind.
-     * @param args       Additional parameters.
-     *
-     * @throws AMQException If the operation fails for any reason.
-     */
-    void bindQueue(Exchange exchange, AMQShortString routingKey, AMQQueue queue, FieldTable args) throws AMQException;
-
-    /**
-     * Unbinds the specified from an exchange under a particular routing key.
-     *
-     * @param exchange   The exchange to unbind from.
-     * @param routingKey The routing key to unbind.
-     * @param queue      The queue to unbind.
-     * @param args       Additonal parameters.
-     *
-     * @throws AMQException If the operation fails for any reason.
-     */
-    void unbindQueue(Exchange exchange, AMQShortString routingKey, AMQQueue queue, FieldTable args) throws AMQException;
-
-    /**
-     * Makes the specified queue persistent.
-     *
-     * @param queue The queue to store.
-     *
-     * @throws AMQException If the operation fails for any reason.
-     */
-    void createQueue(AMQQueue queue) throws AMQException;
-
-    /**
-     * Removes the specified queue from the persistent store.
-     *
-     * @param name The queue to remove.
-     *
-     * @throws AMQException If the operation fails for any reason.
-     */
-    void removeQueue(AMQShortString name) throws AMQException;
-
-    /**
-     * Places a message onto a specified queue, in a given transactional context.
-     *
-     * @param context   The transactional context for the operation.
-     * @param name      The name of the queue to place the message on.
-     * @param messageId The message to enqueue.
-     *
-     * @throws AMQException If the operation fails for any reason.
-     */
-    void enqueueMessage(StoreContext context, AMQShortString name, Long messageId) throws AMQException;
-
-    /**
-     * Extracts a message from a specified queue, in a given transactional context.
-     *
-     * @param context   The transactional context for the operation.
-     * @param name      The name of the queue to take the message from.
-     * @param messageId The message to dequeue.
-     *
-     * @throws AMQException If the operation fails for any reason, or if the specified message does not exist.
-     */
-    void dequeueMessage(StoreContext context, AMQShortString name, Long messageId) throws AMQException;
-
-    /**
-     * Begins a transactional context.
-     *
-     * @param context The transactional context to begin.
-     *
-     * @throws AMQException If the operation fails for any reason.
-     */
-    void beginTran(StoreContext context) throws AMQException;
-
-    /**
-     * Commits all operations performed within a given transactional context.
-     *
-     * @param context The transactional context to commit all operations for.
-     *
-     * @throws AMQException If the operation fails for any reason.
-     */
-    void commitTran(StoreContext context) throws AMQException;
-
-    /**
-     * Abandons all operations performed within a given transactional context.
-     *
-     * @param context The transactional context to abandon.
-     *
-     * @throws AMQException If the operation fails for any reason.
-     */
-    void abortTran(StoreContext context) throws AMQException;
-
-    /**
-     * Tests a transactional context to see if it has been begun but not yet committed or aborted.
-     *
-     * @param context The transactional context to test.
-     *
-     * @return <tt>true</tt> if the transactional context is live, <tt>false</tt> otherwise.
-     */
-    boolean inTran(StoreContext context);
-
-    /**
-     * Return a valid, currently unused message id.
-     *
-     * @return A fresh message id.
-     */
-    Long getNewMessageId();
-
-    /**
-     * Stores a chunk of message data.
-     *
-     * @param context         The transactional context for the operation.
-     * @param messageId       The message to store the data for.
-     * @param index           The index of the data chunk.
-     * @param contentBody     The content of the data chunk.
-     * @param lastContentBody Flag to indicate that this is the last such chunk for the message.
-     *
-     * @throws AMQException If the operation fails for any reason, or if the specified message does not exist.
-     */
-    void storeContentBodyChunk(StoreContext context, Long messageId, int index, ContentChunk contentBody,
-        boolean lastContentBody) throws AMQException;
-
-    /**
-     * Stores message meta-data.
-     *
-     * @param context         The transactional context for the operation.
-     * @param messageId       The message to store the data for.
-     * @param messageMetaData The message meta data to store.
-     *
-     * @throws AMQException If the operation fails for any reason, or if the specified message does not exist.
-     */
-    void storeMessageMetaData(StoreContext context, Long messageId, MessageMetaData messageMetaData) throws AMQException;
-
-    /**
-     * Retrieves message meta-data.
-     *
-     * @param context   The transactional context for the operation.
-     * @param messageId The message to get the meta-data for.
-     *
-     * @return The message meta data.
-     *
-     * @throws AMQException If the operation fails for any reason, or if the specified message does not exist.
-     */
-    MessageMetaData getMessageMetaData(StoreContext context, Long messageId) throws AMQException;
-
-    /**
-     * Retrieves a chunk of message data.
-     *
-     * @param context   The transactional context for the operation.
-     * @param messageId The message to get the data chunk for.
-     * @param index     The offset index of the data chunk within the message.
-     *
-     * @return A chunk of message data.
-     *
-     * @throws AMQException If the operation fails for any reason, or if the specified message does not exist.
-     */
-    ContentChunk getContentBodyChunk(StoreContext context, Long messageId, int index) throws AMQException;
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/store/StoreContext.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/store/StoreContext.java
deleted file mode 100644
index 3ee49d58cf..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/store/StoreContext.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.store;
-
-import org.apache.log4j.Logger;
-
-/**
- * A context that the store can use to associate with a transactional context. For example, it could store
- * some kind of txn id.
- *
- * @author Apache Software Foundation
- */
-public class StoreContext
-{
-    private static final Logger _logger = Logger.getLogger(StoreContext.class);
-
-    private String _name;
-    private Object _payload;
-
-    public StoreContext()
-    {
-        _name = super.toString();
-    }
-
-    public StoreContext(String name)
-    {
-        _name = name;
-    }
-
-    public Object getPayload()
-    {
-        return _payload;
-    }
-
-    public void setPayload(Object payload)
-    {
-        _logger.debug("public void setPayload(Object payload = " + payload + "): called");
-        _payload = payload;
-    }
-
-    /**
-     * Prints out the transactional context as a string, mainly for debugging purposes.
-     *
-     * @return The transactional context as a string.
-     */
-    public String toString()
-    {
-        return "<_name = " + _name + ", _payload = " + _payload + ">";
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ConnectorConfiguration.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ConnectorConfiguration.java
deleted file mode 100644
index a4ed859fa7..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ConnectorConfiguration.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.transport;
-
-import org.apache.mina.common.IoAcceptor;
-import org.apache.mina.util.NewThreadExecutor;
-import org.apache.qpid.configuration.Configured;
-
-public class ConnectorConfiguration
-{
-    public static final String DEFAULT_PORT = "5672";
-
-    public static final String SSL_PORT = "8672";
-
-    @Configured(path = "connector.processors",
-                defaultValue = "4")
-    public int processors;
-
-    @Configured(path = "connector.port",
-                defaultValue = DEFAULT_PORT)
-    public int port;
-
-    @Configured(path = "connector.bind",
-                defaultValue = "wildcard")
-    public String bindAddress;
-    
-    @Configured(path = "connector.socketReceiveBuffer",
-                defaultValue = "32767")
-    public int socketReceiveBufferSize;
-
-    @Configured(path = "connector.socketWriteBuffer",
-                defaultValue = "32767")
-    public int socketWriteBuferSize;
-
-    @Configured(path = "connector.tcpNoDelay",
-                defaultValue = "true")
-    public boolean tcpNoDelay;
-
-    @Configured(path = "advanced.filterchain[@enableExecutorPool]",
-                defaultValue = "false")
-    public boolean enableExecutorPool;
-
-    @Configured(path = "advanced.enablePooledAllocator",
-                defaultValue = "false")
-    public boolean enablePooledAllocator;
-
-    @Configured(path = "advanced.enableDirectBuffers",
-                defaultValue = "false")
-    public boolean enableDirectBuffers;
-
-    @Configured(path = "connector.ssl.enabled",
-                defaultValue = "false")
-    public boolean enableSSL;
-    
-    @Configured(path = "connector.ssl.sslOnly",
-    		    defaultValue = "true")
-    public boolean sslOnly;
-    
-    @Configured(path = "connector.ssl.port",
-            defaultValue = SSL_PORT)
-    public int sslPort;    
-    
-    @Configured(path = "connector.ssl.keystorePath",
-    			defaultValue = "none")
-    public String keystorePath;
-    
-    @Configured(path = "connector.ssl.keystorePassword",
-    			defaultValue = "none")
-    public String keystorePassword;
-    
-    @Configured(path = "connector.ssl.certType",
-    			defaultValue = "SunX509")
-    public String certType;
-
-    public IoAcceptor createAcceptor()
-    {
-        return new org.apache.mina.transport.socket.nio.SocketAcceptor(processors, new NewThreadExecutor());     
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ThreadPoolFilter.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ThreadPoolFilter.java
deleted file mode 100644
index e6ee8891f6..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ThreadPoolFilter.java
+++ /dev/null
@@ -1,712 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.transport;
-
-import java.util.ArrayList;
-import java.util.IdentityHashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.mina.common.IdleStatus;
-import org.apache.mina.common.IoFilterAdapter;
-import org.apache.mina.common.IoHandler;
-import org.apache.mina.common.IoSession;
-//import org.apache.mina.util.BlockingQueue;
-//import org.apache.mina.util.ByteBufferUtil;
-//import org.apache.mina.util.IdentityHashSet;
-//import org.apache.mina.util.Queue;
-//import org.apache.mina.util.Stack;
-//import org.apache.mina.util.IdentityHashSet;
-
-/**
- * A Thread-pooling filter.  This filter forwards {@link IoHandler} events
- * to its thread pool.
- * <p/>
- * This is an implementation of
- * <a href="http://deuce.doc.wustl.edu/doc/pspdfs/lf.pdf">Leader/Followers
- * thread pool</a> by Douglas C. Schmidt et al.
- */
-public class ThreadPoolFilter extends IoFilterAdapter
-{
-
-    /**
-     * Default maximum size of thread pool (2G).
-     */
-    public static final int DEFAULT_MAXIMUM_POOL_SIZE = Integer.MAX_VALUE;
-
-    /**
-     * Default keep-alive time of thread pool (1 min).
-     */
-    public static final int DEFAULT_KEEP_ALIVE_TIME = 60 * 1000;
-
-    /**
-     * A queue which contains {@link Integer}s which represents reusable
-     * thread IDs.  {@link Worker} first checks this queue and then
-     * uses {@link #threadId} when no reusable thread ID is available.
-     */
-    /* private static final Queue threadIdReuseQueue = new Queue();
-    private static int threadId = 0;
-
-    private static int acquireThreadId()
-    {
-        synchronized (threadIdReuseQueue)
-        {
-            Integer id = (Integer) threadIdReuseQueue.pop();
-            if (id == null)
-            {
-                return ++ threadId;
-            }
-            else
-            {
-                return id.intValue();
-            }
-        }
-    }
-
-    private static void releaseThreadId(int id)
-    {
-        synchronized (threadIdReuseQueue)
-        {
-            threadIdReuseQueue.push(new Integer(id));
-        }
-    } */
-
-    private final String threadNamePrefix = "";
-    private final Map buffers = new IdentityHashMap();
-    //private final BlockingQueue unfetchedSessionBuffers = new BlockingQueue();
-    //private final Set allSessionBuffers = new IdentityHashSet();
-
-    //private Worker leader;
-    //private final Stack followers = new Stack();
-    //private final Set allWorkers = new IdentityHashSet();
-
-    private int maximumPoolSize = DEFAULT_MAXIMUM_POOL_SIZE;
-    private int keepAliveTime = DEFAULT_KEEP_ALIVE_TIME;
-
-    private boolean shuttingDown;
-
-    private int poolSize;
-    private final Object poolSizeLock = new Object();
-
-    /**
-     * Creates a new instance of this filter with default thread pool settings.
-     */
-    public ThreadPoolFilter()
-    {
-        this("IoThreadPool");
-    }
-
-    /**
-     * Creates a new instance of this filter with the specified thread name prefix
-     * and other default settings.
-     *
-     * @param threadNamePrefix the prefix of the thread names this pool will create.
-     */
-    public ThreadPoolFilter(String threadNamePrefix)
-    {
-        if (threadNamePrefix == null)
-        {
-            throw new NullPointerException("threadNamePrefix");
-        }
-        threadNamePrefix = threadNamePrefix.trim();
-        if (threadNamePrefix.length() == 0)
-        {
-            throw new IllegalArgumentException("threadNamePrefix is empty.");
-        }
-       // this.threadNamePrefix = threadNamePrefix;
-    }
-
-    public String getThreadNamePrefix()
-    {
-        return null; // threadNamePrefix;
-    }
-
-    public int getPoolSize()
-    {
-       /* synchronized (poolSizeLock)
-        {
-            return poolSize;
-        }*/
-        return 0;
-    }
-
-    public int getMaximumPoolSize()
-    {
-        return maximumPoolSize;
-    }
-
-    public int getKeepAliveTime()
-    {
-        return keepAliveTime;
-    }
-
-    public void setMaximumPoolSize(int maximumPoolSize)
-    {
-        if (maximumPoolSize <= 0)
-        {
-            throw new IllegalArgumentException();
-        }
-        this.maximumPoolSize = maximumPoolSize;
-    }
-
-    public void setKeepAliveTime(int keepAliveTime)
-    {
-        this.keepAliveTime = keepAliveTime;
-    }
-
-/*    public void init()
-    {
-        shuttingDown = false;
-        leader = new Worker();
-        leader.start();
-        leader.lead();
-    }
-
-    public void destroy()
-    {
-        shuttingDown = true;
-        int expectedPoolSize = 0;
-        while (getPoolSize() != expectedPoolSize)
-        {
-            List allWorkers;
-            synchronized (poolSizeLock)
-            {
-               // allWorkers = new ArrayList(this.allWorkers);
-            }
-
-            // You may not interrupt the current thread.
-            if (allWorkers.remove(Thread.currentThread()))
-            {
-                expectedPoolSize = 1;
-            }
-
-            for (Iterator i = allWorkers.iterator(); i.hasNext();)
-            {
-                Worker worker = (Worker) i.next();
-                while (worker.isAlive())
-                {
-                    worker.interrupt();
-                    try
-                    {
-                        // This timeout will help us from
-                        // infinite lock-up and interrupt workers again.
-                        worker.join(100);
-                    }
-                    catch (InterruptedException e)
-                    {
-                    }
-                }
-            }
-        }
-
-      //  this.allSessionBuffers.clear();
-      //  this.unfetchedSessionBuffers.clear();
-        this.buffers.clear();
-      //  this.followers.clear();
-        this.leader = null;
-    }
-
-    private void increasePoolSize(Worker worker)
-    {
-        synchronized (poolSizeLock)
-        {
-            poolSize++;
-            //allWorkers.add(worker);
-        }
-    }
-
-    private void decreasePoolSize(Worker worker)
-    {
-        synchronized (poolSizeLock)
-        {
-            poolSize--;
-            //allWorkers.remove(worker);
-        }
-    }
-
-    private void fireEvent(NextFilter nextFilter, IoSession session,
-                           EventType type, Object data)
-    {
-        /*
-        final BlockingQueue unfetchedSessionBuffers = this.unfetchedSessionBuffers;
-        final Set allSessionBuffers = this.allSessionBuffers;
-        final Event event = new Event(type, nextFilter, data);
-
-        synchronized (unfetchedSessionBuffers)
-        {
-            final SessionBuffer buf = getSessionBuffer(session);
-            final Queue eventQueue = buf.eventQueue;
-
-            synchronized (buf)
-            {
-                eventQueue.push(event);
-            }
-
-            if (!allSessionBuffers.contains(buf))
-            {
-                allSessionBuffers.add(buf);
-                unfetchedSessionBuffers.push(buf);
-            }
-        }
-        */
-    }
-
-    /**
-     * Implement this method to fetch (or pop) a {@link SessionBuffer} from
-     * the given <tt>unfetchedSessionBuffers</tt>.  The default implementation
-     * simply pops the buffer from it.  You could prioritize the fetch order.
-     *
-     * @return A non-null {@link SessionBuffer}
-     */
- /*   protected SessionBuffer fetchSessionBuffer(Queue unfetchedSessionBuffers)
-    {
-        return (SessionBuffer) unfetchedSessionBuffers.pop();
-    }
-
-    private SessionBuffer getSessionBuffer(IoSession session)
-    {
-        final Map buffers = this.buffers;
-        SessionBuffer buf = (SessionBuffer) buffers.get(session);
-        if (buf == null)
-        {
-            synchronized (buffers)
-            {
-                buf = (SessionBuffer) buffers.get(session);
-                if (buf == null)
-                {
-                    buf = new SessionBuffer(session);
-                    buffers.put(session, buf);
-                }
-            }
-        }
-        return buf;
-    }
-
-    private void removeSessionBuffer(SessionBuffer buf)
-    {
-        final Map buffers = this.buffers;
-        final IoSession session = buf.session;
-        synchronized (buffers)
-        {
-            buffers.remove(session);
-        }
-    }
-
-    protected static class SessionBuffer
-    {
-        private final IoSession session;
-
-        //private final Queue eventQueue = new Queue();
-
-        private SessionBuffer(IoSession session)
-        {
-            this.session = session;
-        }
-
-        public IoSession getSession()
-        {
-            return session;
-        }
-
-     /*   public Queue getEventQueue()
-        {
-            return eventQueue;
-        }
-    }
-
-    private class Worker extends Thread
-    {
-        private final int id;
-        private final Object promotionLock = new Object();
-        private boolean dead;
-
-        private Worker()
-        {
-            int id = acquireThreadId();
-            this.id = id;
-            this.setName(threadNamePrefix + '-' + id);
-            increasePoolSize(this);
-        }
-
-        public boolean lead()
-        {
-            final Object promotionLock = this.promotionLock;
-            synchronized (promotionLock)
-            {
-                if (dead)
-                {
-                    return false;
-                }
-
-                leader = this;
-                promotionLock.notify();
-            }
-
-            return true;
-        }
-
-        public void run()
-        {
-            for (; ;)
-            {
-                if (!waitForPromotion())
-                {
-                    break;
-                }
-
-                SessionBuffer buf = fetchBuffer();
-                giveUpLead();
-                if (buf == null)
-                {
-                    break;
-                }
-
-                processEvents(buf);
-                follow();
-                releaseBuffer(buf);
-            }
-
-            decreasePoolSize(this);
-            releaseThreadId(id);
-        }
-
-        private SessionBuffer fetchBuffer()
-        {
-            BlockingQueue unfetchedSessionBuffers = ThreadPoolFilter.this.unfetchedSessionBuffers;
-            synchronized (unfetchedSessionBuffers)
-            {
-                while (!shuttingDown)
-                {
-                    try
-                    {
-                        unfetchedSessionBuffers.waitForNewItem();
-                    }
-                    catch (InterruptedException e)
-                    {
-                        continue;
-                    }
-
-                    return ThreadPoolFilter.this.fetchSessionBuffer(unfetchedSessionBuffers);
-                }
-            }
-
-            return null;
-        }
-
-        private void processEvents(SessionBuffer buf)
-        {
-            final IoSession session = buf.session;
-            final Queue eventQueue = buf.eventQueue;
-            for (; ;)
-            {
-                Event event;
-                synchronized (buf)
-                {
-                    event = (Event) eventQueue.pop();
-                    if (event == null)
-                    {
-                        break;
-                    }
-                }
-                processEvent(event.getNextFilter(), session,
-                             event.getType(), event.getData());
-            }
-        }
-
-        private void follow()
-        {
-            final Object promotionLock = this.promotionLock;
-            final Stack followers = ThreadPoolFilter.this.followers;
-            synchronized (promotionLock)
-            {
-                if (this != leader)
-                {
-                    synchronized (followers)
-                    {
-                        followers.push(this);
-                    }
-                }
-            }
-        }
-
-        private void releaseBuffer(SessionBuffer buf)
-        {
-            final BlockingQueue unfetchedSessionBuffers = ThreadPoolFilter.this.unfetchedSessionBuffers;
-            final Set allSessionBuffers = ThreadPoolFilter.this.allSessionBuffers;
-            final Queue eventQueue = buf.eventQueue;
-
-            synchronized (unfetchedSessionBuffers)
-            {
-                if (eventQueue.isEmpty())
-                {
-                    allSessionBuffers.remove(buf);
-                    removeSessionBuffer(buf);
-                }
-                else
-                {
-                    unfetchedSessionBuffers.push(buf);
-                }
-            }
-        }
-
-        private boolean waitForPromotion()
-        {
-            final Object promotionLock = this.promotionLock;
-
-            long startTime = System.currentTimeMillis();
-            long currentTime = System.currentTimeMillis();
-
-            synchronized (promotionLock)
-            {
-                while (this != leader && !shuttingDown)
-                {
-                    // Calculate remaining keep-alive time
-                    int keepAliveTime = getKeepAliveTime();
-                    if (keepAliveTime > 0)
-                    {
-                        keepAliveTime -= (currentTime - startTime);
-                    }
-                    else
-                    {
-                        keepAliveTime = Integer.MAX_VALUE;
-                    }
-
-                    // Break the loop if there's no remaining keep-alive time.
-                    if (keepAliveTime <= 0)
-                    {
-                        break;
-                    }
-
-                    // Wait for promotion
-                    try
-                    {
-                        promotionLock.wait(keepAliveTime);
-                    }
-                    catch (InterruptedException e)
-                    {
-                    }
-
-                    // Update currentTime for the next iteration
-                    currentTime = System.currentTimeMillis();
-                }
-
-                boolean timeToLead = this == leader && !shuttingDown;
-
-                if (!timeToLead)
-                {
-                    // time to die
-                    synchronized (followers)
-                    {
-                        followers.remove(this);
-                    }
-
-                    // Mark as dead explicitly when we've got promotionLock.
-                    dead = true;
-                }
-
-                return timeToLead;
-            }
-        }
-
-        private void giveUpLead()
-        {
-            final Stack followers = ThreadPoolFilter.this.followers;
-            Worker worker;
-            do
-            {
-                synchronized (followers)
-                {
-                    worker = (Worker) followers.pop();
-                }
-
-                if (worker == null)
-                {
-                    // Increase the number of threads if we
-                    // are not shutting down and we can increase the number.
-                    if (!shuttingDown
-                            && getPoolSize() < getMaximumPoolSize())
-                    {
-                        worker = new Worker();
-                        worker.lead();
-                        worker.start();
-                    }
-
-                    // This loop should end because:
-                    // 1) lead() is called already,
-                    // 2) or it is shutting down and there's no more threads left.
-                    break;
-                }
-            }
-            while (!worker.lead());
-        }
-    }
-
-    protected static class EventType
-    {
-        public static final EventType OPENED = new EventType("OPENED");
-
-        public static final EventType CLOSED = new EventType("CLOSED");
-
-        public static final EventType READ = new EventType("READ");
-
-        public static final EventType WRITTEN = new EventType("WRITTEN");
-
-        public static final EventType RECEIVED = new EventType("RECEIVED");
-
-        public static final EventType SENT = new EventType("SENT");
-
-        public static final EventType IDLE = new EventType("IDLE");
-
-        public static final EventType EXCEPTION = new EventType("EXCEPTION");
-
-        private final String value;
-
-        private EventType(String value)
-        {
-            this.value = value;
-        }
-
-        public String toString()
-        {
-            return value;
-        }
-    }
-
-    protected static class Event
-    {
-        private final EventType type;
-        private final NextFilter nextFilter;
-        private final Object data;
-
-        public Event(EventType type, NextFilter nextFilter, Object data)
-        {
-            this.type = type;
-            this.nextFilter = nextFilter;
-            this.data = data;
-        }
-
-        public Object getData()
-        {
-            return data;
-        }
-
-
-        public NextFilter getNextFilter()
-        {
-            return nextFilter;
-        }
-
-
-        public EventType getType()
-        {
-            return type;
-        }
-    }
-
-    public void sessionCreated(NextFilter nextFilter, IoSession session)
-    {
-        nextFilter.sessionCreated(session);
-    }
-
-    public void sessionOpened(NextFilter nextFilter,
-                              IoSession session)
-    {
-        fireEvent(nextFilter, session, EventType.OPENED, null);
-    }
-
-    public void sessionClosed(NextFilter nextFilter,
-                              IoSession session)
-    {
-        fireEvent(nextFilter, session, EventType.CLOSED, null);
-    }
-
-    public void sessionIdle(NextFilter nextFilter,
-                            IoSession session, IdleStatus status)
-    {
-        fireEvent(nextFilter, session, EventType.IDLE, status);
-    }
-
-    public void exceptionCaught(NextFilter nextFilter,
-                                IoSession session, Throwable cause)
-    {
-        fireEvent(nextFilter, session, EventType.EXCEPTION, cause);
-    }
-
-    public void messageReceived(NextFilter nextFilter,
-                                IoSession session, Object message)
-    {
-        ByteBufferUtil.acquireIfPossible(message);
-        fireEvent(nextFilter, session, EventType.RECEIVED, message);
-    }
-
-    public void messageSent(NextFilter nextFilter,
-                            IoSession session, Object message)
-    {
-        ByteBufferUtil.acquireIfPossible(message);
-        fireEvent(nextFilter, session, EventType.SENT, message);
-    }
-
-    protected void processEvent(NextFilter nextFilter,
-                                IoSession session, EventType type,
-                                Object data)
-    {
-        if (type == EventType.RECEIVED)
-        {
-            nextFilter.messageReceived(session, data);
-            ByteBufferUtil.releaseIfPossible(data);
-        }
-        else if (type == EventType.SENT)
-        {
-            nextFilter.messageSent(session, data);
-            ByteBufferUtil.releaseIfPossible(data);
-        }
-        else if (type == EventType.EXCEPTION)
-        {
-            nextFilter.exceptionCaught(session, (Throwable) data);
-        }
-        else if (type == EventType.IDLE)
-        {
-            nextFilter.sessionIdle(session, (IdleStatus) data);
-        }
-        else if (type == EventType.OPENED)
-        {
-            nextFilter.sessionOpened(session);
-        }
-        else if (type == EventType.CLOSED)
-        {
-            nextFilter.sessionClosed(session);
-        }
-    }
-
-    public void filterWrite(NextFilter nextFilter, IoSession session, WriteRequest writeRequest)
-    {
-        nextFilter.filterWrite(session, writeRequest);
-    }
-
-    public void filterClose(NextFilter nextFilter, IoSession session) throws Exception
-    {
-        nextFilter.filterClose(session);
-    }
-
-    */
-
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/CleanupMessageOperation.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/CleanupMessageOperation.java
deleted file mode 100644
index 988f589339..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/CleanupMessageOperation.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.txn;
-
-import org.apache.log4j.Logger;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.server.RequiredDeliveryException;
-import org.apache.qpid.server.queue.AMQMessage;
-import org.apache.qpid.server.queue.NoConsumersException;
-import org.apache.qpid.server.store.StoreContext;
-
-import java.util.List;
-
-/**
- * @author Apache Software Foundation
- */
-public class CleanupMessageOperation implements TxnOp
-{
-    private static final Logger _log = Logger.getLogger(CleanupMessageOperation.class);
-
-    private final AMQMessage _msg;
-
-    private final List<RequiredDeliveryException> _returns;
-
-    public CleanupMessageOperation(AMQMessage msg, List<RequiredDeliveryException> returns)
-    {
-        _msg = msg;
-        _returns = returns;
-    }
-
-    public void prepare(StoreContext context) throws AMQException
-    { }
-
-    public void undoPrepare()
-    {
-        // don't need to do anything here, if the store's txn failed
-        // when processing prepare then the message was not stored
-        // or enqueued on any queues and can be discarded
-    }
-
-    public void commit(StoreContext context)
-    {
-        // No-op can't be done here has this is before the message has been attempted to be delivered.
-        /*try
-        {
-            _msg.checkDeliveredToConsumer();
-        }
-        catch (NoConsumersException e)
-        {
-            _returns.add(e);
-        }*/
-    }
-
-    public void rollback(StoreContext context)
-    {
-        // NO OP
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/DequeueRecord.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/DequeueRecord.java
deleted file mode 100644
index d899bb972c..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/DequeueRecord.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.qpid.server.txn;
-
-import org.apache.qpid.server.messageStore.MessageStore;
-import org.apache.qpid.server.exception.*;
-
-import javax.transaction.xa.Xid;
-
-/**
- * Created by Arnaud Simon
- * Date: 25-Apr-2007
- * Time: 17:13:07
- */
-public class DequeueRecord implements TransactionRecord
-{
-
-
-    public void commit(MessageStore store, Xid xid)
-            throws
-            InternalErrorException,
-            QueueDoesntExistException,
-            InvalidXidException,
-            UnknownXidException,
-            MessageDoesntExistException
-    {
-        // nothing    
-    }
-
-    public void rollback(MessageStore store)
-            throws
-            InternalErrorException
-    {
-        //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    public void prepare(MessageStore store)
-            throws
-            InternalErrorException
-    {
-        //To change body of implemented methods use File | Settings | File Templates.
-    }
-}
-
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/DistributedTransactionalContext.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/DistributedTransactionalContext.java
deleted file mode 100644
index 13f66fac5b..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/DistributedTransactionalContext.java
+++ /dev/null
@@ -1,267 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.qpid.server.txn;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.server.queue.AMQMessage;
-import org.apache.qpid.server.queue.AMQQueue;
-import org.apache.qpid.server.ack.UnacknowledgedMessageMap;
-import org.apache.qpid.server.ack.UnacknowledgedMessage;
-import org.apache.qpid.server.protocol.AMQProtocolSession;
-import org.apache.qpid.server.store.StoreContext;
-import org.apache.qpid.server.messageStore.MessageStore;
-import org.apache.qpid.server.RequiredDeliveryException;
-import org.apache.log4j.Logger;
-
-import javax.transaction.xa.Xid;
-import java.util.List;
-import java.util.LinkedList;
-
-/**
- * Created by Arnaud Simon
- * Date: 25-Apr-2007
- * Time: 15:58:07
- */
-public class DistributedTransactionalContext implements TransactionalContext
-{
-    //========================================================================
-    // Static Constants
-    //========================================================================
-    // The logger for this class
-    private static final Logger _log = Logger.getLogger(DistributedTransactionalContext.class);
-    private static final Object _lockXID = new Object();
-    private static int _count = 0;
-    //========================================================================
-    // Instance Fields
-    //========================================================================
-    // the message store
-    final private MessageStore _messageStore;
-    // The transaction manager
-    final private TransactionManager _transactionManager;
-    // the store context
-    final private StoreContext _storeContext;
-    // the returned messages
-    final private List<RequiredDeliveryException> _returnMessages;
-    // for generating xids
-    private byte[] _txId = ("txid").getBytes();
-
-    public DistributedTransactionalContext(TransactionManager transactionManager, MessageStore messageStore, StoreContext storeContext,
-                                           List<RequiredDeliveryException> returnMessages)
-    {
-        _messageStore = messageStore;
-        _storeContext = storeContext;
-        _returnMessages = returnMessages;
-        _transactionManager = transactionManager;
-    }
-
-    public void beginTranIfNecessary()
-            throws
-            AMQException
-    {
-        if (_storeContext.getPayload() == null)
-        {
-            synchronized (_lockXID)
-            {
-                // begin the transaction and pass the XID through the context
-                Xid xid = new XidImpl(("branch" + _count++).getBytes(), 1, _txId);
-                try
-                {
-                    _transactionManager.begin(xid);
-                    _storeContext.setPayload(xid);
-                } catch (Exception e)
-                {
-                    throw new AMQException(null, "Problem during transaction begin", e);
-                }
-            }
-        }
-    }
-
-    public void commit()
-            throws
-            AMQException
-    {
-        try
-        {
-            if (_storeContext.getPayload() != null)
-            {
-                _transactionManager.commit_one_phase((Xid) _storeContext.getPayload());
-            }
-        } catch (Exception e)
-        {
-            throw new AMQException(null, "Problem during transaction commit", e);
-        }
-        finally
-        {
-            _storeContext.setPayload(null);
-        }
-    }
-
-    public void rollback()
-            throws
-            AMQException
-    {
-        try
-        {
-            if (_storeContext.getPayload() != null)
-            {
-                _transactionManager.rollback((Xid) _storeContext.getPayload());
-            }
-        } catch (Exception e)
-        {
-            throw new AMQException(null, "Problem during transaction rollback", e);
-        }
-        finally
-        {
-            _storeContext.setPayload(null);
-        }
-    }
-
-    public void messageFullyReceived(boolean persistent)
-            throws
-            AMQException
-    {
-        // The message is now fully received, we can stage it before enqueued if necessary
-    }
-
-    public void deliver(AMQMessage message, AMQQueue queue, boolean deliverFirst)
-            throws
-            AMQException
-    {
-        try
-        {
-            //The message has been delivered to the queues
-            message.getMessageHandle().enqueue(_storeContext, message.getMessageId(), queue);
-            // add a record in the transaction
-            _transactionManager.getTransaction((Xid) _storeContext.getPayload()).addRecord(new EnqueueRecord(_storeContext, message, queue, deliverFirst));
-        } catch (Exception e)
-        {
-            throw new AMQException(null, "Problem during transaction rollback", e);
-        }
-    }
-
-    public void acknowledgeMessage(long deliveryTag, long lastDeliveryTag,
-                                   boolean multiple,
-                                   final UnacknowledgedMessageMap unacknowledgedMessageMap)
-            throws
-            AMQException
-    {
-        beginTranIfNecessary();
-        if (multiple)
-        {
-            if (deliveryTag == 0)
-            {
-                //Spec 2.1.6.11 ... If the multiple field is 1, and the delivery tag is zero,
-                // tells the server to acknowledge all outstanding mesages.
-                _log.info("Multiple ack on delivery tag 0. ACKing all messages. Current count:" +
-                        unacknowledgedMessageMap.size());
-                unacknowledgedMessageMap.visit(new UnacknowledgedMessageMap.Visitor()
-                {
-                    public boolean callback(UnacknowledgedMessage message)
-                            throws
-                            AMQException
-                    {
-                        if (_log.isDebugEnabled())
-                        {
-                            _log.debug("Discarding message: " + message.message.getMessageId());
-                        }
-
-                        //Message has been ack so discard it. This will dequeue and decrement the reference.
-                        dequeue(message);
-                        return false;
-                    }
-
-                    public void visitComplete()
-                    {
-                        unacknowledgedMessageMap.clear();
-                    }
-                });
-            } else
-            {
-                if (!unacknowledgedMessageMap.contains(deliveryTag))
-                {
-                    throw new AMQException(null, "Multiple ack on delivery tag " + deliveryTag + " not known for channel", null);
-                }
-
-                LinkedList<UnacknowledgedMessage> acked = new LinkedList<UnacknowledgedMessage>();
-                unacknowledgedMessageMap.drainTo(acked, deliveryTag);
-                for (UnacknowledgedMessage msg : acked)
-                {
-                    if (_log.isDebugEnabled())
-                    {
-                        _log.debug("Discarding message: " + msg.message.getMessageId());
-                    }
-                    //Message has been ack so discard it. This will dequeue and decrement the reference.
-                    dequeue(msg);
-                }
-            }
-        } else
-        {
-            UnacknowledgedMessage msg;
-            msg = unacknowledgedMessageMap.remove(deliveryTag);
-
-            if (msg == null)
-            {
-                _log.info("Single ack on delivery tag " + deliveryTag);
-                throw new AMQException(null, "Single ack on delivery tag " + deliveryTag, null);
-            }
-
-            if (_log.isDebugEnabled())
-            {
-                _log.debug("Discarding message: " + msg.message.getMessageId());
-            }
-
-            //Message has been ack so discard it. This will dequeue and decrement the reference.
-            dequeue(msg);
-
-            if (_log.isDebugEnabled())
-            {
-                _log.debug("Received non-multiple ack for messaging with delivery tag " + deliveryTag + " msg id " +
-                        msg.message.getMessageId());
-            }
-        }
-    }
-
-    private void dequeue(UnacknowledgedMessage message)
-            throws
-            AMQException
-    {
-        // Dequeue the message from the strore
-        message.discard(_storeContext);
-        // Add a record
-        try
-        {
-            _transactionManager.getTransaction((Xid) _storeContext.getPayload()).addRecord(new DequeueRecord());
-        } catch (Exception e)
-        {
-            throw new AMQException(null, "Problem during message dequeue", e);
-        }
-    }
-
-
-    public void messageProcessed(AMQProtocolSession protocolSession)
-            throws
-            AMQException
-    {
-        // The message has been sent
-    }
-
-    public StoreContext getStoreContext()
-    {
-        return _storeContext;
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/EnqueueRecord.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/EnqueueRecord.java
deleted file mode 100644
index 6770d8a8dd..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/EnqueueRecord.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.qpid.server.txn;
-
-import javax.transaction.xa.Xid;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.server.exception.*;
-import org.apache.qpid.server.messageStore.MessageStore;
-import org.apache.qpid.server.queue.AMQMessage;
-import org.apache.qpid.server.queue.AMQQueue;
-import org.apache.qpid.server.store.StoreContext;
-
-/**
- * Created by Arnaud Simon
- * Date: 25-Apr-2007
- * Time: 17:01:06
- */
-public class EnqueueRecord implements TransactionRecord
-{
-    private final StoreContext _storeContext;
-    private final AMQMessage _msg;
-    private final AMQQueue _queue;
-    private final boolean _first;
-
-    EnqueueRecord(StoreContext storeContext, AMQMessage msg, AMQQueue q, boolean firsr)
-    {
-        _storeContext = storeContext;
-        _msg = msg;
-        _queue = q;
-        _first = firsr;
-    }
-
-    public void commit(MessageStore store, Xid xid)
-        throws InternalErrorException, QueueDoesntExistException, InvalidXidException, UnknownXidException,
-            MessageDoesntExistException
-    {
-        try
-        {
-            _queue.process(_storeContext, _msg, _first);
-        }
-        catch (AMQException e)
-        {
-            throw new InternalErrorException(e.getMessage(), e);
-        }
-    }
-
-    public void rollback(MessageStore store) throws InternalErrorException
-    {
-        // To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    public void prepare(MessageStore store) throws InternalErrorException
-    {
-        // To change body of implemented methods use File | Settings | File Templates.
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/JDBCAbstractRecord.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/JDBCAbstractRecord.java
deleted file mode 100644
index cc0cc7140b..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/JDBCAbstractRecord.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.qpid.server.txn;
-
-import org.apache.log4j.Logger;
-import org.apache.qpid.server.messageStore.StorableQueue;
-import org.apache.qpid.server.messageStore.StorableMessage;
-import org.apache.qpid.server.messageStore.MessageStore;
-import org.apache.qpid.server.exception.InternalErrorException;
-import org.apache.qpid.server.exception.UnknownXidException;
-
-import javax.transaction.xa.Xid;
-
-/**
- * Created by Arnaud Simon
- * Date: 16-May-2007
- * Time: 15:15:18
- */
-public abstract class JDBCAbstractRecord implements TransactionRecord
-{
-    //========================================================================
-    // Static Constants
-    //========================================================================
-    // The logger for this class
-    private static final Logger _log = Logger.getLogger(JDBCEnqueueRecord.class);
-    // The record types
-    static public final int TYPE_DEQUEUE = 1;
-    static public final int TYPE_ENQUEUE = 2;
-
-    // the queue
-    StorableQueue _queue;
-    // the message
-    StorableMessage _message;
-
-    //========================================================================
-    // Constructor
-    //========================================================================
-    public JDBCAbstractRecord(StorableMessage m, StorableQueue queue)
-    {
-        _queue = queue;
-        _message = m;
-    }
-
-    public abstract int getType();
-    public long getMessageID()
-    {
-        return _message.getMessageId();
-    }
-
-    public int getQueueID()
-    {
-        return _queue.getQueueID();
-    }
-
-     public void rollback(MessageStore store)
-            throws
-            InternalErrorException
-     {
-
-    }
-
-    public void prepare(MessageStore store)
-            throws
-            InternalErrorException
-    {
-    }
-
-
-      public abstract void rollback(MessageStore store, Xid xid)
-            throws
-            InternalErrorException,
-            UnknownXidException;
-
-    public abstract void prepare(MessageStore store, Xid xid)
-            throws
-            InternalErrorException,
-            UnknownXidException;
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/JDBCDequeueRecord.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/JDBCDequeueRecord.java
deleted file mode 100644
index c18a6a7fcf..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/JDBCDequeueRecord.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.qpid.server.txn;
-
-import org.apache.log4j.Logger;
-import org.apache.qpid.server.messageStore.StorableQueue;
-import org.apache.qpid.server.messageStore.StorableMessage;
-import org.apache.qpid.server.messageStore.MessageStore;
-import org.apache.qpid.server.messageStore.JDBCStore;
-import org.apache.qpid.server.exception.*;
-
-import javax.transaction.xa.Xid;
-
-/**
- * Created by Arnaud Simon
- * Date: 16-May-2007
- * Time: 14:50:34
- */
-public class JDBCDequeueRecord extends JDBCAbstractRecord
-{
-    //========================================================================
-    // Static Constants
-    //========================================================================
-    // The logger for this class
-    private static final Logger _log = Logger.getLogger(JDBCDequeueRecord.class);
-
-    //========================================================================
-    // Constructor
-    //========================================================================
-    public JDBCDequeueRecord( StorableMessage m, StorableQueue queue)
-    {
-      super(m, queue);
-    }
-
-    //========================================================================
-    // Interface TransactionRecord
-    //========================================================================
-
-    public void commit(MessageStore store, Xid xid)
-            throws
-            InternalErrorException,
-            QueueDoesntExistException,
-            InvalidXidException,
-            UnknownXidException,
-            MessageDoesntExistException
-    {
-        store.dequeue(xid, _message, _queue);
-    }
-
-    public void rollback(MessageStore store, Xid xid)
-            throws
-            InternalErrorException,
-            UnknownXidException
-    {
-        ((JDBCStore) store).rollbackDequeu(xid, _message, _queue);
-    }
-
-    public void prepare(MessageStore store, Xid xid)
-            throws
-            InternalErrorException,
-            UnknownXidException
-    {
-        ((JDBCStore) store).prepareDequeu(xid, _message, _queue);
-    }
-
-    public int getType()
-    {
-        return TYPE_DEQUEUE;
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/JDBCEnqueueRecord.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/JDBCEnqueueRecord.java
deleted file mode 100644
index 4a4a23153e..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/JDBCEnqueueRecord.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.qpid.server.txn;
-
-import org.apache.log4j.Logger;
-import org.apache.qpid.server.messageStore.StorableQueue;
-import org.apache.qpid.server.messageStore.StorableMessage;
-import org.apache.qpid.server.messageStore.MessageStore;
-import org.apache.qpid.server.messageStore.JDBCStore;
-import org.apache.qpid.server.exception.*;
-
-import javax.transaction.xa.Xid;
-
-/**
- * Created by Arnaud Simon
- * Date: 16-May-2007
- * Time: 14:50:20
- */
-public class JDBCEnqueueRecord extends  JDBCAbstractRecord
-{
-    //========================================================================
-    // Static Constants
-    //========================================================================
-    // The logger for this class
-    private static final Logger _log = Logger.getLogger(JDBCEnqueueRecord.class);
-
-    //========================================================================
-    // Constructor
-    //========================================================================
-    public JDBCEnqueueRecord(StorableMessage m, StorableQueue queue)
-    {
-        super(m, queue);
-    }
-
-    //========================================================================
-    // Interface TransactionRecord
-    //========================================================================
-
-    public void commit(MessageStore store, Xid xid)
-            throws
-            InternalErrorException,
-            QueueDoesntExistException,
-            InvalidXidException,
-            UnknownXidException,
-            MessageDoesntExistException
-    {
-        store.enqueue(xid, _message, _queue);
-    }
-
-    public void rollback(MessageStore store, Xid xid)
-            throws
-            InternalErrorException,
-            UnknownXidException
-    {
-        if (!_message.isEnqueued())
-        {
-            // try to delete the message
-            try
-            {
-                store.destroy(_message);
-            } catch (Exception e)
-            {
-                throw new InternalErrorException("Problem when destoying message ", e);
-            }
-        }
-    }
-
-    public void prepare(MessageStore store, Xid xid)
-            throws
-            InternalErrorException,
-            UnknownXidException
-    {
-        try
-        {
-            if (!_message.isEnqueued() && !_message.isStaged())
-            {
-                store.stage(_message);
-                store.appendContent(_message, _message.getData(), 0, _message.getData().length);
-            }
-        }
-        catch (Exception e)
-        {
-            throw new InternalErrorException("Problem when persisting message ", e);
-        }
-    }
-
-    public int getType()
-    {
-        return TYPE_ENQUEUE;
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/JDBCTransaction.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/JDBCTransaction.java
deleted file mode 100644
index cc35b50cc8..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/JDBCTransaction.java
+++ /dev/null
@@ -1,196 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.qpid.server.txn;
-
-import org.apache.log4j.Logger;
-import org.apache.qpid.server.messageStore.JDBCStore;
-
-import java.util.List;
-import java.util.LinkedList;
-
-/**
- * Created by Arnaud Simon
- * Date: 16-May-2007
- * Time: 14:09:35
- */
-public class JDBCTransaction implements Transaction
-{
-    //========================================================================
-    // Static Constants
-    //========================================================================
-    // The logger for this class
-    private static final Logger _log = Logger.getLogger(JDBCTransaction.class);
-    public static long _xidId = 0;
-    //========================================================================
-    // Instance Fields
-    //========================================================================
-    // the associated connection
-    private JDBCStore.MyConnection _connection;
-    // Indicates whether this transaction is prepared
-    private boolean _prepared = false;
-    // Indicates that this transaction has heuristically rolled back
-    private boolean _heurRollBack = false;
-    // The list of records associated with this tx
-    private List<TransactionRecord> _records = new LinkedList<TransactionRecord>();
-    // The date when this tx has been created.
-    private long _dateCreated;
-    // The timeout in seconds
-    private long _timeout;
-    // this instance xid id used as primary key
-    private long _thisxidId;
-
-    //=========================================================
-    // Constructors
-    //=========================================================
-
-    /**
-     * Create a transaction
-     *
-     */
-    public JDBCTransaction()
-    {
-        _dateCreated = System.currentTimeMillis();
-        _thisxidId = _xidId++;
-    }
-
-    //=========================================================
-    // Getter and Setter methods
-    //=========================================================
-
-    /**
-     * Notify that this tx has been prepared
-     */
-    public void prepare()
-    {
-        _prepared = true;
-    }
-
-    /**
-     * Specify whether this transaction is prepared
-     *
-     * @return true if this transaction is prepared, false otherwise
-     */
-    public boolean isPrepared()
-    {
-        return _prepared;
-    }
-
-     /**
-     * Notify that this tx has been heuristically rolled back
-     */
-    public void heurRollback()
-    {
-        _heurRollBack = true;
-    }
-
-    /**
-     * Specify whether this transaction has been heuristically rolled back
-     *
-     * @return true if this transaction has been heuristically rolled back , false otherwise
-     */
-    public boolean isHeurRollback()
-    {
-        return _heurRollBack;
-    }
-
-    /**
-     * Add an abstract record to this tx.
-     *
-     * @param record The record to be added
-     */
-    public void addRecord(TransactionRecord record)
-    {
-        _records.add(record);
-    }
-
-    /**
-     * Get the list of records associated with this tx.
-     *
-     * @return The list of records associated with this tx.
-     */
-    public List<TransactionRecord> getrecords()
-    {
-        return _records;
-    }
-
-    /**
-     * Set this tx timeout
-     *
-     * @param timeout This tx timeout in seconds
-     */
-    public void setTimeout(long timeout)
-    {
-        _timeout = timeout;
-    }
-
-    /**
-     * Get this tx timeout
-     *
-     * @return This tx timeout in seconds
-     */
-    public long getTimeout()
-    {
-        return _timeout;
-    }
-
-    /**
-     * Specify whether this tx has expired
-     *
-     * @return true if this tx has expired, false otherwise
-     */
-    public boolean hasExpired()
-    {
-        long currentDate = System.currentTimeMillis();
-        boolean result = currentDate - _dateCreated > _timeout * 1000;
-        if (_log.isDebugEnabled() && result)
-        {
-            _log.debug("transaction has expired");
-        }
-        return result;
-    }
-
-    /**
-     * Get the JDBC connection
-     * @return The JDBC connection
-     */
-    public JDBCStore.MyConnection getConnection()
-    {
-        return _connection;
-    }
-
-    /**
-     * Set the JDBC connection
-     *
-     * @param connection The new JDBC connection
-     */
-    public void setConnection(JDBCStore.MyConnection connection)
-    {
-        _connection = connection;
-    }
-
-    /**
-     * This tx xid id used as primary key
-     *
-     * @return this tx xid id 
-     */
-    public long getXidID()
-    {
-        return _thisxidId;
-    }
-
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/JDBCTransactionManager.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/JDBCTransactionManager.java
deleted file mode 100644
index 26ddbc881d..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/JDBCTransactionManager.java
+++ /dev/null
@@ -1,554 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.qpid.server.txn;
-
-import org.apache.log4j.Logger;
-import org.apache.qpid.server.messageStore.MessageStore;
-import org.apache.qpid.server.messageStore.JDBCStore;
-import org.apache.qpid.server.exception.*;
-import org.apache.commons.configuration.Configuration;
-
-import javax.transaction.xa.Xid;
-import java.util.HashMap;
-import java.util.Set;
-
-
-/**
- * Created by Arnaud Simon
- * Date: 16-May-2007
- * Time: 14:05:45
- */
-public class JDBCTransactionManager implements TransactionManager
-{
-    //========================================================================
-    // Static Constants
-    //========================================================================
-    // The logger for this class
-    private static final Logger _log = Logger.getLogger(JDBCTransactionManager.class);
-
-    private static final String ENVIRONMENT_TX_TIMEOUT = "environment-tx-timeout";
-
-    //========================================================================
-    // Instance Fields
-    //========================================================================
-    // The underlying jdbc message store
-    private JDBCStore _messagStore;
-
-    // A map of XID/x
-    private HashMap<Xid, Transaction> _xidMap;
-
-    // A map of in-doubt txs
-    private HashMap<Xid, Transaction> _indoubtXidMap;
-
-    // A default tx timeout in sec
-    private int _defaultTimeout;   // set to 10s if not specified in the config
-
-    //===================================
-    //=== Configuartion
-    //===================================
-
-    /**
-     * Configure this TM with the Message store implementation
-     *
-     * @param base         The base element identifier from which all configuration items are relative. For example, if the base
-     *                     element is "store", the all elements used by concrete classes will be "store.foo" etc.
-     * @param config       The apache commons configuration object
-     * @param messageStroe the message store associated with the TM
-     */
-    public void configure(MessageStore messageStroe, String base, Configuration config)
-    {
-        _messagStore = (JDBCStore) messageStroe;
-        if (config != null)
-        {
-            _defaultTimeout = config.getInt(base + "." + ENVIRONMENT_TX_TIMEOUT, 120);
-        } else
-        {
-            _defaultTimeout = 120;
-        }
-        _log.info("Using transaction timeout of " + _defaultTimeout + " s");
-        // get the list of in-doubt transactions
-        try
-        {
-            _indoubtXidMap = _messagStore.getAllInddoubt();
-            _xidMap = _indoubtXidMap;
-        } catch (Exception e)
-        {
-            _log.fatal("Cannot recover in-doubt transactions", e);
-        }
-    }
-
-    //===================================
-    //=== TransactionManager interface
-    //===================================
-
-    /**
-     * Begin a transaction branch identified by Xid
-     *
-     * @param xid The xid of the branch to begin
-     * @return <ul>
-     *         <li>  <code>XAFlag.ok</code>: Normal execution.
-     *         </ul>
-     * @throws InternalErrorException In case of internal problem
-     * @throws InvalidXidException    The Xid is invalid
-     */
-    public synchronized XAFlag begin(Xid xid)
-            throws
-            InternalErrorException,
-            InvalidXidException
-    {
-        if (xid == null)
-        {
-            throw new InvalidXidException(xid, "null xid");
-        }
-        if (_xidMap.containsKey(xid))
-        {
-            throw new InvalidXidException(xid, "Xid already exist");
-        }
-        Transaction tx = new JDBCTransaction();
-        tx.setTimeout(_defaultTimeout);
-        _xidMap.put(xid, tx);
-        return XAFlag.ok;
-    }
-
-    /**
-     * Prepare the transaction branch identified by Xid
-     *
-     * @param xid The xid of the branch to prepare
-     * @return <ul>
-     *         <li> <code>XAFlag.ok</code>: Normal execution.
-     *         <li> <code>XAFlag.rdonly</code>: The transaction branch was read-only and has been committed.
-     *         <li> <code>XAFlag.rbrollback</code>: The transaction branch was marked rollback-only for an unspecied reason.
-     *         <li> <code>XAFlag.rbtimeout</code>: The work represented by this transaction branch took too long.
-     *         </ul>
-     * @throws InternalErrorException  In case of internal problem
-     * @throws CommandInvalidException Prepare has been call in an improper context
-     * @throws UnknownXidException     The Xid is unknown
-     */
-    public synchronized XAFlag prepare(Xid xid)
-            throws
-            InternalErrorException,
-            CommandInvalidException,
-            UnknownXidException
-    {
-        // get the transaction
-        JDBCTransaction tx = getTransaction(xid);
-        XAFlag result = XAFlag.ok;
-        if (tx.isHeurRollback())
-        {
-            result = XAFlag.rdonly;
-        } else if (tx.hasExpired())
-        {
-            result = XAFlag.rbtimeout;
-            // rollback this tx branch
-            rollback(xid);
-        } else
-        {
-            if (tx.isPrepared())
-            {
-                throw new CommandInvalidException("TransactionImpl is already prepared");
-            }
-            if (tx.getrecords().size() == 0)
-            {
-                // the tx was read only (no work has been done)
-                _xidMap.remove(xid);
-                result = XAFlag.rdonly;
-            } else
-            {
-                try
-                {
-                    JDBCStore.MyConnection con = _messagStore.getConnection();
-                    tx.setConnection(con);
-                    // save the xid
-                    _messagStore.saveXID(con, tx, xid);
-                    for (TransactionRecord record : tx.getrecords())
-                    {
-                        if (record instanceof JDBCAbstractRecord)
-                        {
-                            ((JDBCAbstractRecord) record).prepare(_messagStore, xid);
-                            _messagStore.saveRecord(con, tx, (JDBCAbstractRecord) record);
-                        } else
-                        {
-                            record.prepare(_messagStore);
-                        }
-                    }
-                    _messagStore.commitConnection(con);
-                    tx.setConnection(null);
-                } catch (Exception e)
-                {
-                    _log.error("Cannot prepare tx: " + xid);
-                    throw new InternalErrorException("Cannot prepare tx: " + xid, e);
-                }
-                tx.prepare();
-            }
-        }
-        return result;
-    }
-
-    /**
-     * Rollback the transaction branch identified by Xid
-     *
-     * @param xid The xid of the branch to rollback
-     * @return <ul>
-     *         <li> <code>XAFlag.ok</code>: Normal execution,
-     *         <li> <code>NOT SUPPORTED XAFlag.heurhaz</code>: Due to some failure, the work done on behalf of the specified transaction branch may have been heuristically completed.
-     *         <li> <code>NOT SUPPORTED XAFlag.heurcom</code>: Due to a heuristic decision, the work done on behalf of the speci?ed transaction branch was committed.
-     *         <li> <code>XAFlag.heurrb</code>: Due to a heuristic decision, the work done on behalf of the speci?ed transaction branch was rolled back.
-     *         <li> <code>NOT SUPPORTED XAFlag.heurmix</code>: Due to a heuristic decision, the work done on behalf of the speci?ed transaction branch was partially committed and partially rolled back.
-     *         <li> <code>NOT SUPPORTED XAFlag.rbrollback</code>: The broker marked the transaction branch rollback-only for an unspeci?ed reason.
-     *         <li> <code>XAFlag.rbtimeout</code>: The work represented by this transaction branch took too long.
-     *         </ul>
-     * @throws InternalErrorException  In case of internal problem
-     * @throws CommandInvalidException Rollback has been call in an improper context
-     * @throws UnknownXidException     The Xid is unknown
-     */
-    public synchronized XAFlag rollback(Xid xid)
-            throws
-            InternalErrorException,
-            CommandInvalidException,
-            UnknownXidException
-    {
-        // get the transaction
-        JDBCTransaction tx = getTransaction(xid);
-        XAFlag flag = XAFlag.ok;
-        if (tx.isHeurRollback())
-        {
-            flag = XAFlag.heurrb;
-        } else
-        {
-            try
-            {
-                JDBCStore.MyConnection con = _messagStore.getConnection();
-                tx.setConnection(con);
-                for (TransactionRecord record : tx.getrecords())
-                {
-                    if (record instanceof JDBCAbstractRecord)
-                    {
-                        ((JDBCAbstractRecord) record).rollback(_messagStore, xid);
-                    } else
-                    {
-                        record.rollback(_messagStore);
-                    }
-                }
-                if (tx.isPrepared())
-                {
-                    _messagStore.deleteRecords(con, tx);
-                    _messagStore.deleteXID(con, tx);
-                    _messagStore.commitConnection(con);
-                }
-                _messagStore.commitConnection(con);
-                tx.setConnection(null);
-            }
-            catch (Exception e)
-            {
-                // this should not happen
-                _log.error("Error when rolling back distributed transaction: " + xid);
-                throw new InternalErrorException("Error when rolling back distributed transaction: " + xid, e);
-            }
-            removeTransaction(xid);
-        }
-        if (tx.hasExpired())
-        {
-            flag = XAFlag.rbtimeout;
-        }
-        return flag;
-    }
-
-    /**
-     * Commit the transaction branch identified by Xid
-     *
-     * @param xid The xid of the branch to commit
-     * @return <ul>
-     *         <li> <code>XAFlag.ok</code>: Normal execution,
-     *         <li> <code>NOT SUPPORTED XAFlag.heurhaz</code>: Due to some failure, the work done on behalf of the specified transaction branch may have been heuristically completed.
-     *         <li> <code>NOT SUPPORTED XAFlag.heurcom</code>: Due to a heuristic decision, the work done on behalf of the specied transaction branch was committed.
-     *         <li> <code>XAFlag.heurrb</code>: Due to a heuristic decision, the work done on behalf of the speci?ed transaction branch was rolled back.
-     *         <li> <code>XAFlag.heurmix</code>: Due to a heuristic decision, the work done on behalf of the speci?ed transaction branch was partially committed and partially rolled back.
-     *         </ul>
-     * @throws InternalErrorException  In case of internal problem
-     * @throws CommandInvalidException Commit has been call in an improper context
-     * @throws UnknownXidException     The Xid is unknown
-     * @throws org.apache.qpid.server.exception.NotPreparedException
-     *                                 The branch was not prepared prior to commit
-     */
-    public synchronized XAFlag commit(Xid xid)
-            throws
-            InternalErrorException,
-            CommandInvalidException,
-            UnknownXidException,
-            NotPreparedException
-    {
-        // get the transaction
-        JDBCTransaction tx = getTransaction(xid);
-        XAFlag flag = XAFlag.ok;
-        if (tx.isHeurRollback())
-        {
-            flag = XAFlag.heurrb;
-        } else if (tx.hasExpired())
-        {
-            flag = XAFlag.rbtimeout;
-            // rollback this tx branch
-            rollback(xid);
-        } else
-        {
-            if (!tx.isPrepared())
-            {
-                throw new NotPreparedException("TransactionImpl is not prepared");
-            }
-            try
-            {
-                JDBCStore.MyConnection con = _messagStore.getConnection();
-                tx.setConnection(con);
-                for (TransactionRecord record : tx.getrecords())
-                {
-                    try
-                    {
-                        record.commit(_messagStore, xid);
-                    } catch (InvalidXidException e)
-                    {
-                        throw new UnknownXidException(xid, e);
-                    } catch (Exception e)
-                    {
-                        // this should not happen as the queue and the message must exist
-                        _log.error("Error when committing distributed transaction heurmix mode returned: " + xid);
-                        flag = XAFlag.heurmix;
-                    }
-                }
-                _messagStore.deleteRecords(con, tx);
-                _messagStore.deleteXID(con, tx);
-                _messagStore.commitConnection(con);
-                tx.setConnection(null);
-            } catch (Exception e)
-            {
-                // this should not happen
-                _log.error("Error when committing distributed transaction heurrb mode returned: " + xid);
-                throw new InternalErrorException("Error when committing distributed transaction: " + xid, e);
-            }
-            removeTransaction(xid);
-        }
-        return flag;
-    }
-
-    /**
-     * One phase commit the transaction branch identified by Xid
-     *
-     * @param xid The xid of the branch to one phase commit
-     * @return <ul>
-     *         <li> <code>XAFlag.ok</code>: Normal execution,
-     *         <li> <code>NOT SUPPORTED XAFlag.heurhaz</code>: Due to some failure, the work done on behalf of the specified transaction branch may have been heuristically completed.
-     *         <li> <code>NOT SUPPORTED XAFlag.heurcom</code>: Due to a heuristic decision, the work done on behalf of the speci?ed transaction branch was committed.
-     *         <li> <code>XAFlag.heurrb</code>: Due to a heuristic decision, the work done on behalf of the speci?ed transaction branch was rolled back.
-     *         <li> <code>NOT SUPPORTED XAFlag.heurmix</code>: Due to a heuristic decision, the work done on behalf of the speci?ed transaction branch was partially committed and partially rolled back.
-     *         <li> <code>NOT SUPPORTED XAFlag.rbrollback</code>: The broker marked the transaction branch rollback-only for an unspeci?ed reason.
-     *         <li> <code>XAFlag.rbtimeout</code>: The work represented by this transaction branch took too long.
-     *         </ul>
-     * @throws InternalErrorException  In case of internal problem
-     * @throws CommandInvalidException Commit has been call in an improper context
-     * @throws UnknownXidException     The Xid is unknown
-     */
-    public synchronized XAFlag commit_one_phase(Xid xid)
-            throws
-            InternalErrorException,
-            CommandInvalidException,
-            UnknownXidException
-    {
-        XAFlag flag = XAFlag.ok;
-        JDBCTransaction tx = getTransaction(xid);
-        if (tx.isHeurRollback())
-        {
-            flag = XAFlag.heurrb;
-        } else if (tx.hasExpired())
-        {
-            flag = XAFlag.rbtimeout;
-            // rollback this tx branch
-            rollback(xid);
-        } else
-        {
-            try
-            {
-                // we do not need to prepare the tx
-                tx.prepare();
-                JDBCStore.MyConnection con = _messagStore.getConnection();
-                tx.setConnection(con);
-                for (TransactionRecord record : tx.getrecords())
-                {
-                    try
-                    {
-                        record.commit(_messagStore, xid);
-                    } catch (InvalidXidException e)
-                    {
-                        throw new UnknownXidException(xid, e);
-                    } catch (Exception e)
-                    {
-                        // this should not happen as the queue and the message must exist
-                        _log.error("Error when committing transaction heurmix mode returned: " + xid);
-                        flag = XAFlag.heurmix;
-                    }
-                }
-                _messagStore.commitConnection(con);
-                tx.setConnection(null);
-            } catch (Exception e)
-            {
-                e.printStackTrace();
-                throw new InternalErrorException("cannot commit transaxtion with xid " + xid + " " + e, e);
-            }
-            finally
-            {
-                removeTransaction(xid);
-            }
-        }
-        return flag;
-    }
-
-    /**
-     * Forget about the transaction branch identified by Xid
-     *
-     * @param xid The xid of the branch to forget
-     * @throws InternalErrorException  In case of internal problem
-     * @throws CommandInvalidException Forget has been call in an improper context
-     * @throws UnknownXidException     The Xid is unknown
-     */
-    public void forget(Xid xid)
-            throws
-            InternalErrorException,
-            CommandInvalidException,
-            UnknownXidException
-    {
-        synchronized (xid)
-        {
-            getTransaction(xid);
-            removeTransaction(xid);
-        }
-    }
-
-    /**
-     * Set the transaction branch timeout value in seconds
-     *
-     * @param xid     The xid of the branch to set timeout
-     * @param timeout Timeout value in seconds
-     * @throws InternalErrorException In case of internal problem
-     * @throws UnknownXidException    The Xid is unknown
-     */
-    public void setTimeout(Xid xid, long timeout)
-            throws
-            InternalErrorException,
-            UnknownXidException
-    {
-        JDBCTransaction tx = getTransaction(xid);
-        tx.setTimeout(timeout);
-    }
-
-    /**
-     * Get the transaction branch timeout
-     *
-     * @param xid The xid of the branch to get the timeout from
-     * @return The timeout associated with the branch identified with xid
-     * @throws InternalErrorException In case of internal problem
-     * @throws UnknownXidException    The Xid is unknown
-     */
-    public long getTimeout(Xid xid)
-            throws
-            InternalErrorException,
-            UnknownXidException
-    {
-        JDBCTransaction tx = getTransaction(xid);
-        return tx.getTimeout();
-    }
-
-    /**
-     * Get a set of Xids the RM has prepared or heuristically completed
-     *
-     * @param startscan Indicates that recovery scan should start
-     * @param endscan   Indicates that the recovery scan should end after returning the Xids
-     * @return Set of Xids the RM has prepared or  heuristically completed
-     * @throws InternalErrorException  In case of internal problem
-     * @throws CommandInvalidException Recover has been call in an improper context
-     */
-    public Set<Xid> recover(boolean startscan, boolean endscan)
-            throws
-            InternalErrorException,
-            CommandInvalidException
-    {
-        return _indoubtXidMap.keySet();
-    }
-
-    /**
-     * An error happened (for example the channel has been abruptly closed)
-     * with this Xid, TM must make a heuristical decision.
-     *
-     * @param xid The Xid of the transaction branch to be heuristically completed
-     * @throws UnknownXidException    The Xid is unknown
-     * @throws InternalErrorException In case of internal problem
-     */
-    public void HeuristicOutcome(Xid xid)
-            throws
-            UnknownXidException,
-            InternalErrorException
-    {
-        synchronized (xid)
-        {
-            JDBCTransaction tx = getTransaction(xid);
-            if (!tx.isPrepared())
-            {
-                // heuristically rollback this tx
-                for (TransactionRecord record : tx.getrecords())
-                {
-                    record.rollback(_messagStore);
-                }
-                tx.heurRollback();
-            }
-            // add this branch in the list of indoubt tx
-            _indoubtXidMap.put(xid, tx);
-        }
-    }
-
-
-    public JDBCTransaction getTransaction(Xid xid)
-            throws
-            UnknownXidException
-    {
-        Transaction tx = _xidMap.get(xid);
-        if (tx == null)
-        {
-            throw new UnknownXidException(xid, null);
-        }
-        return (JDBCTransaction) tx;
-    }
-
-    //==========================================================================
-    //== Methods for Message Store
-    //==========================================================================
-
-    /**
-     * Get the default tx timeout in seconds
-     *
-     * @return the default tx timeout in seconds
-     */
-    public int getDefaultTimeout()
-    {
-        return _defaultTimeout;
-    }
-    //==========================================================================
-    //== Private Methods
-    //==========================================================================
-
-    private void removeTransaction(Xid xid)
-    {
-        _xidMap.remove(xid);
-        _indoubtXidMap.remove(xid);
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/LocalTransactionalContext.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/LocalTransactionalContext.java
deleted file mode 100644
index 4e684098d0..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/LocalTransactionalContext.java
+++ /dev/null
@@ -1,262 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.txn;
-
-import org.apache.log4j.Logger;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.server.RequiredDeliveryException;
-import org.apache.qpid.server.ack.TxAck;
-import org.apache.qpid.server.ack.UnacknowledgedMessageMap;
-import org.apache.qpid.server.protocol.AMQProtocolSession;
-import org.apache.qpid.server.queue.AMQMessage;
-import org.apache.qpid.server.queue.AMQQueue;
-import org.apache.qpid.server.queue.NoConsumersException;
-import org.apache.qpid.server.store.MessageStore;
-import org.apache.qpid.server.store.StoreContext;
-
-import java.util.LinkedList;
-import java.util.List;
-
-/** A transactional context that only supports local transactions. */
-public class LocalTransactionalContext implements TransactionalContext
-{
-    private static final Logger _log = Logger.getLogger(LocalTransactionalContext.class);
-
-    private final TxnBuffer _txnBuffer = new TxnBuffer();
-
-    private final List<DeliveryDetails> _postCommitDeliveryList = new LinkedList<DeliveryDetails>();
-
-    /**
-     * We keep hold of the ack operation so that we can consolidate acks, i.e. multiple acks within a txn are
-     * consolidated into a single operation
-     */
-    private TxAck _ackOp;
-
-    private List<RequiredDeliveryException> _returnMessages;
-
-    private final MessageStore _messageStore;
-
-    private final StoreContext _storeContext;
-
-    private boolean _inTran = false;
-
-    /** Are there messages to deliver. NOT Has the message been delivered */
-    private boolean _messageDelivered = false;
-
-    private static class DeliveryDetails
-    {
-        public AMQMessage message;
-        public AMQQueue queue;
-        private boolean deliverFirst;
-
-        public DeliveryDetails(AMQMessage message, AMQQueue queue, boolean deliverFirst)
-        {
-            this.message = message;
-            this.queue = queue;
-            this.deliverFirst = deliverFirst;
-        }
-    }
-
-    public LocalTransactionalContext(MessageStore messageStore, StoreContext storeContext,
-        List<RequiredDeliveryException> returnMessages)
-    {
-        _messageStore = messageStore;
-        _storeContext = storeContext;
-        _returnMessages = returnMessages;
-        // _txnBuffer.enlist(new StoreMessageOperation(messageStore));
-    }
-
-    public StoreContext getStoreContext()
-    {
-        return _storeContext;
-    }
-
-    public void rollback() throws AMQException
-    {
-        _txnBuffer.rollback(_storeContext);
-        // Hack to deal with uncommitted non-transactional writes
-        if (_messageStore.inTran(_storeContext))
-        {
-            _messageStore.abortTran(_storeContext);
-            _inTran = false;
-        }
-
-        _postCommitDeliveryList.clear();
-    }
-
-    public void deliver(AMQMessage message, AMQQueue queue, boolean deliverFirst) throws AMQException
-    {
-        // A publication will result in the enlisting of several
-        // TxnOps. The first is an op that will store the message.
-        // Following that (and ordering is important), an op will
-        // be added for every queue onto which the message is
-        // enqueued. Finally a cleanup op will be added to decrement
-        // the reference associated with the routing.
-        // message.incrementReference();
-        _postCommitDeliveryList.add(new DeliveryDetails(message, queue, deliverFirst));
-        _messageDelivered = true;
-        _txnBuffer.enlist(new CleanupMessageOperation(message, _returnMessages));
-        /*_txnBuffer.enlist(new DeliverMessageOperation(message, queue));
-        if (_log.isDebugEnabled())
-        {
-            _log.debug("Incrementing ref count on message and enlisting cleanup operation - id " +
-                       message.getMessageId());
-        }
-        message.incrementReference();
-        _messageDelivered = true;
-
-         */
-    }
-
-    private void checkAck(long deliveryTag, UnacknowledgedMessageMap unacknowledgedMessageMap) throws AMQException
-    {
-        if (!unacknowledgedMessageMap.contains(deliveryTag))
-        {
-            throw new AMQException(null, "Ack with delivery tag " + deliveryTag + " not known for channel", null);
-        }
-    }
-
-    public void acknowledgeMessage(long deliveryTag, long lastDeliveryTag, boolean multiple,
-        UnacknowledgedMessageMap unacknowledgedMessageMap) throws AMQException
-    {
-        // check that the tag exists to give early failure
-        if (!multiple || (deliveryTag > 0))
-        {
-            checkAck(deliveryTag, unacknowledgedMessageMap);
-        }
-        // we use a single txn op for all acks and update this op
-        // as new acks come in. If this is the first ack in the txn
-        // we will need to create and enlist the op.
-        if (_ackOp == null)
-        {
-            beginTranIfNecessary();
-            _ackOp = new TxAck(unacknowledgedMessageMap);
-            _txnBuffer.enlist(_ackOp);
-        }
-        // update the op to include this ack request
-        if (multiple && (deliveryTag == 0))
-        {
-            // if have signalled to ack all, that refers only
-            // to all at this time
-            _ackOp.update(lastDeliveryTag, multiple);
-        }
-        else
-        {
-            _ackOp.update(deliveryTag, multiple);
-        }
-    }
-
-    public void messageFullyReceived(boolean persistent) throws AMQException
-    {
-        // Not required in this transactional context
-    }
-
-    public void messageProcessed(AMQProtocolSession protocolSession) throws AMQException
-    {
-        // Not required in this transactional context
-    }
-
-    public void beginTranIfNecessary() throws AMQException
-    {
-        if (!_inTran)
-        {
-            if (_log.isDebugEnabled())
-            {
-                _log.debug("Starting transaction on message store: " + this);
-            }
-
-            _messageStore.beginTran(_storeContext);
-            _inTran = true;
-        }
-    }
-
-    public void commit() throws AMQException
-    {
-        if (_log.isDebugEnabled())
-        {
-            _log.debug("Committing transactional context: " + this);
-        }
-
-        if (_ackOp != null)
-        {
-
-            _messageDelivered = true;
-            _ackOp.consolidate();
-            // already enlisted, after commit will reset regardless of outcome
-            _ackOp = null;
-        }
-
-        if (_messageDelivered && _inTran)
-        {
-            _txnBuffer.enlist(new StoreMessageOperation(_messageStore));
-        }
-        // fixme fail commit here ... QPID-440
-        try
-        {
-            _txnBuffer.commit(_storeContext);
-        }
-        finally
-        {
-            _messageDelivered = false;
-            _inTran = _messageStore.inTran(_storeContext);
-        }
-
-        try
-        {
-            postCommitDelivery(_returnMessages);
-        }
-        catch (AMQException e)
-        {
-            // OK so what do we do now...?
-            _log.error("Failed to deliver messages following txn commit: " + e, e);
-        }
-    }
-
-    private void postCommitDelivery(List<RequiredDeliveryException> returnMessages) throws AMQException
-    {
-        if (_log.isDebugEnabled())
-        {
-            _log.debug("Performing post commit delivery");
-        }
-
-        try
-        {
-            for (DeliveryDetails dd : _postCommitDeliveryList)
-            {
-                dd.queue.process(_storeContext, dd.message, dd.deliverFirst);
-
-                try
-                {
-                    dd.message.checkDeliveredToConsumer();
-                }
-                catch (NoConsumersException nce)
-                {
-                    returnMessages.add(nce);
-                }
-            }
-        }
-        finally
-        {
-            _postCommitDeliveryList.clear();
-        }
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/MemoryDequeueRecord.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/MemoryDequeueRecord.java
deleted file mode 100644
index abbd2ad923..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/MemoryDequeueRecord.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.qpid.server.txn;
-
-import org.apache.qpid.server.messageStore.MessageStore;
-import org.apache.qpid.server.messageStore.StorableMessage;
-import org.apache.qpid.server.messageStore.StorableQueue;
-import org.apache.qpid.server.exception.*;
-import org.apache.log4j.Logger;
-
-import javax.transaction.xa.Xid;
-
-/**
- * Created by Arnaud Simon
- * Date: 03-May-2007
- * Time: 13:59:47
- */
-public class MemoryDequeueRecord implements TransactionRecord
-{
-    //========================================================================
-    // Static Constants
-    //========================================================================
-    // The logger for this class
-    private static final Logger _log = Logger.getLogger(MemoryDequeueRecord.class);
-    // the queue
-    StorableQueue _queue;
-    // the message
-    StorableMessage _message;
-
-    //========================================================================
-    // Constructor
-    //========================================================================
-    public MemoryDequeueRecord( StorableMessage m, StorableQueue queue)
-    {
-        _queue = queue;
-        _message = m;
-    }
-
-    //========================================================================
-    // Interface TransactionRecord
-    //========================================================================
-
-    public void commit(MessageStore store, Xid xid)
-            throws
-            InternalErrorException,
-            QueueDoesntExistException,
-            InvalidXidException,
-            UnknownXidException,
-            MessageDoesntExistException
-    {
-        store.dequeue(null, _message, _queue);
-    }
-
-    public void rollback(MessageStore store)
-            throws
-            InternalErrorException
-    {
-        // do nothing
-    }
-
-    public void prepare(MessageStore store)
-            throws
-            InternalErrorException
-    {
-        // do nothing
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/MemoryEnqueueRecord.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/MemoryEnqueueRecord.java
deleted file mode 100644
index 159a5a471c..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/MemoryEnqueueRecord.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.qpid.server.txn;
-
-import org.apache.qpid.server.messageStore.MessageStore;
-import org.apache.qpid.server.messageStore.StorableMessage;
-import org.apache.qpid.server.messageStore.StorableQueue;
-import org.apache.qpid.server.exception.*;
-import org.apache.log4j.Logger;
-
-import javax.transaction.xa.Xid;
-
-/**
- * Created by Arnaud Simon
- * Date: 03-May-2007
- * Time: 14:00:04
- */
-public class MemoryEnqueueRecord implements TransactionRecord
-{
-    //========================================================================
-    // Static Constants
-    //========================================================================
-    // The logger for this class
-    private static final Logger _log = Logger.getLogger(MemoryDequeueRecord.class);
-
-    // the queue
-    StorableQueue _queue;
-    // the message
-    StorableMessage _message;
-
-    //========================================================================
-    // Constructor
-    //========================================================================
-    public MemoryEnqueueRecord(StorableMessage m, StorableQueue queue)
-    {
-        _queue = queue;
-        _message = m;
-    }
-    //========================================================================
-    // Interface TransactionRecord
-    //========================================================================
-
-    public void commit(MessageStore store, Xid xid)
-            throws
-            InternalErrorException,
-            QueueDoesntExistException,
-            InvalidXidException,
-            UnknownXidException,
-            MessageDoesntExistException
-    {
-        store.enqueue(null, _message, _queue);
-    }
-
-    public void rollback(MessageStore store)
-            throws
-            InternalErrorException
-    {
-        // do nothing
-    }
-
-    public void prepare(MessageStore store)
-            throws
-            InternalErrorException
-    {
-        // do nothing 
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/MemoryTransaction.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/MemoryTransaction.java
deleted file mode 100644
index 4cd52b1a72..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/MemoryTransaction.java
+++ /dev/null
@@ -1,158 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.qpid.server.txn;
-
-import org.apache.log4j.Logger;
-
-import java.util.List;
-import java.util.LinkedList;
-
-/**
- * Created by Arnaud Simon
- * Date: 03-May-2007
- * Time: 14:30:41
- */
-public class MemoryTransaction implements Transaction
-{
-    //========================================================================
-      // Static Constants
-      //========================================================================
-      // The logger for this class
-      private static final Logger _log = Logger.getLogger(MemoryTransaction.class);
-
-      //========================================================================
-      // Instance Fields
-      //========================================================================
-      // Indicates whether this transaction is prepared
-      private boolean _prepared = false;
-      // Indicates that this transaction has heuristically rolled back
-      private boolean _heurRollBack = false;
-      // The list of Abstract records associated with this tx
-      private List<TransactionRecord> _records = new LinkedList<TransactionRecord>();
-      // The date when this tx has been created.
-      private long _dateCreated;
-      // The timeout in seconds
-      private long _timeout;
-
-      //=========================================================
-      // Constructors
-      //=========================================================
-      /**
-       * Create a transaction that wraps a BDB tx and set the creation date.
-       *
-       */
-      public MemoryTransaction()
-      {
-          _dateCreated = System.currentTimeMillis();
-      }
-
-      //=========================================================
-      // Getter and Setter methods
-      //=========================================================
-      /**
-       * Notify that this tx has been prepared
-       */
-      public void prepare()
-      {
-          _prepared = true;
-      }
-
-      /**
-       * Specify whether this transaction is prepared
-       *
-       * @return true if this transaction is prepared, false otherwise
-       */
-      public boolean isPrepared()
-      {
-          return _prepared;
-      }
-
-       /**
-       * Notify that this tx has been heuristically rolled back
-       */
-      public void heurRollback()
-      {
-          _heurRollBack = true;
-      }
-
-      /**
-       * Specify whether this transaction has been heuristically rolled back
-       *
-       * @return true if this transaction has been heuristically rolled back , false otherwise
-       */
-      public boolean isHeurRollback()
-      {
-          return _heurRollBack;
-      }
-
-      /**
-       * Add an abstract record to this tx.
-       *
-       * @param record The record to be added
-       */
-      public void addRecord(TransactionRecord record)
-      {
-          _records.add(record);
-      }
-
-      /**
-       * Get the list of records associated with this tx.
-       *
-       * @return The list of records associated with this tx.
-       */
-      public List<TransactionRecord> getrecords()
-      {
-          return _records;
-      }
-
-      /**
-       * Set this tx timeout
-       *
-       * @param timeout This tx timeout in seconds
-       */
-      public void setTimeout(long timeout)
-      {
-          _timeout = timeout;
-      }
-
-      /**
-       * Get this tx timeout
-       *
-       * @return This tx timeout in seconds
-       */
-      public long getTimeout()
-      {
-          return _timeout;
-      }
-
-      /**
-       * Specify whether this tx has expired
-       *
-       * @return true if this tx has expired, false otherwise
-       */
-      public boolean hasExpired()
-      {
-          long currentDate = System.currentTimeMillis();
-          boolean result = currentDate - _dateCreated > _timeout * 1000;
-          if (_log.isDebugEnabled())
-          {
-              _log.debug("transaction has expired");
-          }
-          return result;
-      }
-  }
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/MemoryTransactionManager.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/MemoryTransactionManager.java
deleted file mode 100644
index 8b0d986d4b..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/MemoryTransactionManager.java
+++ /dev/null
@@ -1,321 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.qpid.server.txn;
-
-import java.util.HashMap;
-import java.util.Set;
-import javax.transaction.xa.Xid;
-import org.apache.commons.configuration.Configuration;
-import org.apache.log4j.Logger;
-import org.apache.qpid.server.exception.*;
-import org.apache.qpid.server.messageStore.MessageStore;
-
-/**
- * Created by Arnaud Simon
- * Date: 02-May-2007
- * Time: 08:41:33
- */
-public class MemoryTransactionManager implements TransactionManager
-{
-    // ========================================================================
-    // Static Constants
-    // ========================================================================
-    // The logger for this class
-    private static final Logger _log = Logger.getLogger(MemoryTransactionManager.class);
-
-    private static final String ENVIRONMENT_TX_TIMEOUT = "environment-tx-timeout";
-
-    // ========================================================================
-    // Instance Fields
-    // ========================================================================
-    // The underlying BDB message store
-    private MessageStore _messagStore;
-    // A map of XID/BDBtx
-    private HashMap<Xid, Transaction> _xidMap;
-    // A map of in-doubt txs
-    private HashMap<Xid, MemoryTransaction> _indoubtXidMap;
-
-    // A default tx timeout in sec
-    private int _defaultTimeout; // set to 10s if not specified in the config
-
-    // ========================================================================
-    // Interface TransactionManager
-    // ========================================================================
-    public void configure(MessageStore messageStroe, String base, Configuration config)
-    {
-        _messagStore = messageStroe;
-        if (config != null)
-        {
-            _defaultTimeout = config.getInt(base + "." + ENVIRONMENT_TX_TIMEOUT, 10);
-        }
-        else
-        {
-            _defaultTimeout = 10;
-        }
-
-        _log.info("Using transaction timeout of " + _defaultTimeout + " s");
-        _xidMap = new HashMap<Xid, Transaction>();
-        _indoubtXidMap = new HashMap<Xid, MemoryTransaction>();
-    }
-
-    public XAFlag begin(Xid xid) throws InternalErrorException, InvalidXidException
-    {
-        synchronized (xid)
-        {
-            if (xid == null)
-            {
-                throw new InvalidXidException(xid, "null xid");
-            }
-
-            if (_xidMap.containsKey(xid))
-            {
-                throw new InvalidXidException(xid, "Xid already exist");
-            }
-
-            MemoryTransaction tx = new MemoryTransaction();
-            tx.setTimeout(_defaultTimeout);
-            _xidMap.put(xid, tx);
-
-            return XAFlag.ok;
-        }
-    }
-
-    public XAFlag prepare(Xid xid) throws InternalErrorException, CommandInvalidException, UnknownXidException
-    {
-        synchronized (xid)
-        {
-            // get the transaction
-            MemoryTransaction tx = (MemoryTransaction) getTransaction(xid);
-            XAFlag result = XAFlag.ok;
-            if (tx.hasExpired())
-            {
-                result = XAFlag.rbtimeout;
-                // rollback this tx branch
-                rollback(xid);
-            }
-            else
-            {
-                if (tx.isPrepared())
-                {
-                    throw new CommandInvalidException("TransactionImpl is already prepared", null);
-                }
-
-                if (tx.getrecords().size() == 0)
-                {
-                    // the tx was read only (no work has been done)
-                    _xidMap.remove(xid);
-                    result = XAFlag.rdonly;
-                }
-                else
-                {
-                    // we need to persist the tx records
-                    tx.prepare();
-                }
-            }
-
-            return result;
-        }
-    }
-
-    public XAFlag rollback(Xid xid) throws InternalErrorException, CommandInvalidException, UnknownXidException
-    {
-        synchronized (xid)
-        {
-            // get the transaction
-            MemoryTransaction tx = (MemoryTransaction) getTransaction(xid);
-            XAFlag flag = XAFlag.ok;
-            if (tx.isHeurRollback())
-            {
-                flag = XAFlag.heurrb;
-            }
-            else
-            {
-                for (TransactionRecord record : tx.getrecords())
-                {
-                    record.rollback(_messagStore);
-                }
-
-                _xidMap.remove(xid);
-            }
-
-            if (tx.hasExpired())
-            {
-                flag = XAFlag.rbtimeout;
-            }
-
-            return flag;
-        }
-    }
-
-    public XAFlag commit(Xid xid)
-        throws InternalErrorException, CommandInvalidException, UnknownXidException, NotPreparedException
-    {
-        synchronized (xid)
-        {
-            // get the transaction
-            MemoryTransaction tx = (MemoryTransaction) getTransaction(xid);
-            XAFlag flag = XAFlag.ok;
-            if (tx.isHeurRollback())
-            {
-                flag = XAFlag.heurrb;
-            }
-            else if (tx.hasExpired())
-            {
-                flag = XAFlag.rbtimeout;
-                // rollback this tx branch
-                rollback(xid);
-            }
-            else
-            {
-                if (!tx.isPrepared())
-                {
-                    throw new NotPreparedException("TransactionImpl is not prepared");
-                }
-
-                for (TransactionRecord record : tx.getrecords())
-                {
-                    try
-                    {
-                        record.commit(_messagStore, xid);
-                    }
-                    catch (InvalidXidException e)
-                    {
-                        throw new UnknownXidException(xid, e);
-                    }
-                    catch (Exception e)
-                    {
-                        // this should not happen as the queue and the message must exist
-                        _log.error("Error when committing distributed transaction heurmix mode returned: " + xid);
-                        flag = XAFlag.heurmix;
-                    }
-                }
-
-                _xidMap.remove(xid);
-            }
-
-            return flag;
-        }
-    }
-
-    public XAFlag commit_one_phase(Xid xid) throws InternalErrorException, CommandInvalidException, UnknownXidException
-    {
-        synchronized (xid)
-        {
-            XAFlag flag = XAFlag.ok;
-            MemoryTransaction tx = (MemoryTransaction) getTransaction(xid);
-            if (tx.isHeurRollback())
-            {
-                flag = XAFlag.heurrb;
-            }
-            else if (tx.hasExpired())
-            {
-                flag = XAFlag.rbtimeout;
-                // rollback this tx branch
-                rollback(xid);
-            }
-            else
-            {
-                // we need to prepare the tx
-                tx.prepare();
-                try
-                {
-                    for (TransactionRecord record : tx.getrecords())
-                    {
-                        try
-                        {
-                            record.commit(_messagStore, xid);
-                        }
-                        catch (InvalidXidException e)
-                        {
-                            throw new UnknownXidException(xid, e);
-                        }
-                        catch (Exception e)
-                        {
-                            // this should not happen as the queue and the message must exist
-                            _log.error("Error when committing transaction heurmix mode returned: " + xid);
-                            flag = XAFlag.heurmix;
-                        }
-                    }
-                }
-                finally
-                {
-                    _xidMap.remove(xid);
-                }
-            }
-
-            return flag;
-        }
-    }
-
-    public void forget(Xid xid) throws InternalErrorException, CommandInvalidException, UnknownXidException
-    {
-        synchronized (xid)
-        {
-            _xidMap.remove(xid);
-        }
-    }
-
-    public void setTimeout(Xid xid, long timeout) throws InternalErrorException, UnknownXidException
-    {
-        Transaction tx = getTransaction(xid);
-        tx.setTimeout(timeout);
-    }
-
-    public long getTimeout(Xid xid) throws InternalErrorException, UnknownXidException
-    {
-        Transaction tx = getTransaction(xid);
-
-        return tx.getTimeout();
-    }
-
-    public Set<Xid> recover(boolean startscan, boolean endscan) throws InternalErrorException, CommandInvalidException
-    {
-        return _indoubtXidMap.keySet();
-    }
-
-    public void HeuristicOutcome(Xid xid) throws UnknownXidException, InternalErrorException
-    {
-        synchronized (xid)
-        {
-            MemoryTransaction tx = (MemoryTransaction) getTransaction(xid);
-            if (!tx.isPrepared())
-            {
-                // heuristically rollback this tx
-                for (TransactionRecord record : tx.getrecords())
-                {
-                    record.rollback(_messagStore);
-                }
-
-                tx.heurRollback();
-            }
-            // add this branch in the list of indoubt tx
-            _indoubtXidMap.put(xid, tx);
-        }
-    }
-
-    public Transaction getTransaction(Xid xid) throws UnknownXidException
-    {
-        Transaction tx = _xidMap.get(xid);
-        if (tx == null)
-        {
-            throw new UnknownXidException(xid, null);
-        }
-
-        return tx;
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/NonTransactionalContext.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/NonTransactionalContext.java
deleted file mode 100644
index 47c94114a3..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/NonTransactionalContext.java
+++ /dev/null
@@ -1,234 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.txn;
-
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Set;
-
-import org.apache.log4j.Logger;
-import org.apache.qpid.AMQException;
-import org.apache.qpid.server.AMQChannel;
-import org.apache.qpid.server.RequiredDeliveryException;
-import org.apache.qpid.server.ack.UnacknowledgedMessage;
-import org.apache.qpid.server.ack.UnacknowledgedMessageMap;
-import org.apache.qpid.server.protocol.AMQProtocolSession;
-import org.apache.qpid.server.queue.AMQMessage;
-import org.apache.qpid.server.queue.AMQQueue;
-import org.apache.qpid.server.queue.NoConsumersException;
-import org.apache.qpid.server.store.MessageStore;
-import org.apache.qpid.server.store.StoreContext;
-
-/** @author Apache Software Foundation */
-public class NonTransactionalContext implements TransactionalContext
-{
-    private static final Logger _log = Logger.getLogger(NonTransactionalContext.class);
-
-    /** Channel is useful for logging */
-    private final AMQChannel _channel;
-
-    /** Where to put undeliverable messages */
-    private final List<RequiredDeliveryException> _returnMessages;
-
-    private Set<Long> _browsedAcks;
-
-    private final MessageStore _messageStore;
-
-    private StoreContext _storeContext;
-
-    /** Whether we are in a transaction */
-    private boolean _inTran;
-
-    public NonTransactionalContext(MessageStore messageStore, StoreContext storeContext, AMQChannel channel,
-                                   List<RequiredDeliveryException> returnMessages, Set<Long> browsedAcks)
-    {
-        _channel = channel;
-        _storeContext = storeContext;
-        _returnMessages = returnMessages;
-        _messageStore = messageStore;
-        _browsedAcks = browsedAcks;
-    }
-
-
-    public StoreContext getStoreContext()
-    {
-        return _storeContext;
-    }
-
-    public void beginTranIfNecessary() throws AMQException
-    {
-        if (!_inTran)
-        {
-            _messageStore.beginTran(_storeContext);
-            _inTran = true;
-        }
-    }
-
-    public void commit() throws AMQException
-    {
-        // Does not apply to this context
-    }
-
-    public void rollback() throws AMQException
-    {
-        // Does not apply to this context
-    }
-
-    public void deliver(AMQMessage message, AMQQueue queue, boolean deliverFirst) throws AMQException
-    {
-        try
-        {
-            //DTX removed  - deliverFirst is to do with the position on the Queue not enqueuing!!
-            // This should be done in routingComplete
-//            if( ! deliverFirst )
-//            {
-//                message.getMessageHandle().enqueue(_storeContext, message.getMessageId(), queue);
-//            }
-            queue.process(_storeContext, message, deliverFirst);
-            //following check implements the functionality
-            //required by the 'immediate' flag:
-            message.checkDeliveredToConsumer();
-        }
-        catch (NoConsumersException e)
-        {
-            _returnMessages.add(e);
-        }
-    }
-
-    public void acknowledgeMessage(final long deliveryTag, long lastDeliveryTag,
-                                   boolean multiple, final UnacknowledgedMessageMap unacknowledgedMessageMap)
-            throws AMQException
-    {
-        if (multiple)
-        {
-            if (deliveryTag == 0)
-            {
-
-                //Spec 2.1.6.11 ... If the multiple field is 1, and the delivery tag is zero,
-                // tells the server to acknowledge all outstanding mesages.
-                _log.info("Multiple ack on delivery tag 0. ACKing all messages. Current count:" +
-                          unacknowledgedMessageMap.size());
-                unacknowledgedMessageMap.visit(new UnacknowledgedMessageMap.Visitor()
-                {
-                    public boolean callback(UnacknowledgedMessage message) throws AMQException
-                    {
-                        if (!_browsedAcks.contains(deliveryTag))
-                        {
-                            if (_log.isDebugEnabled())
-                            {
-                                _log.debug("Discarding message: " + message.message.getMessageId());
-                            }
-
-                            //Message has been ack so discard it. This will dequeue and decrement the reference.
-                            message.discard(_storeContext);
-                        }
-                        else
-                        {
-                            _browsedAcks.remove(deliveryTag);
-                        }
-                        return false;
-                    }
-
-                    public void visitComplete()
-                    {
-                        unacknowledgedMessageMap.clear();
-                    }
-                });
-            }
-            else
-            {
-                if (!unacknowledgedMessageMap.contains(deliveryTag))
-                {
-                    throw new AMQException(null, "Multiple ack on delivery tag " + deliveryTag + " not known for channel", null);
-                }
-
-                LinkedList<UnacknowledgedMessage> acked = new LinkedList<UnacknowledgedMessage>();
-                unacknowledgedMessageMap.drainTo(acked, deliveryTag);
-                for (UnacknowledgedMessage msg : acked)
-                {
-                    if (!_browsedAcks.contains(deliveryTag))
-                    {
-                        if (_log.isDebugEnabled())
-                        {
-                            _log.debug("Discarding message: " + msg.message.getMessageId());
-                        }
-
-                        //Message has been ack so discard it. This will dequeue and decrement the reference.
-                        msg.discard(_storeContext);
-                    }
-                    else
-                    {
-                        _browsedAcks.remove(deliveryTag);
-                    }
-                }
-            }
-        }
-        else
-        {
-            UnacknowledgedMessage msg;
-            msg = unacknowledgedMessageMap.remove(deliveryTag);
-
-            if (msg == null)
-            {
-                _log.info("Single ack on delivery tag " + deliveryTag + " not known for channel:" +
-                          _channel.getChannelId());
-                throw new AMQException(null, "Single ack on delivery tag " + deliveryTag + " not known for channel:" +
-                                       _channel.getChannelId(), null);
-            }
-
-            if (!_browsedAcks.contains(deliveryTag))
-            {
-                if (_log.isDebugEnabled())
-                {
-                    _log.debug("Discarding message: " + msg.message.getMessageId());
-                }
-
-                //Message has been ack so discard it. This will dequeue and decrement the reference.
-                msg.discard(_storeContext);
-            }
-            else
-            {
-                _browsedAcks.remove(deliveryTag);
-            }
-
-            if (_log.isDebugEnabled())
-            {
-                _log.debug("Received non-multiple ack for messaging with delivery tag " + deliveryTag + " msg id " +
-                           msg.message.getMessageId());
-            }
-        }
-    }
-
-    public void messageFullyReceived(boolean persistent) throws AMQException
-    {
-        if (persistent)
-        {
-            //DTX removed this option.
-            _messageStore.commitTran(_storeContext);
-            _inTran = false;
-        }
-    }
-
-    public void messageProcessed(AMQProtocolSession protocolSession) throws AMQException
-    {
-        _channel.processReturns(protocolSession);
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/StoreMessageOperation.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/StoreMessageOperation.java
deleted file mode 100644
index 0e4d6c2030..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/StoreMessageOperation.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.txn;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.server.store.MessageStore;
-import org.apache.qpid.server.store.StoreContext;
-
-/**
- * A transactional operation to store messages in an underlying persistent store. When this operation
- * commits it will do everything to ensure that all messages are safely committed to persistent
- * storage.
- */
-public class StoreMessageOperation implements TxnOp
-{
-    private final MessageStore _messsageStore;
-
-    public StoreMessageOperation(MessageStore messageStore)
-    {
-        _messsageStore = messageStore;
-    }
-
-    public void prepare(StoreContext context) throws AMQException
-    {
-    }
-
-    public void undoPrepare()
-    {
-    }
-
-    public void commit(StoreContext context) throws AMQException
-    {
-        _messsageStore.commitTran(context);
-    }
-
-    public void rollback(StoreContext context) throws AMQException
-    {
-        _messsageStore.abortTran(context);
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/Transaction.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/Transaction.java
deleted file mode 100644
index 2dc6ec2b77..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/Transaction.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.qpid.server.txn;
-
-/**
- * Created by Arnaud Simon
- * Date: 25-Apr-2007
- * Time: 14:08:39
- */
-public interface Transaction
-{
-
-    /**
-     * Add an abstract record to this tx.
-     *
-     * @param record The record to be added
-     */
-    public void addRecord(TransactionRecord record);
-
-    /**
-     * Set this tx timeout
-     *
-     * @param timeout This tx timeout in seconds
-     */
-    public void setTimeout(long timeout);
-
-    /**
-     * Get this tx timeout
-     *
-     * @return This tx timeout in seconds
-     */
-    public long getTimeout();
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/TransactionManager.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/TransactionManager.java
deleted file mode 100644
index bcbf2c9de4..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/TransactionManager.java
+++ /dev/null
@@ -1,228 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.qpid.server.txn;
-
-import org.apache.qpid.server.exception.*;
-import org.apache.qpid.server.messageStore.MessageStore;
-import org.apache.commons.configuration.Configuration;
-
-import javax.transaction.xa.Xid;
-import java.util.Set;
-
-/**
- * Created by Arnaud Simon
- * Date: 29-Mar-2007
- * Time: 13:29:31
- */
-public interface TransactionManager
-{
-
-    /**
-      * Configure this TM with the Message store implementation
-      *
-      * @param base         The base element identifier from which all configuration items are relative. For example, if the base
-      *                     element is "store", the all elements used by concrete classes will be "store.foo" etc.
-      * @param config       The apache commons configuration object
-      * @param messageStroe the message store associated with the TM
-      */
-     public void configure(MessageStore messageStroe, String base, Configuration config);
-
-    /**
-     * Begin a transaction branch identified by Xid
-     *
-     * @param xid The xid of the branch to begin
-     * @return <ul>
-     *         <li>  <code>XAFlag.ok</code>: Normal execution.
-     *         <li> <code>XAFlag.rbrollback</code>: The transaction branch was marked rollback-only for an unspecified reason.
-     *         </ul>
-     * @throws InternalErrorException In case of internal problem
-     * @throws InvalidXidException    The Xid is invalid
-     */
-    public XAFlag begin(Xid xid)
-            throws
-            InternalErrorException,
-            InvalidXidException;
-
-    /**
-     * Prepare the transaction branch identified by Xid
-     *
-     * @param xid The xid of the branch to prepare
-     * @return <ul>
-     *         <li> <code>XAFlag.ok</code>: Normal execution.
-     *         <li> <code>XAFlag.rdonly</code>: The transaction branch was read-only and has been committed.
-     *         <li> <code>XAFlag.rbrollback</code>: The transaction branch was marked rollback-only for an unspeci?ed reason.
-     *         <li> <code>XAFlag.rbtimeout</code>: The work represented by this transaction branch took too long.
-     *         </ul>
-     * @throws InternalErrorException  In case of internal problem
-     * @throws CommandInvalidException Prepare has been call in an improper context
-     * @throws UnknownXidException     The Xid is unknown
-     */
-    public XAFlag prepare(Xid xid)
-            throws
-            InternalErrorException,
-            CommandInvalidException,
-            UnknownXidException;
-
-    /**
-     * Rollback the transaction branch identified by Xid
-     *
-     * @param xid The xid of the branch to rollback
-     * @return <ul>
-     *         <li> <code>XAFlag.ok</code>: Normal execution,
-     *         <li> <code>XAFlag.heurhaz</code>: Due to some failure, the work done on behalf of the specified transaction branch may have been heuristically completed.
-     *         <li> <code>XAFlag.heurcom</code>: Due to a heuristic decision, the work done on behalf of the speci?ed transaction branch was committed.
-     *         <li> <code>XAFlag.heurrb</code>: Due to a heuristic decision, the work done on behalf of the speci?ed transaction branch was rolled back.
-     *         <li> <code>XAFlag.heurmix</code>: Due to a heuristic decision, the work done on behalf of the speci?ed transaction branch was partially committed and partially rolled back.
-     *         <li> <code>XAFlag.rbrollback</code>: The broker marked the transaction branch rollback-only for an unspeci?ed reason.
-     *         <li> <code>XAFlag.rbtimeout</code>: The work represented by this transaction branch took too long.
-     *         </ul>
-     * @throws InternalErrorException  In case of internal problem
-     * @throws CommandInvalidException Rollback has been call in an improper context
-     * @throws UnknownXidException     The Xid is unknown
-     */
-    public XAFlag rollback(Xid xid)
-            throws
-            InternalErrorException,
-            CommandInvalidException,
-            UnknownXidException;
-
-    /**
-     * Commit the transaction branch identified by Xid
-     *
-     * @param xid The xid of the branch to commit
-     * @return <ul>
-     *         <li> <code>XAFlag.ok</code>: Normal execution,
-     *         <li> <code>XAFlag.heurhaz</code>: Due to some failure, the work done on behalf of the specified transaction branch may have been heuristically completed.
-     *         <li> <code>XAFlag.heurcom</code>: Due to a heuristic decision, the work done on behalf of the speci?ed transaction branch was committed.
-     *         <li> <code>XAFlag.heurrb</code>: Due to a heuristic decision, the work done on behalf of the speci?ed transaction branch was rolled back.
-     *         <li> <code>XAFlag.heurmix</code>: Due to a heuristic decision, the work done on behalf of the speci?ed transaction branch was partially committed and partially rolled back.
-     *         </ul>
-     * @throws InternalErrorException  In case of internal problem
-     * @throws CommandInvalidException Commit has been call in an improper context
-     * @throws UnknownXidException     The Xid is unknown
-     * @throws NotPreparedException    The branch was not prepared prior to commit
-     */
-    public XAFlag commit(Xid xid)
-            throws
-            InternalErrorException,
-            CommandInvalidException,
-            UnknownXidException,
-            NotPreparedException;
-
-    /**
-     * One phase commit the transaction branch identified by Xid
-     *
-     * @param xid The xid of the branch to one phase commit
-     * @return <ul>
-     *         <li> <code>XAFlag.ok</code>: Normal execution,
-     *         <li> <code>XAFlag.heurhaz</code>: Due to some failure, the work done on behalf of the specified transaction branch may have been heuristically completed.
-     *         <li> <code>XAFlag.heurcom</code>: Due to a heuristic decision, the work done on behalf of the speci?ed transaction branch was committed.
-     *         <li> <code>XAFlag.heurrb</code>: Due to a heuristic decision, the work done on behalf of the speci?ed transaction branch was rolled back.
-     *         <li> <code>XAFlag.heurmix</code>: Due to a heuristic decision, the work done on behalf of the speci?ed transaction branch was partially committed and partially rolled back.
-     *         <li> <code>XAFlag.rbrollback</code>: The broker marked the transaction branch rollback-only for an unspeci?ed reason.
-     *         <li> <code>XAFlag.rbtimeout</code>: The work represented by this transaction branch took too long.
-     *         </ul>
-     * @throws InternalErrorException  In case of internal problem
-     * @throws CommandInvalidException Commit has been call in an improper context
-     * @throws UnknownXidException     The Xid is unknown
-     */
-    public XAFlag commit_one_phase(Xid xid)
-            throws
-            InternalErrorException,
-            CommandInvalidException,
-            UnknownXidException;
-
-    /**
-     * Forget about the transaction branch identified by Xid
-     *
-     * @param xid The xid of the branch to forget
-     * @throws InternalErrorException  In case of internal problem
-     * @throws CommandInvalidException Forget has been call in an improper context
-     * @throws UnknownXidException     The Xid is unknown
-     */
-    public void forget(Xid xid)
-            throws
-            InternalErrorException,
-            CommandInvalidException,
-            UnknownXidException;
-
-    /**
-     * Set the transaction branch timeout value in seconds
-     *
-     * @param xid     The xid of the branch to set timeout
-     * @param timeout Timeout value in seconds
-     * @throws InternalErrorException In case of internal problem
-     * @throws UnknownXidException    The Xid is unknown
-     */
-    public void setTimeout(Xid xid, long timeout)
-            throws
-            InternalErrorException,
-            UnknownXidException;
-
-    /**
-     * Get the transaction branch timeout
-     *
-     * @param xid The xid of the branch to get the timeout from
-     * @return The timeout associated with the branch identified with xid
-     * @throws InternalErrorException In case of internal problem
-     * @throws UnknownXidException    The Xid is unknown
-     */
-    public long getTimeout(Xid xid)
-            throws
-            InternalErrorException,
-            UnknownXidException;
-
-    /**
-     * Get a set of Xids the RM has prepared or  heuristically completed
-     *
-     * @param startscan Indicates that recovery scan should start
-     * @param endscan   Indicates that the recovery scan should end after returning the Xids
-     * @return Set of Xids the RM has prepared or  heuristically completed
-     * @throws InternalErrorException  In case of internal problem
-     * @throws CommandInvalidException Recover has been call in an improper context
-     */
-    public Set<Xid> recover(boolean startscan, boolean endscan)
-            throws
-            InternalErrorException,
-            CommandInvalidException;
-
-
-    /**
-     * An error happened (for example the channel has been abruptly closed)
-     * with this Xid, TM must make a heuristical decision.
-     *
-     * @param xid The Xid of the transaction branch to be heuristically completed
-     * @throws UnknownXidException    The Xid is unknown
-     * @throws InternalErrorException  In case of internal problem     
-     */
-    public void HeuristicOutcome(Xid xid)
-            throws
-            UnknownXidException,
-            InternalErrorException;
-
-    /**
-     * Get the Transaction corresponding to the provided Xid
-     * @param xid The Xid of the transaction to ger
-     * @return The transaction with the provided Xid
-     * @throws UnknownXidException  The Xid is unknown
-     */
-      public Transaction getTransaction(Xid xid)
-            throws
-            UnknownXidException;
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/TransactionRecord.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/TransactionRecord.java
deleted file mode 100644
index 3f6f1d6b8e..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/TransactionRecord.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.qpid.server.txn;
-
-import org.apache.qpid.server.exception.*;
-import org.apache.qpid.server.messageStore.MessageStore;
-
-import javax.transaction.xa.Xid;
-
-/**
- * Created by Arnaud Simon
- * Date: 25-Apr-2007
- * Time: 14:12:17
- */
-public interface TransactionRecord
-{
-    /**
-        * Commit this record.
-        *
-        * @param store the store to be used during commit
-        * @param xid   the xid of the tx branch
-        * @throws org.apache.qpid.server.exception.InternalErrorException      in case of internal problem
-        * @throws org.apache.qpid.server.exception.QueueDoesntExistException   the queue does not exist
-        * @throws org.apache.qpid.server.exception.InvalidXidException         the xid is invalid
-        * @throws org.apache.qpid.server.exception.UnknownXidException         the xid is unknonw
-        * @throws org.apache.qpid.server.exception.MessageDoesntExistException the message does not exist
-        */
-       public abstract void commit(MessageStore store, Xid xid)
-               throws
-               InternalErrorException,
-               QueueDoesntExistException,
-               InvalidXidException,
-               UnknownXidException,
-               MessageDoesntExistException;
-
-       /**
-        * rollback this record
-        *
-        * @param store the store to be used
-        * @throws InternalErrorException In case of internal error
-        */
-       public abstract void rollback(MessageStore store)
-               throws
-               InternalErrorException;
-
-       /**
-        * Prepare this record
-        *
-        * @param store the store to be used
-        * @throws InternalErrorException In case of internal error
-        */
-       public abstract void prepare(MessageStore store)
-               throws
-               InternalErrorException;
-
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/TransactionalContext.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/TransactionalContext.java
deleted file mode 100644
index fee25c07df..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/TransactionalContext.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.txn;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.server.ack.UnacknowledgedMessageMap;
-import org.apache.qpid.server.protocol.AMQProtocolSession;
-import org.apache.qpid.server.queue.AMQMessage;
-import org.apache.qpid.server.queue.AMQQueue;
-import org.apache.qpid.server.store.StoreContext;
-
-/**
- * TransactionalContext provides a context in which transactional operations on {@link AMQMessage}s are performed.
- * Different levels of transactional support for the delivery of messages may be provided by different implementations
- * of this interface.
- *
- * <p/>The fundamental transactional operations that can be performed on a message queue are 'enqueue' and 'dequeue'.
- * In this interface, these have been recast as the {@link #messageFullyReceived} and {@link #acknowledgeMessage}
- * operations. This interface essentially provides a way to make enqueueing and dequeuing transactional.
- *
- * <p/><table id="crc"><caption>CRC Card</caption>
- * <tr><th> Responsibilities
- * <tr><td> Explicitly accept a transaction start notification.
- * <tr><td> Commit all pending operations in a transaction.
- * <tr><td> Rollback all pending operations in a transaction.
- * <tr><td> Deliver a message to a queue as part of a transaction.
- * <tr><td> Redeliver a message to a queue as part of a transaction.
- * <tr><td> Mark a message as acknowledged as part of a transaction.
- * <tr><td> Accept notification that a message has been completely received as part of a transaction.
- * <tr><td> Accept notification that a message has been fully processed as part of a transaction.
- * <tr><td> Associate a message store context with this transaction context.
- * </table>
- *
- * @todo The 'fullyReceived' and 'messageProcessed' events sit uncomfortably in the responsibilities of a transactional
- *       context. They are non-transactional operations, used to trigger other side-effects. Consider moving them
- *       somewhere else, a seperate interface for example.
- *
- * @todo This transactional context could be written as a wrapper extension to a Queue implementation, that provides
- *       transactional management of the enqueue and dequeue operations, with added commit/rollback methods. Any
- *       queue implementation could be made transactional by wrapping it as a transactional queue. This would mean
- *       that the enqueue/dequeue operations do not need to be recast as deliver/acknowledge operations, which may be
- *       conceptually neater.
- *
- * For example:
- * <pre>
- * public interface Transactional
- * {
- *    public void commit();
- *    public void rollback();
- * }
- *
- * public interface TransactionalQueue<E> extends Transactional, SizeableQueue<E>
- * {}
- *
- * public class Queues
- * {
- *    ...
- *    // For transactional messaging, take a transactional view onto the queue.
- *    public static <E> TransactionalQueue<E> getTransactionalQueue(SizeableQueue<E> queue) { ... }
- *
- *    // For non-transactional messaging, take a non-transactional view onto the queue.
- *    public static <E> TransactionalQueue<E> getNonTransactionalQueue(SizeableQueue<E> queue) { ... }
- * }
- * </pre>
- */
-public interface TransactionalContext
-{
-    /**
-     * Explicitly begins the transaction, if it has not already been started. {@link #commit} or {@link #rollback}
-     * should automatically begin the next transaction in the chain.
-     *
-     * @throws AMQException If the transaction cannot be started for any reason.
-     */
-    void beginTranIfNecessary() throws AMQException;
-
-    /**
-     * Makes all pending operations on the transaction permanent and visible.
-     *
-     * @throws AMQException If the transaction cannot be committed for any reason.
-     */
-    void commit() throws AMQException;
-
-    /**
-     * Erases all pending operations on the transaction.
-     *
-     * @throws AMQException If the transaction cannot be committed for any reason.
-     */
-    void rollback() throws AMQException;
-
-    /**
-     * Delivers the specified message to the specified queue. A 'deliverFirst' flag may be set if the message is a
-     * redelivery, and should be placed on the front of the queue.
-     *
-     * <p/>This is an 'enqueue' operation.
-     *
-     * @param message      The message to deliver.
-     * @param queue        The queue to deliver the message to.
-     * @param deliverFirst <tt>true</tt> to place the message on the front of the queue for redelivery, <tt>false</tt>
-     *                     for normal FIFO message ordering.
-     *
-     * @throws AMQException If the message cannot be delivered for any reason.
-     */
-    void deliver(AMQMessage message, AMQQueue queue, boolean deliverFirst) throws AMQException;
-
-    /**
-     * Acknowledges a message or many messages as delivered. All messages up to a specified one, may be acknowledged by
-     * setting the 'multiple' flag. It is also possible for the acknowledged message id to be zero, when the 'multiple'
-     * flag is set, in which case an acknowledgement up to the latest delivered message should be done.
-     *
-     * <p/>This is a 'dequeue' operation.
-     *
-     * @param deliveryTag              The id of the message to acknowledge, or zero, if using multiple acknowledgement
-     *                                 up to the latest message.
-     * @param lastDeliveryTag          The latest message delivered.
-     * @param multiple                 <tt>true</tt> if all message ids up the acknowledged one or latest delivered, are
-     *                                 to be acknowledged, <tt>false</tt> otherwise.
-     * @param unacknowledgedMessageMap The unacknowledged messages in the transaction, to remove the acknowledged message
-     *                                 from.
-     *
-     * @throws AMQException If the message cannot be acknowledged for any reason.
-     */
-    void acknowledgeMessage(long deliveryTag, long lastDeliveryTag, boolean multiple,
-        UnacknowledgedMessageMap unacknowledgedMessageMap) throws AMQException;
-
-    /**
-     * Notifies the transactional context that a message has been fully received. The actual message that was received
-     * is not specified. This event may be used to trigger a process related to the receipt of the message, for example,
-     * flushing its data to disk.
-     *
-     * @param persistent <tt>true</tt> if the received message is persistent, <tt>false</tt> otherwise.
-     *
-     * @throws AMQException If the fully received event cannot be processed for any reason.
-     */
-    void messageFullyReceived(boolean persistent) throws AMQException;
-
-    /**
-     * Notifies the transactional context that a message has been delivered, succesfully or otherwise. The actual
-     * message that was delivered is not specified. This event may be used to trigger a process related to the
-     * outcome of the delivery of the message, for example, cleaning up failed deliveries.
-     *
-     * @param protocolSession The protocol session of the deliverable message.
-     *
-     * @throws AMQException If the message processed event cannot be handled for any reason.
-     */
-    void messageProcessed(AMQProtocolSession protocolSession) throws AMQException;
-
-    /**
-     * Gets the message store context associated with this transactional context.
-     *
-     * @return The message store context associated with this transactional context.
-     */
-    StoreContext getStoreContext();
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/TxnBuffer.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/TxnBuffer.java
deleted file mode 100644
index 405c233552..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/TxnBuffer.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.txn;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.log4j.Logger;
-import org.apache.qpid.AMQException;
-import org.apache.qpid.server.store.StoreContext;
-
-/** Holds a list of TxnOp instance representing transactional operations. */
-public class TxnBuffer
-{
-    private final List<TxnOp> _ops = new ArrayList<TxnOp>();
-    private static final Logger _log = Logger.getLogger(TxnBuffer.class);
-
-    public TxnBuffer()
-    {
-    }
-
-    public void commit(StoreContext context) throws AMQException
-    {
-        if (_log.isDebugEnabled())
-        {
-            _log.debug("Committing " + _ops.size() + " ops to commit.:" + _ops);
-        }
-
-        if (prepare(context))
-        {
-            for (TxnOp op : _ops)
-            {
-                op.commit(context);
-            }
-        }
-        _ops.clear();
-    }
-
-    private boolean prepare(StoreContext context)
-    {
-        for (int i = 0; i < _ops.size(); i++)
-        {
-            TxnOp op = _ops.get(i);
-            try
-            {
-                op.prepare(context);
-            }
-            catch (Exception e)
-            {
-                //compensate previously prepared ops
-                for (int j = 0; j < i; j++)
-                {
-                    _ops.get(j).undoPrepare();
-                }
-                return false;
-            }
-        }
-        return true;
-    }
-
-    public void rollback(StoreContext context) throws AMQException
-    {
-        for (TxnOp op : _ops)
-        {
-            op.rollback(context);
-        }
-        _ops.clear();
-    }
-
-    public void enlist(TxnOp op)
-    {
-        _ops.add(op);
-    }
-
-    public void cancel(TxnOp op)
-    {
-        _ops.remove(op);
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/TxnOp.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/TxnOp.java
deleted file mode 100644
index 919c078cf0..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/TxnOp.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.txn;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.server.store.StoreContext;
-
-/**
- * This provides the abstraction of an individual operation within a
- * transaction. It is used by the TxnBuffer class.
- */
-public interface TxnOp
-{
-    /**
-     * Do the part of the operation that updates persistent state
-     */
-    public void prepare(StoreContext context) throws AMQException;
-    /**
-     * Complete the operation started by prepare. Can now update in
-     * memory state or make netork transfers.
-     */
-    public void commit(StoreContext context) throws AMQException;
-    /**
-     * This is not the same as rollback. Unfortunately the use of an
-     * in memory reference count as a locking mechanism and a test for
-     * whether a message should be deleted means that as things are,
-     * handling an acknowledgement unavoidably alters both memory and
-     * persistent state on prepare. This is needed to 'compensate' or
-     * undo the in-memory change if the peristent update of later ops
-     * fails.
-     */
-    public void undoPrepare();
-    /**
-     * Rolls back the operation.
-     */
-    public void rollback(StoreContext context) throws AMQException;
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/XAFlag.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/XAFlag.java
deleted file mode 100644
index 8214ab7dac..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/XAFlag.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package org.apache.qpid.server.txn;
-
-/**
- * Created by Arnaud Simon
- * Date: 29-Mar-2007
- * Time: 14:57:01
- */
-public enum XAFlag
-{
-    rbrollback(1, "XA-RBROLLBACK", "The rollback was caused by an unspecified reason"),
-    rbtimeout(2, "XA-RBTIMEOUT", "The transaction branch took too long"),
-    heurhaz(3, "XA-HEURHAZ", "The transaction branch may have been heuristically completed"),
-    heurcom(4, "XA-HEURCOM", "The transaction branch has been heuristically committed"),
-    heurrb(5, "XA-HEURRB", "The transaction branch has been heuristically rolled back"),
-    heurmix(6, "XA-HEURMIX", "The transaction branch has been heuristically committed and rolled back"),
-    rdonly(7, "XA-RDONLY", "The transaction branch was read-only and has been committed"),
-    ok(8, "XA-OK", "Normal execution");
-
-    private final int _code;
-
-    private final String _name;
-
-    private final String _description;
-
-    XAFlag(int code, String name, String description)
-    {
-        _code = code;
-        _name = name;
-        _description = description;
-    }
-
-    //==============================================
-    // Getter methods
-    //==============================================
-
-    public int getCode()
-    {
-        return _code;
-    }
-
-    public String getName()
-    {
-        return _name;
-    }
-
-    public String getDescription()
-    {
-        return _description;
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/XidImpl.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/XidImpl.java
deleted file mode 100644
index 91db1d97c0..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/XidImpl.java
+++ /dev/null
@@ -1,210 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.qpid.server.txn;
-
-
-import org.apache.log4j.Logger;
-
-import javax.transaction.xa.Xid;
-
-/**
- * Created by Arnaud Simon
- * Date: 03-Apr-2007
- * Time: 20:32:55
- */
-public class XidImpl implements Xid
-{
-    //========================================================================
-    // Static Constants
-    //========================================================================
-    // The logger for this class
-    private static final Logger _log = Logger.getLogger(XidImpl.class);
-
-    //========================================================================
-    // Instance Fields
-    //========================================================================
-
-    //the transaction branch identifier part of XID as an array of bytes
-    private byte[] m_branchQualifier;
-
-    // the format identifier part of the XID.
-    private int m_formatID;
-
-    // the global transaction identifier part of XID as an array of bytes.
-    private byte[] m_globalTransactionID;
-
-    //========================================================================
-    // Constructor(s)
-    //========================================================================
-
-    /**
-     * Create new Xid.
-     */
-    public XidImpl()
-    {
-
-    }
-
-    /**
-     * Create new XidImpl from an existing Xid.
-     * <p/>
-     * This is usually called when an application server provides some implementation
-     * of the Xid interface and we need to cast this into our own XidImpl.
-     *
-     * @param xid the xid to cloning
-     */
-    public XidImpl(Xid xid)
-    {
-        if (_log.isDebugEnabled())
-        {
-            _log.debug("Cloning Xid");
-        }
-        m_branchQualifier = xid.getBranchQualifier();
-        m_formatID = xid.getFormatId();
-        m_globalTransactionID = xid.getGlobalTransactionId();
-    }
-
-    /**
-     * Create a new Xid.
-     *
-     * @param branchQualifier     The transaction branch identifier part of XID as an array of bytes.
-     * @param format              The format identifier part of the XID.
-     * @param globalTransactionID The global transaction identifier part of XID as an array of bytes.
-     */
-    public XidImpl(byte[] branchQualifier, int format, byte[] globalTransactionID)
-    {
-        if (_log.isDebugEnabled())
-        {
-            _log.debug("creating Xid");
-        }
-        m_branchQualifier = branchQualifier;
-        m_formatID = format;
-        m_globalTransactionID = globalTransactionID;
-    }
-
-//========================================================================
-
-    //  Xid interface implementation
-    //========================================================================
-    /**
-     * Format identifier. O means the OSI CCR format.
-     *
-     * @return Global transaction identifier.
-     */
-    public byte[] getGlobalTransactionId()
-    {
-        return m_globalTransactionID;
-    }
-
-    /**
-     * Obtain the transaction branch identifier part of XID as an array of bytes.
-     *
-     * @return Branch identifier part of XID.
-     */
-    public byte[] getBranchQualifier()
-    {
-        return m_branchQualifier;
-    }
-
-    /**
-     * Obtain the format identifier part of the XID.
-     *
-     * @return Format identifier. O means the OSI CCR format.
-     */
-    public int getFormatId()
-    {
-        return m_formatID;
-    }
-
-//========================================================================
-//  Object operations
-//========================================================================
-
-    /**
-     * Indicates whether some other Xid is "equal to" this one.
-     * <p/>
-     * Two Xids are equal if and only if their three elementary parts are equal
-     *
-     * @param o the object to compare this <code>XidImpl</code> against.
-     * @return code>true</code> if the <code>XidImpl</code> are equal; <code>false</code> otherwise.
-     */
-    public boolean equals(Object o)
-    {
-        if (this == o)
-        {
-            return true;
-        }
-        if (o instanceof XidImpl)
-        {
-            XidImpl other = (XidImpl) o;
-            if (m_formatID == other.getFormatId())
-            {
-                if (m_branchQualifier.length == other.getBranchQualifier().length)
-                {
-                    for (int i = 0; i < m_branchQualifier.length; i++)
-                    {
-                        if (m_branchQualifier[i] != other.getBranchQualifier()[i])
-                        {
-                            return false;
-                        }
-                    }
-
-                    if (m_globalTransactionID.length == other.getGlobalTransactionId().length)
-                    {
-                        for (int i = 0; i < m_globalTransactionID.length; i++)
-                        {
-                            if (m_globalTransactionID[i] != other.getGlobalTransactionId()[i])
-                            {
-                                return false;
-                            }
-                        }
-                        // everithing is equal
-                        return true;
-                    }
-                }
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Returns a hash code for this Xid.
-     * <p/>
-     * As this object is used as a key entry in a hashMap it is necessary to provide an implementation
-     * of hashcode in order to fulfill the following aspect of the general contract of
-     * {@link Object#hashCode()} that is:
-     * <ul>
-     * <li>If two objects are equal according to the <tt>equals(Object)</tt>
-     * method, then calling the <code>hashCode</code> method on each of
-     * the two objects must produce the same integer result.
-     * </ul>
-     * <p/>
-     * The hash code for a
-     * <code>XidImpl</code> object is computed as
-     * <blockquote><pre>
-     *  hashcode( globalTransactionID ) + hashcode( branchQualifier ) + formatID
-     * </pre></blockquote>
-     *
-     * @return a hash code value for this object.
-     */
-    public int hashCode()
-    {
-        return (new String(m_globalTransactionID)).hashCode() + (new String(m_branchQualifier)).hashCode() + m_formatID;
-    }
-
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/util/CircularBuffer.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/util/CircularBuffer.java
deleted file mode 100644
index e730e2f3c3..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/util/CircularBuffer.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.util;
-
-import java.util.Iterator;
-
-import org.apache.log4j.Logger;
-
-public class CircularBuffer implements Iterable
-{
-
-    private static final Logger _logger = Logger.getLogger(CircularBuffer.class);
-
-    private final Object[] _log;
-    private int _size;
-    private int _index;
-
-    public CircularBuffer(int size)
-    {
-        _log = new Object[size];
-    }
-
-    public void add(Object o)
-    {
-        _log[_index++] = o;
-        _size = Math.min(_size+1, _log.length);
-        if(_index >= _log.length)
-        {
-            _index = 0;
-        }
-    }
-
-    public Object get(int i)
-    {
-        if(i >= _log.length)
-        {
-            throw new ArrayIndexOutOfBoundsException(i);
-        }
-        return _log[index(i)];
-    }
-
-    public int size() {
-        return _size;
-    }
-
-    public Iterator iterator()
-    {
-        return new Iterator()
-        {
-            private int i = 0;
-
-            public boolean hasNext()
-            {
-                return i < _size;
-            }
-
-            public Object next()
-            {
-                return get(i++);
-            }
-
-            public void remove()
-            {
-                throw new UnsupportedOperationException();
-            }
-        };
-    }
-
-    public String toString()
-    {
-        StringBuilder s = new StringBuilder();
-        boolean first = true;
-        for(Object o : this)
-        {
-            if(!first)
-            {
-                s.append(", ");
-            }
-            else
-            {
-                first = false;
-            }
-            s.append(o);
-        }
-        return s.toString();
-    }
-
-    public void dump()
-    {
-        for(Object o : this)
-        {
-         _logger.info(o);
-        }
-    }
-
-    int index(int i)
-    {
-        return _size == _log.length ? (_index + i) % _log.length : i;
-    }
-
-    public static void main(String[] artgv)
-    {
-        String[] items = new String[]{
-                "A","B","C","D","E","F","G","H","I","J","K"
-        };
-        CircularBuffer buffer = new CircularBuffer(5);
-        for(String s : items)
-        {
-            buffer.add(s);
-            _logger.info(buffer);
-        }
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/util/ConcurrentLinkedQueueNoSize.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/util/ConcurrentLinkedQueueNoSize.java
deleted file mode 100644
index cf5e71a6e2..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/util/ConcurrentLinkedQueueNoSize.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.util;
-
-import java.util.concurrent.ConcurrentLinkedQueue;
-
-public class ConcurrentLinkedQueueNoSize<E> extends ConcurrentLinkedQueue<E>
-{
-    public int size()
-    {
-        if (isEmpty())
-        {
-            return 0;
-        }
-        else
-        {
-            return 1;
-        }
-    }        
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/util/LoggingProxy.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/util/LoggingProxy.java
deleted file mode 100644
index eda97e0ed2..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/util/LoggingProxy.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.util;
-
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
-import java.util.Arrays;
-
-/**
- * Dynamic proxy that records invocations in a fixed size circular buffer,
- * dumping details on hitting an exception.
- * <p>
- * Useful in debugging.
- * <p>
- */
-public class LoggingProxy implements InvocationHandler
-{
-    private final Object _target;
-    private final CircularBuffer _log;
-
-    public LoggingProxy(Object target, int size)
-    {
-        _target = target;
-        _log = new CircularBuffer(size);
-    }
-
-    public Object invoke(Object proxy, Method method, Object[] args) throws Throwable
-    {
-        try
-        {
-            entered(method, args);
-            Object result = method.invoke(_target, args);
-            returned(method, result);
-            return result;
-        }
-        catch(InvocationTargetException e)
-        {
-            dump();
-            throw e.getTargetException();
-        }
-    }
-
-    void dump()
-    {
-        _log.dump();
-    }
-
-    CircularBuffer getBuffer()
-    {
-        return _log;
-    }
-
-    private synchronized void entered(Method method, Object[] args)
-    {
-        if (args == null)
-        {
-            _log.add(Thread.currentThread() + ": " + method.getName() + "() entered");
-        }
-        else
-        {
-            _log.add(Thread.currentThread() + ": " + method.getName() + "(" + Arrays.toString(args) + ") entered");
-        }
-    }
-
-    private synchronized void returned(Method method, Object result)
-    {
-        if (method.getReturnType() == Void.TYPE)
-        {
-            _log.add(Thread.currentThread() + ": " + method.getName() + "() returned");
-        }
-        else
-        {
-            _log.add(Thread.currentThread() + ": " + method.getName() + "() returned " + result);
-        }
-    }
-
-    public Object getProxy(Class... c)
-    {
-        return Proxy.newProxyInstance(_target.getClass().getClassLoader(), c, this);
-    }
-
-    public int getBufferSize() {
-        return _log.size();
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/util/NullApplicationRegistry.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/util/NullApplicationRegistry.java
deleted file mode 100644
index 4985c12dbb..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/util/NullApplicationRegistry.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.util;
-
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Properties;
-
-import org.apache.commons.configuration.Configuration;
-import org.apache.commons.configuration.MapConfiguration;
-import org.apache.qpid.server.management.ManagedObjectRegistry;
-import org.apache.qpid.server.management.NoopManagedObjectRegistry;
-import org.apache.qpid.server.registry.ApplicationRegistry;
-import org.apache.qpid.server.security.auth.manager.AuthenticationManager;
-import org.apache.qpid.server.security.auth.manager.PrincipalDatabaseAuthenticationManager;
-import org.apache.qpid.server.security.auth.database.PrincipalDatabaseManager;
-import org.apache.qpid.server.security.auth.database.PropertiesPrincipalDatabaseManager;
-import org.apache.qpid.server.security.access.AccessManager;
-import org.apache.qpid.server.security.access.AllowAll;
-import org.apache.qpid.server.virtualhost.VirtualHost;
-import org.apache.qpid.server.virtualhost.VirtualHostRegistry;
-
-public class NullApplicationRegistry extends ApplicationRegistry
-{
-    private ManagedObjectRegistry _managedObjectRegistry;
-
-    private AuthenticationManager _authenticationManager;
-
-    private VirtualHostRegistry _virtualHostRegistry;
-
-    private AccessManager _accessManager;
-
-    private PrincipalDatabaseManager _databaseManager;
-
-
-    public NullApplicationRegistry()
-    {
-        super(new MapConfiguration(new HashMap()));
-    }
-
-    public void initialise() throws Exception
-    {
-        //DTX MessageStore
-//        _configuration.addProperty("store.class", "org.apache.qpid.server.messageStore.MemoryMessageStore");
-        _configuration.addProperty("store.class", "org.apache.qpid.server.store.MemoryMessageStore");        
-        _configuration.addProperty("txn.class", "org.apache.qpid.server.txn.MemoryTransactionManager");
-       // _configuration.addProperty("store.class", "org.apache.qpid.server.messageStore.JDBCStore");
-       // _configuration.addProperty("txn.class", "org.apache.qpid.server.txn.JDBCTransactionManager");
-
-        Properties users = new Properties();
-
-        users.put("guest", "guest");
-
-        _databaseManager = new PropertiesPrincipalDatabaseManager("default", users);
-
-        _accessManager = new AllowAll();
-
-        _authenticationManager = new PrincipalDatabaseAuthenticationManager(null, null);
-
-        _managedObjectRegistry = new NoopManagedObjectRegistry();
-        _virtualHostRegistry = new VirtualHostRegistry();
-        VirtualHost dummyHost = new VirtualHost("test", getConfiguration());
-        _virtualHostRegistry.registerVirtualHost(dummyHost);
-        _virtualHostRegistry.setDefaultVirtualHostName("test");
-
-        _configuration.addProperty("heartbeat.delay", 10 * 60); // 10 minutes
-
-    }
-
-    public Configuration getConfiguration()
-    {
-        return _configuration;
-    }
-
-
-    public ManagedObjectRegistry getManagedObjectRegistry()
-    {
-        return _managedObjectRegistry;
-    }
-
-    public PrincipalDatabaseManager getDatabaseManager()
-    {
-        return _databaseManager;
-    }
-
-    public AuthenticationManager getAuthenticationManager()
-    {
-        return _authenticationManager;
-    }
-
-    public Collection<String> getVirtualHostNames()
-    {
-        String[] hosts = {"test"};
-        return Arrays.asList(hosts);
-    }
-
-    public VirtualHostRegistry getVirtualHostRegistry()
-    {
-        return _virtualHostRegistry;
-    }
-
-    public AccessManager getAccessManager()
-    {
-        return _accessManager;
-    }
-}
-
-
-
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/ManagedVirtualHost.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/ManagedVirtualHost.java
deleted file mode 100644
index 85d804457e..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/ManagedVirtualHost.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*

- *

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- *

- *   http://www.apache.org/licenses/LICENSE-2.0

- *

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- *

- */

-package org.apache.qpid.server.virtualhost;

-

-import java.io.IOException;

-

-import org.apache.qpid.server.management.MBeanAttribute;

-

-/**

- * The management interface exposed to allow management of an Exchange.

- * @version 0.1

- */

-public interface ManagedVirtualHost

-{

-    static final String TYPE = "VirtualHost";

-

-    /**

-     * Returns the name of the managed virtualHost.

-     * @return the name of the exchange.

-     * @throws java.io.IOException

-     */

-    @MBeanAttribute(name="Name", description= TYPE + " Name")

-    String getName() throws IOException;

-

-

-}

diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java
deleted file mode 100644
index 53844ccc4b..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java
+++ /dev/null
@@ -1,289 +0,0 @@
-/*

- *

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- *

- *   http://www.apache.org/licenses/LICENSE-2.0

- *

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- *

- */

-package org.apache.qpid.server.virtualhost;

-

-import javax.management.NotCompliantMBeanException;

-

-import org.apache.commons.configuration.Configuration;

-import org.apache.log4j.Logger;

-import org.apache.qpid.server.AMQBrokerManagerMBean;

-import org.apache.qpid.server.txn.TransactionManager;

-import org.apache.qpid.server.security.access.AccessManager;

-import org.apache.qpid.server.security.access.AccessManagerImpl;

-import org.apache.qpid.server.security.access.Accessable;

-import org.apache.qpid.server.security.auth.manager.PrincipalDatabaseAuthenticationManager;

-import org.apache.qpid.server.security.auth.manager.AuthenticationManager;

-import org.apache.qpid.server.configuration.Configurator;

-import org.apache.qpid.server.exchange.DefaultExchangeFactory;

-import org.apache.qpid.server.exchange.DefaultExchangeRegistry;

-import org.apache.qpid.server.exchange.ExchangeFactory;

-import org.apache.qpid.server.exchange.ExchangeRegistry;

-import org.apache.qpid.server.management.AMQManagedObject;

-import org.apache.qpid.server.management.ManagedObject;

-import org.apache.qpid.server.queue.DefaultQueueRegistry;

-import org.apache.qpid.server.queue.QueueRegistry;

-import org.apache.qpid.server.registry.ApplicationRegistry;

-import org.apache.qpid.server.store.MessageStore;

-

-public class VirtualHost implements Accessable

-{

-    private static final Logger _logger = Logger.getLogger(VirtualHost.class);

-

-

-    private final String _name;

-

-    private QueueRegistry _queueRegistry;

-

-    private ExchangeRegistry _exchangeRegistry;

-

-    private ExchangeFactory _exchangeFactory;

-

-    private MessageStore _messageStore;

-

-    private TransactionManager _transactionManager;

-

-    protected VirtualHostMBean _virtualHostMBean;

-

-    private AMQBrokerManagerMBean _brokerMBean;

-

-    private AuthenticationManager _authenticationManager;

-

-    private AccessManager _accessManager;

-

-

-    public void setAccessableName(String name)

-    {

-        _logger.warn("Setting Accessable Name for VirualHost is not allowed. ("

-                     + name + ") ignored remains :" + getAccessableName());

-    }

-

-    public String getAccessableName()

-    {

-        return _name;

-    }

-

-

-    /**

-     * Abstract MBean class. This has some of the methods implemented from management intrerface for exchanges. Any

-     * implementaion of an Exchange MBean should extend this class.

-     */

-    public class VirtualHostMBean extends AMQManagedObject implements ManagedVirtualHost

-    {

-        public VirtualHostMBean() throws NotCompliantMBeanException

-        {

-            super(ManagedVirtualHost.class, "VirtualHost");

-        }

-

-        public String getObjectInstanceName()

-        {

-            return _name.toString();

-        }

-

-        public String getName()

-        {

-            return _name.toString();

-        }

-

-        public VirtualHost getVirtualHost()

-        {

-            return VirtualHost.this;

-        }

-

-

-    } // End of MBean class

-

-    /**

-     * Used for testing only

-     * @param name

-     * @param store

-     *

-     * @throws Exception

-     */

-    public VirtualHost(String name, MessageStore store) throws Exception

-    {

-        this(name, null, store);

-    }

-

-    /**

-     * Normal Constructor

-     *

-     * @param name

-     * @param hostConfig

-     *

-     * @throws Exception

-     */

-    public VirtualHost(String name, Configuration hostConfig) throws Exception

-    {

-        this(name, hostConfig, null);

-    }

-

-    private VirtualHost(String name, Configuration hostConfig, MessageStore store) throws Exception

-    {

-        _name = name;

-

-        _virtualHostMBean = new VirtualHostMBean();

-        // This isn't needed to be registered

-        //_virtualHostMBean.register();

-

-        _queueRegistry = new DefaultQueueRegistry(this);

-        _exchangeFactory = new DefaultExchangeFactory(this);

-        _exchangeFactory.initialise(hostConfig);

-        _exchangeRegistry = new DefaultExchangeRegistry(this);

-

-        if (store != null)

-        {

-            _messageStore = store;

-        }

-        else

-        {

-            if (hostConfig == null)

-            {

-                throw new IllegalAccessException("HostConfig and MessageStore cannot be null");

-            }

-            initialiseTransactionManager(hostConfig);

-            initialiseMessageStore(hostConfig);

-        }

-

-        _exchangeRegistry.initialise();

-

-        _authenticationManager = new PrincipalDatabaseAuthenticationManager(name, hostConfig);

-

-        _accessManager = new AccessManagerImpl(name, hostConfig);

-

-        _brokerMBean = new AMQBrokerManagerMBean(_virtualHostMBean);

-        _brokerMBean.register();

-    }

-

-    private void initialiseMessageStore(Configuration config) throws Exception

-    {

-        String messageStoreClass = config.getString("store.class");

-

-        Class clazz = Class.forName(messageStoreClass);

-        Object o = clazz.newInstance();

-

-        if (!(o instanceof MessageStore))

-        {

-            throw new ClassCastException("Message store class must implement " + MessageStore.class + ". Class " + clazz +

-                                         " does not.");

-        }

-        _messageStore = (MessageStore) o;

-          //DTX MessageStore

-//        _messageStore.configure(this, _transactionManager, "store", config);

-        _messageStore.configure(this, "store", config);

-    }

-

-    private void initialiseTransactionManager(Configuration config) throws Exception

-    {

-        String transactionManagerClass = config.getString("txn.class");

-        Class clazz = Class.forName(transactionManagerClass);

-        Object o = clazz.newInstance();

-

-        if (!(o instanceof TransactionManager))

-        {

-            throw new ClassCastException("Transaction Manager class must implement " + TransactionManager.class + ". Class " + clazz +

-                                         " does not.");

-        }

-        _transactionManager = (TransactionManager) o;

-    }

-

-

-    public <T> T getConfiguredObject(Class<T> instanceType, Configuration config)

-    {

-        T instance;

-        try

-        {

-            instance = instanceType.newInstance();

-        }

-        catch (Exception e)

-        {

-            _logger.error("Unable to instantiate configuration class " + instanceType + " - ensure it has a public default constructor");

-            throw new IllegalArgumentException("Unable to instantiate configuration class " + instanceType + " - ensure it has a public default constructor", e);

-        }

-        Configurator.configure(instance);

-

-        return instance;

-    }

-

-

-    public String getName()

-    {

-        return _name;

-    }

-

-    public QueueRegistry getQueueRegistry()

-    {

-        return _queueRegistry;

-    }

-

-    public ExchangeRegistry getExchangeRegistry()

-    {

-        return _exchangeRegistry;

-    }

-

-    public ExchangeFactory getExchangeFactory()

-    {

-        return _exchangeFactory;

-    }

-

-    public ApplicationRegistry getApplicationRegistry()

-    {

-        throw new UnsupportedOperationException();

-    }

-

-    public MessageStore getMessageStore()

-    {

-        return _messageStore;

-    }

-

-    public TransactionManager getTransactionManager()

-    {

-        return _transactionManager;

-    }

-

-    public AuthenticationManager getAuthenticationManager()

-    {

-        return _authenticationManager;

-    }

-

-    public AccessManager getAccessManager()

-    {

-        return _accessManager;

-    }

-

-    public void close() throws Exception

-    {

-        if (_messageStore != null)

-        {

-            _messageStore.close();

-        }

-    }

-

-    public ManagedObject getBrokerMBean()

-    {

-        return _brokerMBean;

-    }

-

-    public ManagedObject getManagedObject()

-    {

-        return _virtualHostMBean;

-    }

-}

-

diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostRegistry.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostRegistry.java
deleted file mode 100644
index 27917fac8a..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostRegistry.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*

- *

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- *

- *   http://www.apache.org/licenses/LICENSE-2.0

- *

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- *

- */

-package org.apache.qpid.server.virtualhost;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Map;

-import java.util.concurrent.ConcurrentHashMap;

-

-

-public class VirtualHostRegistry

-{

-    private final Map<String, VirtualHost> _registry = new ConcurrentHashMap<String,VirtualHost>();

-

-

-    private String _defaultVirtualHostName;

-

-    public synchronized void registerVirtualHost(VirtualHost host) throws Exception

-    {

-        if(_registry.containsKey(host.getName()))

-        {

-            throw new Exception("Virtual Host with name " + host.getName() + " already registered.");

-        }

-        _registry.put(host.getName(),host);

-    }

-

-    public VirtualHost getVirtualHost(String name)

-    {

-        if(name == null || name.trim().length() == 0 )

-        {

-            name = getDefaultVirtualHostName();

-        }

-

-        return _registry.get(name);

-    }

-

-    private String getDefaultVirtualHostName()

-    {

-        return _defaultVirtualHostName;

-    }

-

-    public void setDefaultVirtualHostName(String defaultVirtualHostName)

-    {

-        _defaultVirtualHostName = defaultVirtualHostName;

-    }

-

-

-    public Collection<VirtualHost> getVirtualHosts()

-    {

-        return new ArrayList<VirtualHost>(_registry.values());

-    }

-}

diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/MessageStoreTool.java b/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/MessageStoreTool.java
deleted file mode 100644
index edc900f401..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/MessageStoreTool.java
+++ /dev/null
@@ -1,652 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- *
- *
- */
-package org.apache.qpid.tools.messagestore;
-
-import org.apache.commons.cli.Option;
-import org.apache.commons.cli.OptionBuilder;
-import org.apache.commons.configuration.ConfigurationException;
-import org.apache.qpid.configuration.Configuration;
-import org.apache.qpid.server.exchange.Exchange;
-import org.apache.qpid.server.queue.AMQQueue;
-import org.apache.qpid.server.registry.ApplicationRegistry;
-import org.apache.qpid.server.registry.ConfigurationFileApplicationRegistry;
-import org.apache.qpid.server.store.MemoryMessageStore;
-import org.apache.qpid.server.virtualhost.VirtualHost;
-import org.apache.qpid.tools.messagestore.commands.Clear;
-import org.apache.qpid.tools.messagestore.commands.Command;
-import org.apache.qpid.tools.messagestore.commands.Copy;
-import org.apache.qpid.tools.messagestore.commands.Dump;
-import org.apache.qpid.tools.messagestore.commands.Help;
-import org.apache.qpid.tools.messagestore.commands.List;
-import org.apache.qpid.tools.messagestore.commands.Load;
-import org.apache.qpid.tools.messagestore.commands.Quit;
-import org.apache.qpid.tools.messagestore.commands.Select;
-import org.apache.qpid.tools.messagestore.commands.Show;
-import org.apache.qpid.tools.messagestore.commands.Move;
-import org.apache.qpid.tools.messagestore.commands.Purge;
-import org.apache.qpid.tools.utils.CommandParser;
-import org.apache.qpid.tools.utils.Console;
-import org.apache.qpid.tools.utils.SimpleCommandParser;
-import org.apache.qpid.tools.utils.SimpleConsole;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileReader;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.Map;
-import java.util.StringTokenizer;
-
-/**
- * MessageStoreTool.
- */
-public class MessageStoreTool
-{
-    /** Text outputted at the start of each console.*/
-    private static final String BOILER_PLATE = "MessageStoreTool - for examining Persistent Qpid Broker MessageStore instances";
-
-    /** I/O Wrapper. */
-    protected Console _console;
-
-    /** Batch mode flag. */
-    protected boolean _batchMode;
-
-    /** Internal State object. */
-    private State _state = new State();
-
-    private HashMap<String, Command> _commands = new HashMap<String, Command>();
-
-    /** SLF4J Logger. */
-    private static Logger _devlog = LoggerFactory.getLogger(MessageStoreTool.class);
-
-    /** Loaded configuration file. */
-    private Configuration _config;
-
-    /** Control used for main run loop. */
-    private boolean _running = true;
-    private boolean _initialised = false;
-
-    //---------------------------------------------------------------------------------------------------/
-
-    public static void main(String[] args) throws Configuration.InitException
-    {
-
-        MessageStoreTool tool = new MessageStoreTool(args);
-
-        tool.start();
-    }
-
-
-    public MessageStoreTool(String[] args) throws Configuration.InitException
-    {
-        this(args, System.in, System.out);
-    }
-
-    public MessageStoreTool(String[] args, InputStream in, OutputStream out) throws Configuration.InitException
-    {
-        BufferedReader consoleReader = new BufferedReader(new InputStreamReader(in));
-        BufferedWriter consoleWriter = new BufferedWriter(new OutputStreamWriter(out));
-
-        Runtime.getRuntime().addShutdownHook(new Thread(new ShutdownHook(this)));
-        _batchMode = false;
-
-        _console = new SimpleConsole(consoleWriter, consoleReader);
-
-        _config = new Configuration();
-
-        setOptions();
-        _config.processCommandline(args);
-    }
-
-
-    private void setOptions()
-    {
-        Option help = new Option("h", "help", false, "print this message");
-        Option version = new Option("v", "version", false, "print the version information and exit");
-        Option configFile =
-                OptionBuilder.withArgName("file").hasArg()
-                        .withDescription("use given configuration file By "
-                                         + "default looks for a file named "
-                                         + Configuration.DEFAULT_CONFIG_FILE + " in " + Configuration.QPID_HOME)
-                        .withLongOpt("config")
-                        .create("c");
-
-        _config.setOption(help);
-        _config.setOption(version);
-        _config.setOption(configFile);
-    }
-
-    public State getState()
-    {
-        return _state;
-    }
-
-    public Map<String, Command> getCommands()
-    {
-        return _commands;
-    }
-
-    public void setConfigurationFile(String configfile) throws Configuration.InitException
-    {
-        _config.loadConfig(new File(configfile));
-        setup();
-    }
-
-    public Console getConsole()
-    {
-        return _console;
-    }
-
-    public void setConsole(Console console)
-    {
-        _console = console;
-    }
-
-    /**
-     * Simple ShutdownHook to cleanly shutdown the databases
-     */
-    class ShutdownHook implements Runnable
-    {
-        MessageStoreTool _tool;
-
-        ShutdownHook(MessageStoreTool messageStoreTool)
-        {
-            _tool = messageStoreTool;
-        }
-
-        public void run()
-        {
-            _tool.quit();
-        }
-    }
-
-    public void quit()
-    {
-        _running = false;
-
-        if (_initialised)
-        {
-            ApplicationRegistry.remove(1);
-        }
-
-        _console.println("...exiting");
-
-        _console.close();
-    }
-
-    public void setBatchMode(boolean batchmode)
-    {
-        _batchMode = batchmode;
-    }
-
-    /**
-     * Main loop
-     */
-    protected void start()
-    {
-        setup();
-
-        if (!_initialised)
-        {
-            System.exit(1);
-        }
-
-        _console.println("");
-
-        _console.println(BOILER_PLATE);        
-
-        runCLI();
-    }
-
-    private void setup()
-    {
-        loadDefaultVirtualHosts();
-
-        loadCommands();
-
-        _state.clearAll();
-    }
-
-    private void loadCommands()
-    {
-        _commands.clear();
-        //todo Dynamically load the classes that exis in com.redhat.etp.qpid.commands
-        _commands.put("close", new Clear(this));
-        _commands.put("copy", new Copy(this));
-        _commands.put("dump", new Dump(this));
-        _commands.put("help", new Help(this));
-        _commands.put("list", new List(this));
-        _commands.put("load", new Load(this));
-        _commands.put("move", new Move(this));
-        _commands.put("purge", new Purge(this));
-        _commands.put("quit", new Quit(this));
-        _commands.put("select", new Select(this));
-        _commands.put("show", new Show(this));
-    }
-
-    private void loadDefaultVirtualHosts()
-    {
-        final File configFile = _config.getConfigFile();
-
-        loadVirtualHosts(configFile);
-    }
-
-    private void loadVirtualHosts(File configFile)
-    {
-
-        if (!configFile.exists())
-        {
-            _devlog.error("Config file not found:" + configFile.getAbsolutePath());
-            return;
-        }
-        else
-        {
-            _devlog.debug("using config file :" + configFile.getAbsolutePath());
-        }
-
-        try
-        {
-            ConfigurationFileApplicationRegistry registry = new ConfigurationFileApplicationRegistry(configFile);
-
-            ApplicationRegistry.remove(1);
-
-            ApplicationRegistry.initialise(registry);
-
-            checkMessageStores();
-            _initialised = true;
-        }
-        catch (ConfigurationException e)
-        {
-            _console.println("Unable to load configuration due to configuration error: " + e.getMessage());
-            e.printStackTrace();
-        }
-        catch (Exception e)
-        {
-            _console.println("Unable to load configuration due to: " + e.getMessage());
-            e.printStackTrace();
-        }
-
-
-    }
-
-    private void checkMessageStores()
-    {
-        Collection<VirtualHost> vhosts = ApplicationRegistry.getInstance().getVirtualHostRegistry().getVirtualHosts();
-
-        boolean warning = false;
-        for (VirtualHost vhost : vhosts)
-        {
-            if (vhost.getMessageStore() instanceof MemoryMessageStore)
-            {
-                _console.println("WARNING: Virtualhost '" + vhost.getName() + "' is using a MemoryMessageStore. "
-                                 + "Changes will not persist.");
-                warning = true;
-            }
-        }
-
-        if (warning)
-        {
-            _console.println("");
-            _console.println("Please ensure you are using the correct config file currently using '"
-                             + _config.getConfigFile().getAbsolutePath() + "'");
-            _console.println("New config file can be specifed by 'load <config file>' or -c on the commandline.");
-            _console.println("");
-        }
-    }
-
-    private void runCLI()
-    {
-        while (_running)
-        {
-            if (!_batchMode)
-            {
-                printPrompt();
-            }
-
-            String[] args = _console.readCommand();
-
-            while (args != null)
-            {
-                exec(args);
-
-                if (_running)
-                {
-                    if (!_batchMode)
-                    {
-                        printPrompt();
-                    }
-
-                    args = _console.readCommand();
-                }
-            }
-        }
-    }
-
-    private void printPrompt()
-    {
-        _console.print(prompt());
-    }
-
-
-    /**
-     * Execute a script (batch mode).
-     *
-     * @param script The file script
-     */
-    protected void runScripts(String script)
-    {
-        //Store Current State
-        boolean oldBatch = _batchMode;
-        CommandParser oldParser = _console.getCommandParser();
-        setBatchMode(true);
-
-        try
-        {
-            _devlog.debug("Running script '" + script + "'");
-
-            _console.setCommandParser(new SimpleCommandParser(new BufferedReader(new FileReader(script))));
-
-            start();
-        }
-        catch (java.io.FileNotFoundException e)
-        {
-            _devlog.error("Script not found: '" + script + "' due to:" + e.getMessage());
-        }
-
-        //Restore previous state
-        _console.setCommandParser(oldParser);
-        setBatchMode(oldBatch);
-    }
-
-    public String prompt()
-    {
-        String state = _state.toString();
-        if (state != null && state.length() != 0)
-        {
-            return state + ":bdb$ ";
-        }
-        else
-        {
-            return "bdb$ ";
-        }
-    }
-
-    /**
-     * Execute the command.
-     *
-     * @param args [command, arg0, arg1...].
-     */
-    protected void exec(String[] args)
-    {
-        // Comment lines start with a #
-        if (args.length == 0 || args[0].startsWith("#"))
-        {
-            return;
-        }
-
-        final String command = args[0];
-
-        Command cmd = _commands.get(command);
-
-        if (cmd == null)
-        {
-            _console.println("Command not understood: " + command);
-        }
-        else
-        {
-            cmd.execute(args);
-        }
-    }
-
-
-    /**
-     * Displays usage info.
-     */
-    protected static void help()
-    {
-        System.out.println(BOILER_PLATE);
-        System.out.println("Usage: java " + MessageStoreTool.class + " [Options]");
-        System.out.println("       [-c <broker config file>] : Defaults to \"$QPID_HOME/etc/config.xml\"");
-    }
-
-
-    /**
-     * This class is used to store the current state of the tool.
-     *
-     * This is then interrogated by the various commands to augment their behaviour.
-     *
-     *
-     */
-    public class State
-    {
-        private VirtualHost _vhost = null;
-        private AMQQueue _queue = null;
-        private Exchange _exchange = null;
-        private java.util.List<Long> _msgids = null;
-
-        public State()
-        {
-        }
-
-        public void setQueue(AMQQueue queue)
-        {
-            _queue = queue;
-        }
-
-        public AMQQueue getQueue()
-        {
-            return _queue;
-        }
-
-        public void setVhost(VirtualHost vhost)
-        {
-            _vhost = vhost;
-        }
-
-        public VirtualHost getVhost()
-        {
-            return _vhost;
-        }
-
-        public Exchange getExchange()
-        {
-            return _exchange;
-        }
-
-        public void setExchange(Exchange exchange)
-        {
-            _exchange = exchange;
-        }
-
-        public String toString()
-        {
-            StringBuilder status = new StringBuilder();
-
-            if (_vhost != null)
-            {
-                status.append(_vhost.getName());
-
-                if (_exchange != null)
-                {
-                    status.append("[");
-                    status.append(_exchange.getName());
-                    status.append("]");
-
-                    if (_queue != null)
-                    {
-                        status.append("->'");
-                        status.append(_queue.getName());
-                        status.append("'");
-
-                        if (_msgids != null)
-                        {
-                            status.append(printMessages());
-                        }
-                    }
-                }
-            }
-
-            return status.toString();
-        }
-
-
-        public String printMessages()
-        {
-            StringBuilder sb = new StringBuilder();
-
-            Long previous = null;
-
-            Long start = null;
-            for (Long id : _msgids)
-            {
-                if (previous != null)
-                {
-                    if (id == previous + 1)
-                    {
-                        if (start == null)
-                        {
-                            start = previous;
-                        }
-                    }
-                    else
-                    {
-                        if (start != null)
-                        {
-                            sb.append(",");
-                            sb.append(start);
-                            sb.append("-");
-                            sb.append(id);
-                            start = null;
-                        }
-                        else
-                        {
-                            sb.append(",");
-                            sb.append(previous);
-                        }
-                    }
-                }
-
-                previous = id;
-            }
-
-            if (start != null)
-            {
-                sb.append(",");
-                sb.append(start);
-                sb.append("-");
-                sb.append(_msgids.get(_msgids.size() - 1));
-            }
-            else
-            {
-                sb.append(",");
-                sb.append(previous);
-            }
-
-            // surround list in ()
-            sb.replace(0, 1, "(");
-            sb.append(")");
-            return sb.toString();
-        }
-
-        public void clearAll()
-        {
-            _vhost = null;
-            clearExchange();
-        }
-
-        public void clearExchange()
-        {
-            _exchange = null;
-            clearQueue();
-        }
-
-        public void clearQueue()
-        {
-            _queue = null;
-            clearMessages();
-        }
-
-        public void clearMessages()
-        {
-            _msgids = null;
-        }
-
-        /**
-         * A common location to provide parsing of the message id string
-         * utilised by a number of the commands.
-         * The String is comma separated list of ids that can be individual ids
-         * or a range (4-10)
-         *
-         * @param msgString string of msg ids to parse 1,2,4-10
-         */
-        public void setMessages(String msgString)
-        {
-            StringTokenizer tok = new StringTokenizer(msgString, ",");
-
-            if (tok.hasMoreTokens())
-            {
-                _msgids = new LinkedList<Long>();
-            }
-
-            while (tok.hasMoreTokens())
-            {
-                String next = tok.nextToken();
-                if (next.contains("-"))
-                {
-                    Long start = Long.parseLong(next.substring(0, next.indexOf("-")));
-                    Long end = Long.parseLong(next.substring(next.indexOf("-") + 1));
-
-                    if (end >= start)
-                    {
-                        for (long l = start; l <= end; l++)
-                        {
-                            _msgids.add(l);
-                        }
-                    }
-                }
-                else
-                {
-                    _msgids.add(Long.parseLong(next));
-                }
-            }
-
-        }
-
-        public void setMessages(java.util.List<Long> msgids)
-        {
-            _msgids = msgids;
-        }
-
-        public java.util.List<Long> getMessages()
-        {
-            return _msgids;
-        }
-    }//Class State
-
-}//Class MessageStoreTool
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/AbstractCommand.java b/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/AbstractCommand.java
deleted file mode 100644
index 5444197cb4..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/AbstractCommand.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.    
- *
- * 
- */
-package org.apache.qpid.tools.messagestore.commands;
-
-import org.apache.qpid.tools.messagestore.MessageStoreTool;
-import org.apache.qpid.tools.utils.Console;
-
-public abstract class AbstractCommand implements Command
-{
-    protected Console _console;
-    protected MessageStoreTool _tool;
-
-    public AbstractCommand(MessageStoreTool tool)
-    {
-        _console = tool.getConsole();
-        _tool = tool;
-    }
-
-    public void setOutput(Console out)
-    {
-        _console = out;
-    }
-
-    protected void commandError(String message, String[] args)
-    {
-        _console.print(getCommand() + " : " + message);
-
-        if (args != null)
-        {
-            for (int i = 1; i < args.length; i++)
-            {
-                _console.print(args[i]);
-            }
-        }
-        _console.println("");
-        _console.println(help());
-    }
-
-
-    public abstract String help();
-
-    public abstract String usage();
-
-    public abstract String getCommand();
-
-
-    public abstract void execute(String... args);
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Clear.java b/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Clear.java
deleted file mode 100644
index b0006b3fe6..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Clear.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- *
- *
- */
-package org.apache.qpid.tools.messagestore.commands;
-
-import org.apache.qpid.tools.messagestore.MessageStoreTool;
-
-public class Clear extends AbstractCommand
-{
-    public Clear(MessageStoreTool tool)
-    {
-        super(tool);
-    }
-
-    public String help()
-    {
-        return "Clears any selection.";
-    }
-
-    public String usage()
-    {
-        return "clear [ all | virtualhost | exchange | queue | msgs ]";
-    }
-
-    public String getCommand()
-    {
-        return "clear";
-    }
-
-    public void execute(String... args)
-    {
-        assert args.length > 0;
-        assert args[0].equals(getCommand());
-
-        if (args.length < 1)
-        {
-            doClose("all");
-        }
-        else
-        {
-            doClose(args[1]);
-        }
-    }
-
-    private void doClose(String type)
-    {
-        if (type.equals("virtualhost")
-            || type.equals("all"))
-        {
-            _tool.getState().clearAll();
-        }
-
-        if (type.equals("exchange"))
-        {
-            _tool.getState().clearExchange();
-        }
-
-        if (type.equals("queue"))
-        {
-            _tool.getState().clearQueue();
-        }
-
-        if (type.equals("msgs"))
-        {
-            _tool.getState().clearMessages();
-        }
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Command.java b/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Command.java
deleted file mode 100644
index bfa775a34a..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Command.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.    
- *
- * 
- */
-package org.apache.qpid.tools.messagestore.commands;
-
-import org.apache.qpid.tools.utils.Console;
-
-public interface Command
-{
-    public void setOutput(Console out);
-
-    public String help();
-
-    public abstract String usage();        
-
-    String getCommand();
-
-    public void execute(String... args);
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Copy.java b/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Copy.java
deleted file mode 100644
index a5b3a87616..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Copy.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.    
- *
- * 
- */
-package org.apache.qpid.tools.messagestore.commands;
-
-import org.apache.qpid.server.queue.AMQQueue;
-import org.apache.qpid.tools.messagestore.MessageStoreTool;
-
-public class Copy extends Move
-{
-    public Copy(MessageStoreTool tool)
-    {
-        super(tool);
-    }
-
-    public String help()
-    {
-        return "Copy messages between queues.";/*\n" +
-               "The currently selected message set will be copied to the specifed queue.\n" +
-               "Alternatively the values can be provided on the command line."; */
-    }
-
-    public String usage()
-    {
-        return "copy to=<queue> [from=<queue>] [msgids=<msgids eg, 1,2,4-10>]";
-    }
-
-    public String getCommand()
-    {
-        return "copy";
-    }
-
-    protected void doCommand(AMQQueue fromQueue, long start, long end, AMQQueue toQueue)
-    {
-        fromQueue.copyMessagesToAnotherQueue(start, end, toQueue.getName().toString(), _storeContext);
-    }
-
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Dump.java b/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Dump.java
deleted file mode 100644
index a0fe54994b..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Dump.java
+++ /dev/null
@@ -1,299 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- *
- *
- */
-package org.apache.qpid.tools.messagestore.commands;
-
-import org.apache.commons.codec.binary.Hex;
-import org.apache.mina.common.ByteBuffer;
-import org.apache.qpid.framing.abstraction.ContentChunk;
-import org.apache.qpid.server.queue.AMQMessage;
-import org.apache.qpid.tools.messagestore.MessageStoreTool;
-import org.apache.qpid.tools.utils.Console;
-
-import java.io.UnsupportedEncodingException;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-
-public class Dump extends Show
-{
-    private static final int LINE_SIZE = 8;
-    private static final String DEFAULT_ENCODING = "utf-8";
-    private static final boolean SPACE_BYTES = true;
-    private static final String BYTE_SPACER = " ";
-    private static final String NON_PRINTING_ASCII_CHAR = "?";
-
-    protected boolean _content = true;
-
-    public Dump(MessageStoreTool tool)
-    {
-        super(tool);
-    }
-
-    public String help()
-    {
-        return "Dump selected message content. Default: show=content";
-    }
-
-    public String usage()
-    {
-        return getCommand() + " [show=[all],[msgheaders],[_amqHeaders],[routing],[content]] [id=<msgid e.g. 1,2,4-10>]";
-    }
-
-    public String getCommand()
-    {
-        return "dump";
-    }
-
-    public void execute(String... args)
-    {
-        assert args.length > 0;
-        assert args[0].equals(getCommand());
-
-
-        if (args.length >= 2)
-        {
-            for (String arg : args)
-            {
-                if (arg.startsWith("show="))
-                {
-                    _content = arg.contains("content") || arg.contains("all");
-                }
-            }
-
-            parseArgs(args);
-        }
-
-        performShow();
-    }
-
-
-    protected List<List> createMessageData(java.util.List<Long> msgids, List<AMQMessage> messages, boolean showHeaders, boolean showRouting,
-                                           boolean showMessageHeaders)
-    {
-
-        List<List> display = new LinkedList<List>();
-
-        List<String> hex = new LinkedList<String>();
-        List<String> ascii = new LinkedList<String>();
-        display.add(hex);
-        display.add(ascii);
-
-        for (AMQMessage msg : messages)
-        {
-            if (!includeMsg(msg, msgids))
-            {
-                continue;
-            }
-
-            //Add divider between messages
-            hex.add(Console.ROW_DIVIDER);
-            ascii.add(Console.ROW_DIVIDER);
-
-            // Show general message information
-            hex.add(Show.Columns.ID.name());
-            ascii.add("" +msg.getMessageId());
-
-            hex.add(Console.ROW_DIVIDER);
-            ascii.add(Console.ROW_DIVIDER);
-
-            if (showRouting)
-            {
-                addShowInformation(hex, ascii, msg, "Routing Details", true, false, false);
-            }
-            if (showHeaders)
-            {
-                addShowInformation(hex, ascii, msg, "Headers", false, true, false);
-            }
-            if (showMessageHeaders)
-            {
-                addShowInformation(hex, ascii, msg, null, false, false, true);
-            }
-
-            // Add Content Body seciont
-            hex.add("Content Body");
-            ascii.add("");
-            hex.add(Console.ROW_DIVIDER);
-            ascii.add(Console.ROW_DIVIDER);
-
-            Iterator bodies = msg.getContentBodyIterator();
-            if (bodies.hasNext())
-            {
-
-                hex.add("Hex");
-                hex.add(Console.ROW_DIVIDER);
-
-
-                ascii.add("ASCII");
-                ascii.add(Console.ROW_DIVIDER);
-
-                while (bodies.hasNext())
-                {
-                    ContentChunk chunk = (ContentChunk) bodies.next();
-
-                    //Duplicate so we don't destroy original data :)
-                    ByteBuffer hexBuffer = chunk.getData().duplicate();
-
-                    ByteBuffer charBuffer = hexBuffer.duplicate();
-
-                    Hex hexencoder = new Hex();
-
-                    while (hexBuffer.hasRemaining())
-                    {
-                        byte[] line = new byte[LINE_SIZE];
-
-                        int bufsize = hexBuffer.remaining();
-                        if (bufsize < LINE_SIZE)
-                        {
-                            hexBuffer.get(line, 0, bufsize);
-                        }
-                        else
-                        {
-                            bufsize = line.length;
-                            hexBuffer.get(line);
-                        }
-
-                        byte[] encoded = hexencoder.encode(line);
-
-                        try
-                        {
-                            String encStr = new String(encoded, 0, bufsize * 2, DEFAULT_ENCODING);
-                            String hexLine = "";
-
-                            int strKength = encStr.length();
-                            for (int c = 0; c < strKength; c++)
-                            {
-                                hexLine += encStr.charAt(c);
-
-                                if (c % 2 == 1 && SPACE_BYTES)
-                                {
-                                    hexLine += BYTE_SPACER;
-                                }
-                            }
-
-                            hex.add(hexLine);
-                        }
-                        catch (UnsupportedEncodingException e)
-                        {
-                            _console.println(e.getMessage());
-                            return null;
-                        }
-                    }
-
-                    while (charBuffer.hasRemaining())
-                    {
-                        String asciiLine = "";
-
-                        for (int pos = 0; pos < LINE_SIZE; pos++)
-                        {
-                            if (charBuffer.hasRemaining())
-                            {
-                                byte ch = charBuffer.get();
-
-                                if (isPrintable(ch))
-                                {
-                                    asciiLine += (char) ch;
-                                }
-                                else
-                                {
-                                    asciiLine += NON_PRINTING_ASCII_CHAR;
-                                }
-
-                                if (SPACE_BYTES)
-                                {
-                                    asciiLine += BYTE_SPACER;
-                                }
-                            }
-                            else
-                            {
-                                break;
-                            }
-                        }
-
-                        ascii.add(asciiLine);
-                    }
-                }
-            }
-            else
-            {
-                List<String> result = new LinkedList<String>();
-
-                display.add(result);
-                result.add("No ContentBodies");
-            }
-        }
-
-        // if hex is empty then we have no data to display
-        if (hex.size() == 0)
-        {
-            return null;
-        }
-
-        return display;
-    }
-
-    private void addShowInformation(List<String> column1, List<String> column2, AMQMessage msg,
-                                    String title, boolean routing, boolean headers, boolean messageHeaders)
-    {
-        List<AMQMessage> single = new LinkedList<AMQMessage>();
-        single.add(msg);
-
-        List<List> routingData = super.createMessageData(null, single, headers, routing, messageHeaders);
-
-        //Reformat data
-        if (title != null)
-        {
-            column1.add(title);
-            column2.add("");
-            column1.add(Console.ROW_DIVIDER);
-            column2.add(Console.ROW_DIVIDER);
-        }
-
-        // look at all columns in the routing Data
-        for (List item : routingData)
-        {
-            // the item should be:
-            //   Title
-            //   *divider
-            //   value
-            // otherwise we can't reason about the correct value
-            if (item.size() == 3)
-            {
-                //Filter out the columns we are not interested in.
-
-                String columnName = item.get(0).toString();
-
-                if (!(columnName.equals(Show.Columns.ID.name())
-                      || columnName.equals(Show.Columns.Size.name())))
-                {
-                    column1.add(columnName);
-                    column2.add(item.get(2).toString());
-                }
-            }
-        }
-        column1.add(Console.ROW_DIVIDER);
-        column2.add(Console.ROW_DIVIDER);
-    }
-
-    private boolean isPrintable(byte c)
-    {
-        return c > 31 && c < 127;
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Help.java b/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Help.java
deleted file mode 100644
index 0f9546541b..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Help.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.    
- *
- * 
- */
-package org.apache.qpid.tools.messagestore.commands;
-
-import org.apache.qpid.tools.messagestore.MessageStoreTool;
-import org.apache.qpid.tools.utils.Console;
-
-import java.util.LinkedList;
-import java.util.Map;
-
-public class Help extends AbstractCommand
-{
-    public Help(MessageStoreTool tool)
-    {
-        super(tool);
-    }
-
-    public String help()
-    {
-        return "Provides detailed help on commands.";
-    }
-
-    public String getCommand()
-    {
-        return "help";
-    }
-
-    public String usage()
-    {
-        return "help [<command>]";
-    }
-
-    public void execute(String... args)
-    {
-        assert args.length > 0;
-        assert args[0].equals(getCommand());
-
-        if (args.length > 1)
-        {
-            Command command = _tool.getCommands().get(args[1]);
-            if (command != null)
-            {
-                _console.println(command.help());
-                _console.println("Usage:" + command.usage());
-            }
-            else
-            {
-                commandError("Command not found: ", args);
-            }
-        }
-        else
-        {
-            java.util.List<java.util.List> data = new LinkedList<java.util.List>();
-
-            java.util.List<String> commandName = new LinkedList<String>();
-            java.util.List<String> commandDescription = new LinkedList<String>();
-
-            data.add(commandName);
-            data.add(commandDescription);
-
-            //Set up Headers
-            commandName.add("Command");
-            commandDescription.add("Description");
-
-            commandName.add(Console.ROW_DIVIDER);
-            commandDescription.add(Console.ROW_DIVIDER);
-
-            //Add current Commands with descriptions
-            Map<String, Command> commands = _tool.getCommands();
-
-            for (Command command : commands.values())
-            {
-                commandName.add(command.getCommand());
-                commandDescription.add(command.help());
-            }
-
-            _console.printMap("Available Commands", data);
-        }
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/List.java b/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/List.java
deleted file mode 100644
index df8b59ec19..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/List.java
+++ /dev/null
@@ -1,314 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.    
- *
- * 
- */
-package org.apache.qpid.tools.messagestore.commands;
-
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.server.exchange.Exchange;
-import org.apache.qpid.server.queue.AMQQueue;
-import org.apache.qpid.server.registry.ApplicationRegistry;
-import org.apache.qpid.server.virtualhost.VirtualHost;
-import org.apache.qpid.tools.messagestore.MessageStoreTool;
-import org.apache.qpid.tools.utils.Console;
-
-import java.util.Collection;
-import java.util.LinkedList;
-
-public class List extends AbstractCommand
-{
-
-    public List(MessageStoreTool tool)
-    {
-        super(tool);
-    }
-
-    public void setOutput(Console out)
-    {
-        _console = out;
-    }
-
-    public String help()
-    {
-        return "list available items.";
-    }
-
-    public String usage()
-    {
-        return "list queues [<exchange>] | exchanges | bindings [<exchange>] | all";
-    }
-
-    public String getCommand()
-    {
-        return "list";
-    }
-
-    public void execute(String... args)
-    {
-        assert args.length > 0;
-        assert args[0].equals(getCommand());
-
-        if (args.length > 1)
-        {
-            if ((args[1].equals("exchanges"))
-                || (args[1].equals("queues"))
-                || (args[1].equals("bindings"))
-                || (args[1].equals("all")))
-            {
-                if (args.length == 2)
-                {
-                    doList(args[1]);
-                }
-                else if (args.length == 3)
-                {
-                    doList(args[1], args[2]);
-                }
-            }
-            else
-            {
-                commandError("Unknown options. ", args);
-            }
-        }
-        else if (args.length < 2)
-        {
-            doList("all");
-        }
-        else
-        {
-            doList(args[1]);
-        }
-    }
-
-    private void doList(String... listItem)
-    {
-        if (_tool.getState().getVhost() == null)
-        {
-            _console.println("No Virtualhost open. Open a Virtualhost first.");
-            listVirtualHosts();
-            return;
-        }
-
-        VirtualHost vhost = _tool.getState().getVhost();
-
-        java.util.List<String> data = null;
-
-        if (listItem[0].equals("queues"))
-        {
-            if (listItem.length > 1)
-            {
-                data = listQueues(vhost, new AMQShortString(listItem[1]));
-            }
-            else
-            {
-                Exchange exchange = _tool.getState().getExchange();
-                data = listQueues(vhost, exchange);
-            }
-        }
-
-        if (listItem[0].equals("exchanges"))
-        {
-            data = listExchanges(vhost);
-        }
-
-        if (listItem[0].equals("bindings"))
-        {
-
-            if (listItem.length > 1)
-            {
-                data = listBindings(vhost, new AMQShortString(listItem[1]));
-            }
-            else
-            {
-                Exchange exchange = _tool.getState().getExchange();
-
-                data = listBindings(vhost, exchange);
-            }
-        }
-
-        if (data != null)
-        {
-            if (data.size() == 1)
-            {
-                _console.println("No '" + listItem[0] + "' to display,");
-            }
-            else
-            {
-                _console.displayList(true, data.toArray(new String[0]));
-            }
-        }
-
-
-        if (listItem[0].equals("all"))
-        {
-
-            boolean displayed = false;
-            Exchange exchange = _tool.getState().getExchange();
-
-            //Do the display here for each one so that they are pretty printed
-            data = listQueues(vhost, exchange);
-            if (data != null)
-            {
-                displayed = true;
-                _console.displayList(true, data.toArray(new String[0]));
-            }
-
-            if (exchange == null)
-            {
-                data = listExchanges(vhost);
-                if (data != null)
-                {
-                    displayed = true;
-                    _console.displayList(true, data.toArray(new String[0]));
-                }
-            }
-
-            data = listBindings(vhost, exchange);
-            if (data != null)
-            {
-                displayed = true;
-                _console.displayList(true, data.toArray(new String[0]));
-            }
-
-            if (!displayed)
-            {
-                _console.println("Nothing to list");
-            }
-        }
-    }
-
-    private void listVirtualHosts()
-    {
-        Collection<VirtualHost> vhosts = ApplicationRegistry.getInstance()
-                .getVirtualHostRegistry().getVirtualHosts();
-
-        String[] data = new String[vhosts.size() + 1];
-
-        data[0] = "Available VirtualHosts";
-
-        int index = 1;
-        for (VirtualHost vhost : vhosts)
-        {
-            data[index] = vhost.getName();
-            index++;
-        }
-
-        _console.displayList(true, data);
-    }
-
-    private java.util.List<String> listBindings(VirtualHost vhost, AMQShortString exchangeName)
-    {
-        return listBindings(vhost, vhost.getExchangeRegistry().getExchange(exchangeName));
-    }
-
-    private java.util.List<String> listBindings(VirtualHost vhost, Exchange exchange)
-    {
-        Collection<AMQShortString> queues = vhost.getQueueRegistry().getQueueNames();
-
-        if (queues == null || queues.size() == 0)
-        {
-            return null;
-        }
-
-        java.util.List<String> data = new LinkedList<String>();
-
-        data.add("Current Bindings");
-
-        for (AMQShortString queue : queues)
-        {
-            if (exchange != null)
-            {
-                if (exchange.isBound(queue))
-                {
-                    data.add(queue.toString());
-                }
-            }
-            else
-            {
-                data.add(queue.toString());
-            }
-        }
-
-        return data;
-    }
-
-    private java.util.List<String> listExchanges(VirtualHost vhost)
-    {
-        Collection<AMQShortString> queues = vhost.getExchangeRegistry().getExchangeNames();
-
-        if (queues == null || queues.size() == 0)
-        {
-            return null;
-        }
-
-        java.util.List<String> data = new LinkedList<String>();
-
-        data.add("Available Exchanges");
-
-        for (AMQShortString queue : queues)
-        {
-            data.add(queue.toString());
-        }
-
-        return data;
-    }
-
-    private java.util.List<String> listQueues(VirtualHost vhost, AMQShortString exchangeName)
-    {
-        return listQueues(vhost, vhost.getExchangeRegistry().getExchange(exchangeName));
-    }
-
-    private java.util.List<String> listQueues(VirtualHost vhost, Exchange exchange)
-    {
-        Collection<AMQQueue> queues = vhost.getQueueRegistry().getQueues();
-
-        if (queues == null || queues.size() == 0)
-        {
-            return null;
-        }
-
-        java.util.List<String> data = new LinkedList<String>();
-
-        data.add("Available Queues");
-
-        for (AMQQueue queue : queues)
-        {
-            if (exchange != null)
-            {
-                if (exchange.isBound(queue))
-                {
-                    data.add(queue.getName().toString());
-                }
-            }
-            else
-            {
-                data.add(queue.getName().toString());
-            }
-        }
-
-        if (exchange != null)
-        {
-            if (queues.size() == 1)
-            {
-                return null;
-            }
-        }
-
-        return data;
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Load.java b/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Load.java
deleted file mode 100644
index 244a311c30..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Load.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.    
- *
- * 
- */
-package org.apache.qpid.tools.messagestore.commands;
-
-import org.apache.qpid.configuration.Configuration;
-import org.apache.qpid.tools.messagestore.MessageStoreTool;
-
-public class Load extends AbstractCommand
-{
-    public Load(MessageStoreTool tool)
-    {
-        super(tool);
-    }
-
-    public String help()
-    {
-        return "Loads specified broker configuration file.";
-    }
-
-    public String usage()
-    {
-        return "load <configuration file>";
-    }
-
-    public String getCommand()
-    {
-        return "load";
-    }
-
-    public void execute(String... args)
-    {
-        assert args.length > 0;
-        assert args[0].equals(getCommand());
-
-        if (args.length > 2)
-        {
-            _console.print("load " + args[1] + ": additional options not understood:");
-            for (int i = 2; i < args.length; i++)
-            {
-                _console.print(args[i] + " ");
-            }
-            _console.println("");
-        }
-        else if (args.length < 2)
-        {
-            _console.println("Enter Configuration file.");
-            String input = _console.readln();
-            if (input != null)
-            {
-                doLoad(input);
-            }
-            else
-            {
-                _console.println("Did not recognise config file.");
-            }
-        }
-        else
-        {
-            doLoad(args[1]);
-        }
-    }
-
-    private void doLoad(String configfile)
-    {
-        _console.println("Loading Configuration:" + configfile);
-
-        try
-        {
-            _tool.setConfigurationFile(configfile);
-        }
-        catch (Configuration.InitException e)
-        {
-            _console.println("Unable to open config file due to: '" + e.getMessage() + "'");
-        }
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Move.java b/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Move.java
deleted file mode 100644
index 25cff27445..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Move.java
+++ /dev/null
@@ -1,205 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.    
- *
- * 
- */
-package org.apache.qpid.tools.messagestore.commands;
-
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.server.queue.AMQMessage;
-import org.apache.qpid.server.queue.AMQQueue;
-import org.apache.qpid.server.store.StoreContext;
-import org.apache.qpid.tools.messagestore.MessageStoreTool;
-
-import java.util.LinkedList;
-import java.util.List;
-
-public class Move extends AbstractCommand
-{
-
-    /**
-     * Since the Coopy command is not associated with a real channel we can safely create our own store context
-     * for use in the few methods that require one.
-     */
-    protected StoreContext _storeContext = new StoreContext();
-
-    public Move(MessageStoreTool tool)
-    {
-        super(tool);
-    }
-
-    public String help()
-    {
-        return "Move messages between queues.";/*\n" +
-               "The currently selected message set will be moved to the specifed queue.\n" +
-               "Alternatively the values can be provided on the command line.";*/
-    }
-
-    public String usage()
-    {
-        return "move to=<queue> [from=<queue>] [msgids=<msgids eg, 1,2,4-10>]";
-    }
-
-    public String getCommand()
-    {
-        return "move";
-    }
-
-    public void execute(String... args)
-    {
-        AMQQueue toQueue = null;
-        AMQQueue fromQueue = _tool.getState().getQueue();
-        java.util.List<Long> msgids = _tool.getState().getMessages();
-
-        if (args.length >= 2)
-        {
-            for (String arg : args)
-            {
-                if (arg.startsWith("to="))
-                {
-                    String queueName = arg.substring(arg.indexOf("=") + 1);
-                    toQueue = _tool.getState().getVhost().getQueueRegistry().getQueue(new AMQShortString(queueName));
-                }
-
-                if (arg.startsWith("from="))
-                {
-                    String queueName = arg.substring(arg.indexOf("=") + 1);
-                    fromQueue = _tool.getState().getVhost().getQueueRegistry().getQueue(new AMQShortString(queueName));
-                }
-
-                if (arg.startsWith("msgids="))
-                {
-                    String msgidStr = arg.substring(arg.indexOf("=") + 1);
-
-                    // Record the current message selection
-                    java.util.List<Long> currentIDs = _tool.getState().getMessages();
-
-                    // Use the ToolState class to perform the messasge parsing
-                    _tool.getState().setMessages(msgidStr);
-                    msgids = _tool.getState().getMessages();
-
-                    // Reset the original selection of messages
-                    _tool.getState().setMessages(currentIDs);
-                }
-            }
-        }
-
-        if (!checkRequirements(fromQueue, toQueue, msgids))
-        {
-            return;
-        }
-
-        processIDs(fromQueue, toQueue, msgids);
-    }
-
-    private void processIDs(AMQQueue fromQueue, AMQQueue toQueue, java.util.List<Long> msgids)
-    {
-        Long previous = null;
-        Long start = null;
-
-        if (msgids == null)
-        {
-            msgids = allMessageIDs(fromQueue);
-        }
-
-        if (msgids == null || msgids.size() == 0)
-        {
-            _console.println("No Messages to move.");
-            return;
-        }
-
-        for (long id : msgids)
-        {
-            if (previous != null)
-            {
-                if (id == previous + 1)
-                {
-                    if (start == null)
-                    {
-                        start = previous;
-                    }
-                }
-                else
-                {
-                    if (start != null)
-                    {
-                        //move a range of ids
-                        doCommand(fromQueue, start, id, toQueue);
-                        start = null;
-                    }
-                    else
-                    {
-                        //move a single id
-                        doCommand(fromQueue, id, id, toQueue);
-                    }
-                }
-            }
-
-            previous = id;
-        }
-
-        if (start != null)
-        {
-            //move a range of ids
-            doCommand(fromQueue, start, previous, toQueue);
-        }
-    }
-
-    private List<Long> allMessageIDs(AMQQueue fromQueue)
-    {
-        List<Long> ids = new LinkedList<Long>();
-
-        if (fromQueue != null)
-        {
-            List<AMQMessage> messages = fromQueue.getMessagesOnTheQueue();
-            if (messages != null)
-            {
-                for (AMQMessage msg : messages)
-                {
-                    ids.add(msg.getMessageId());
-                }
-            }
-        }
-
-        return ids;
-    }
-
-    protected boolean checkRequirements(AMQQueue fromQueue, AMQQueue toQueue, List<Long> msgids)
-    {
-        if (toQueue == null)
-        {
-            _console.println("Destination queue not specifed.");
-            _console.println(usage());
-            return false;
-        }
-
-        if (fromQueue == null)
-        {
-            _console.println("Source queue not specifed.");
-            _console.println(usage());
-            return false;
-        }
-
-        return true;
-    }
-
-    protected void doCommand(AMQQueue fromQueue, long start, long id, AMQQueue toQueue)
-    {
-        fromQueue.moveMessagesToAnotherQueue(start, id, toQueue.getName().toString(), _storeContext);
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Purge.java b/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Purge.java
deleted file mode 100644
index f187e26593..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Purge.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.    
- *
- * 
- */
-package org.apache.qpid.tools.messagestore.commands;
-
-import org.apache.qpid.server.queue.AMQQueue;
-import org.apache.qpid.server.store.StoreContext;
-import org.apache.qpid.tools.messagestore.MessageStoreTool;
-
-public class Purge extends Move
-{
-    public Purge(MessageStoreTool tool)
-    {
-        super(tool);
-    }
-
-    public String help()
-    {
-        return "Purge messages from a queue.\n" +
-               "The currently selected message set will be purged from the specifed queue.\n" +
-               "Alternatively the values can be provided on the command line.";
-    }
-
-    public String usage()
-    {
-        return "purge from=<queue> [msgids=<msgids eg, 1,2,4-10>]";
-    }
-
-    public String getCommand()
-    {
-        return "purge";
-    }
-
-
-    protected boolean checkRequirements(AMQQueue fromQueue, AMQQueue toQueue, java.util.List<Long> msgids)
-    {
-        if (fromQueue == null)
-        {
-            _console.println("Source queue not specifed.");
-            _console.println(usage());
-            return false;
-        }
-
-        return true;
-    }
-
-    protected void doCommand(AMQQueue fromQueue, long start, long end, AMQQueue toQueue)
-    {
-        fromQueue.removeMessagesFromQueue(start, end, _storeContext);
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Quit.java b/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Quit.java
deleted file mode 100644
index a81bc07c38..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Quit.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.    
- *
- * 
- */
-package org.apache.qpid.tools.messagestore.commands;
-
-import org.apache.qpid.tools.messagestore.MessageStoreTool;
-
-public class Quit extends AbstractCommand
-{
-    public Quit(MessageStoreTool tool)
-    {
-        super(tool);
-    }
-
-    public String help()
-    {
-        return "Quit the tool.";
-    }
-
-    public String usage()
-    {
-        return "quit";
-    }
-
-    public String getCommand()
-    {
-        return "quit";
-    }
-
-    public void execute(String... args)
-    {
-        assert args.length > 0;
-        assert args[0].equals("quit");
-
-        _tool.quit();
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Select.java b/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Select.java
deleted file mode 100644
index fd7d4c3f13..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Select.java
+++ /dev/null
@@ -1,233 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- *
- *
- */
-package org.apache.qpid.tools.messagestore.commands;
-
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.server.exchange.Exchange;
-import org.apache.qpid.server.queue.AMQQueue;
-import org.apache.qpid.server.registry.ApplicationRegistry;
-import org.apache.qpid.server.virtualhost.VirtualHost;
-import org.apache.qpid.tools.messagestore.MessageStoreTool;
-
-import java.util.LinkedList;
-import java.util.StringTokenizer;
-
-public class Select extends AbstractCommand
-{
-
-    public Select(MessageStoreTool tool)
-    {
-        super(tool);
-    }
-
-    public String help()
-    {
-        return "Perform a selection.";
-    }
-
-    public String usage()
-    {
-        return "select virtualhost <name> |exchange <name> |queue <name> | msg id=<msgids eg. 1,2,4-10>";
-    }
-
-    public String getCommand()
-    {
-        return "select";
-    }
-
-    public void execute(String... args)
-    {
-        assert args.length > 2;
-        assert args[0].equals("select");
-
-        if (args.length < 3)
-        {
-            if (args[1].equals("show"))
-            {
-                doSelect(args[1], null);
-            }
-            else
-            {
-                _console.print("select : unknown command:");
-                _console.println(help());
-            }
-        }
-        else
-        {
-            if (args[1].equals("virtualhost")
-                || args[1].equals("vhost")
-                || args[1].equals("exchange")
-                || args[1].equals("queue")
-                || args[1].equals("msg")
-                    )
-            {
-                doSelect(args[1], args[2]);
-            }
-            else
-            {
-                _console.println(help());
-            }
-        }
-    }
-
-    private void doSelect(String type, String item)
-    {
-        if (type.equals("virtualhost"))
-        {
-
-            VirtualHost vhost = ApplicationRegistry.getInstance()
-                    .getVirtualHostRegistry().getVirtualHost(item);
-
-            if (vhost == null)
-            {
-                _console.println("Virtualhost '" + item + "' not found.");
-            }
-            else
-            {
-                _tool.getState().setVhost(vhost);
-            }
-        }
-
-        if (type.equals("exchange"))
-        {
-
-            VirtualHost vhost = _tool.getState().getVhost();
-
-            if (vhost == null)
-            {
-                _console.println("No Virtualhost open. Open a Virtualhost first.");
-                return;
-            }
-
-
-            Exchange exchange = vhost.getExchangeRegistry().getExchange(new AMQShortString(item));
-
-            if (exchange == null)
-            {
-                _console.println("Exchange  '" + item + "' not found.");
-            }
-            else
-            {
-                _tool.getState().setExchange(exchange);
-            }
-
-            if (_tool.getState().getQueue() != null)
-            {
-                if (!exchange.isBound(_tool.getState().getQueue()))
-                {
-                    _tool.getState().setQueue(null);
-                }
-            }
-        }
-
-        if (type.equals("queue"))
-        {
-            VirtualHost vhost = _tool.getState().getVhost();
-
-            if (vhost == null)
-            {
-                _console.println("No Virtualhost open. Open a Virtualhost first.");
-                return;
-            }
-
-            AMQQueue queue = vhost.getQueueRegistry().getQueue(new AMQShortString(item));
-
-            if (queue == null)
-            {
-                _console.println("Queue '" + item + "' not found.");
-            }
-            else
-            {
-                _tool.getState().setQueue(queue);
-
-                if (_tool.getState().getExchange() == null)
-                {
-                    for (AMQShortString exchangeName : vhost.getExchangeRegistry().getExchangeNames())
-                    {
-                        Exchange exchange = vhost.getExchangeRegistry().getExchange(exchangeName);
-                        if (exchange.isBound(queue))
-                        {
-                            _tool.getState().setExchange(exchange);
-                            break;
-                        }
-                    }
-                }
-
-                //remove the message selection
-                _tool.getState().setMessages((java.util.List<Long>) null);
-            }
-        }
-
-        if (type.equals("msg"))
-        {
-            if (item.startsWith("id="))
-            {
-                StringTokenizer tok = new StringTokenizer(item.substring(item.indexOf("=") + 1), ",");
-
-                java.util.List<Long> msgids = null;
-
-                if (tok.hasMoreTokens())
-                {
-                    msgids = new LinkedList<Long>();
-                }
-
-                while (tok.hasMoreTokens())
-                {
-                    String next = tok.nextToken();
-                    if (next.contains("-"))
-                    {
-                        Long start = Long.parseLong(next.substring(0, next.indexOf("-")));
-                        Long end = Long.parseLong(next.substring(next.indexOf("-") + 1));
-
-                        if (end >= start)
-                        {
-                            for (long l = start; l <= end; l++)
-                            {
-                                msgids.add(l);
-                            }
-                        }
-                    }
-                    else
-                    {
-                        msgids.add(Long.parseLong(next));
-                    }
-                }
-
-                _tool.getState().setMessages(msgids);
-            }
-
-        }
-
-        if (type.equals("show"))
-        {
-            _console.println(_tool.getState().toString());
-            if (_tool.getState().getMessages() != null)
-            {
-                _console.print("Msgs:");
-                for (Long l : _tool.getState().getMessages())
-                {
-                    _console.print(" " + l);
-                }
-                _console.println("");
-            }
-        }
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Show.java b/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Show.java
deleted file mode 100644
index 8487afba76..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Show.java
+++ /dev/null
@@ -1,512 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- *
- *
- */
-package org.apache.qpid.tools.messagestore.commands;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.framing.BasicContentHeaderProperties;
-import org.apache.qpid.framing.FieldTable;
-import org.apache.qpid.framing.abstraction.MessagePublishInfo;
-import org.apache.qpid.server.queue.AMQMessage;
-import org.apache.qpid.server.queue.AMQQueue;
-import org.apache.qpid.tools.messagestore.MessageStoreTool;
-import org.apache.qpid.tools.utils.Console;
-
-import java.util.LinkedList;
-import java.util.List;
-
-public class Show extends AbstractCommand
-{
-    protected boolean _amqHeaders = false;
-    protected boolean _routing = false;
-    protected boolean _msgHeaders = false;
-
-    public Show(MessageStoreTool tool)
-    {
-        super(tool);
-    }
-
-    public String help()
-    {
-        return "Shows the messages headers.";
-    }
-
-    public String usage()
-    {
-        return getCommand() + " [show=[all],[msgheaders],[amqheaders],[routing]] [id=<msgid e.g. 1,2,4-10>]";
-    }
-
-    public String getCommand()
-    {
-        return "show";
-    }
-
-    public void execute(String... args)
-    {
-        assert args.length > 0;
-        assert args[0].equals(getCommand());
-
-        if (args.length < 2)
-        {
-            parseArgs("all");
-        }
-        else
-        {
-            parseArgs(args);
-        }
-
-        performShow();
-    }
-
-    protected void parseArgs(String... args)
-    {
-        List<Long> msgids = null;
-
-        if (args.length >= 2)
-        {
-            for (String arg : args)
-            {
-                if (arg.startsWith("show="))
-                {
-                    _msgHeaders = arg.contains("msgheaders") || arg.contains("all");
-                    _amqHeaders = arg.contains("amqheaders") || arg.contains("all");
-                    _routing = arg.contains("routing") || arg.contains("all");
-                }
-
-                if (arg.startsWith("id="))
-                {
-                    _tool.getState().setMessages(msgids);
-                }
-            }//for args
-        }// if args > 2
-    }
-
-    protected void performShow()
-    {
-        if (_tool.getState().getVhost() == null)
-        {
-            _console.println("No Virtualhost selected. 'DuSelect' a Virtualhost first.");
-            return;
-        }
-
-        AMQQueue _queue = _tool.getState().getQueue();
-
-        List<Long> msgids = _tool.getState().getMessages();
-
-        if (_queue != null)
-        {
-            List<AMQMessage> messages = _queue.getMessagesOnTheQueue();
-            if (messages == null || messages.size() == 0)
-            {
-                _console.println("No messages on queue");
-                return;
-            }
-
-            List<List> data = createMessageData(msgids, messages, _amqHeaders, _routing, _msgHeaders);
-            if (data != null)
-            {
-                _console.printMap(null, data);
-            }
-            else
-            {
-                String message = "No data to display.";
-                if (msgids != null)
-                {
-                    message += " Is message selection correct? " + _tool.getState().printMessages();
-                }
-                _console.println(message);
-            }
-
-        }
-        else
-        {
-            _console.println("No Queue specified to show.");
-        }
-    }
-
-    /**
-     * Create the list data for display from the messages.
-     *
-     * @param msgids The list of message ids to display
-     * @param messages A list of messages to format and display.
-     * @param showHeaders should the header info be shown
-     * @param showRouting show the routing info be shown
-     * @param showMessageHeaders show the msg headers be shown
-     * @return the formated data lists for printing
-     */
-    protected List<List> createMessageData(List<Long> msgids, List<AMQMessage> messages, boolean showHeaders, boolean showRouting,
-                                           boolean showMessageHeaders)
-    {
-
-        // Currenly exposed message properties
-//        //Printing the content Body
-//        msg.getContentBodyIterator();
-//        //Print the Headers
-//        ((BasicContentHeaderProperties)msg.getContentHeaderBody().properties).getAppId();
-//        ((BasicContentHeaderProperties)msg.getContentHeaderBody().properties).getAppIdAsString();
-//        ((BasicContentHeaderProperties)msg.getContentHeaderBody().properties).getClusterId();
-//        ((BasicContentHeaderProperties)msg.getContentHeaderBody().properties).getContentType();
-//        ((BasicContentHeaderProperties)msg.getContentHeaderBody().properties).getCorrelationId();
-//        ((BasicContentHeaderProperties)msg.getContentHeaderBody().properties).getDeliveryMode();
-//        ((BasicContentHeaderProperties)msg.getContentHeaderBody().properties).getEncoding();
-//        ((BasicContentHeaderProperties)msg.getContentHeaderBody().properties).getExpiration();
-//        ((BasicContentHeaderProperties)msg.getContentHeaderBody().properties).getHeaders();
-//        ((BasicContentHeaderProperties)msg.getContentHeaderBody().properties).getMessageId();
-//        ((BasicContentHeaderProperties)msg.getContentHeaderBody().properties).getPriority();
-//        ((BasicContentHeaderProperties)msg.getContentHeaderBody().properties).getPropertyFlags();
-//        ((BasicContentHeaderProperties)msg.getContentHeaderBody().properties).getReplyTo();
-//        ((BasicContentHeaderProperties)msg.getContentHeaderBody().properties).getTimestamp();
-//        ((BasicContentHeaderProperties)msg.getContentHeaderBody().properties).getType();
-//        ((BasicContentHeaderProperties)msg.getContentHeaderBody().properties).getUserId();
-//
-//        //Print out all the property names
-//        ((BasicContentHeaderProperties)msg.getContentHeaderBody().properties).getHeaders().getPropertyNames();
-//
-//        msg.getMessageId();
-//        msg.getSize();
-//        msg.getArrivalTime();
-
-//        msg.getDeliveredSubscription();
-//        msg.getDeliveredToConsumer();
-//        msg.getMessageHandle();
-//        msg.getMessageId();
-//        msg.getMessagePublishInfo();
-//        msg.getPublisher();
-
-//        msg.getStoreContext();
-//        msg.isAllContentReceived();
-//        msg.isPersistent();
-//        msg.isRedelivered();
-//        msg.isRejectedBy();
-//        msg.isTaken();
-
-        //Header setup
-
-        List<List> data = new LinkedList<List>();
-
-        List<String> id = new LinkedList<String>();
-        data.add(id);
-        id.add(Columns.ID.name());
-        id.add(Console.ROW_DIVIDER);
-
-        List<String> exchange = new LinkedList<String>();
-        List<String> routingkey = new LinkedList<String>();
-        List<String> immediate = new LinkedList<String>();
-        List<String> mandatory = new LinkedList<String>();
-        if (showRouting)
-        {
-            data.add(exchange);
-            exchange.add(Columns.Exchange.name());
-            exchange.add(Console.ROW_DIVIDER);
-
-            data.add(routingkey);
-            routingkey.add(Columns.RoutingKey.name());
-            routingkey.add(Console.ROW_DIVIDER);
-
-            data.add(immediate);
-            immediate.add(Columns.isImmediate.name());
-            immediate.add(Console.ROW_DIVIDER);
-
-            data.add(mandatory);
-            mandatory.add(Columns.isMandatory.name());
-            mandatory.add(Console.ROW_DIVIDER);
-        }
-
-        List<String> size = new LinkedList<String>();
-        List<String> appid = new LinkedList<String>();
-        List<String> clusterid = new LinkedList<String>();
-        List<String> contenttype = new LinkedList<String>();
-        List<String> correlationid = new LinkedList<String>();
-        List<String> deliverymode = new LinkedList<String>();
-        List<String> encoding = new LinkedList<String>();
-        List<String> arrival = new LinkedList<String>();
-        List<String> expiration = new LinkedList<String>();
-        List<String> priority = new LinkedList<String>();
-        List<String> propertyflag = new LinkedList<String>();
-        List<String> replyto = new LinkedList<String>();
-        List<String> timestamp = new LinkedList<String>();
-        List<String> type = new LinkedList<String>();
-        List<String> userid = new LinkedList<String>();
-        List<String> ispersitent = new LinkedList<String>();
-        List<String> isredelivered = new LinkedList<String>();
-        List<String> isdelivered = new LinkedList<String>();
-
-        data.add(size);
-        size.add(Columns.Size.name());
-        size.add(Console.ROW_DIVIDER);
-
-        if (showHeaders)
-        {
-            data.add(ispersitent);
-            ispersitent.add(Columns.isPersistent.name());
-            ispersitent.add(Console.ROW_DIVIDER);
-
-            data.add(isredelivered);
-            isredelivered.add(Columns.isRedelivered.name());
-            isredelivered.add(Console.ROW_DIVIDER);
-
-            data.add(isdelivered);
-            isdelivered.add(Columns.isDelivered.name());
-            isdelivered.add(Console.ROW_DIVIDER);
-
-            data.add(appid);
-            appid.add(Columns.App_ID.name());
-            appid.add(Console.ROW_DIVIDER);
-
-            data.add(clusterid);
-            clusterid.add(Columns.Cluster_ID.name());
-            clusterid.add(Console.ROW_DIVIDER);
-
-            data.add(contenttype);
-            contenttype.add(Columns.Content_Type.name());
-            contenttype.add(Console.ROW_DIVIDER);
-
-            data.add(correlationid);
-            correlationid.add(Columns.Correlation_ID.name());
-            correlationid.add(Console.ROW_DIVIDER);
-
-            data.add(deliverymode);
-            deliverymode.add(Columns.Delivery_Mode.name());
-            deliverymode.add(Console.ROW_DIVIDER);
-
-            data.add(encoding);
-            encoding.add(Columns.Encoding.name());
-            encoding.add(Console.ROW_DIVIDER);
-
-            data.add(arrival);
-            expiration.add(Columns.Arrival.name());
-            expiration.add(Console.ROW_DIVIDER);
-
-            data.add(expiration);
-            expiration.add(Columns.Expiration.name());
-            expiration.add(Console.ROW_DIVIDER);
-
-            data.add(priority);
-            priority.add(Columns.Priority.name());
-            priority.add(Console.ROW_DIVIDER);
-
-            data.add(propertyflag);
-            propertyflag.add(Columns.Property_Flag.name());
-            propertyflag.add(Console.ROW_DIVIDER);
-
-            data.add(replyto);
-            replyto.add(Columns.ReplyTo.name());
-            replyto.add(Console.ROW_DIVIDER);
-
-            data.add(timestamp);
-            timestamp.add(Columns.Timestamp.name());
-            timestamp.add(Console.ROW_DIVIDER);
-
-            data.add(type);
-            type.add(Columns.Type.name());
-            type.add(Console.ROW_DIVIDER);
-
-            data.add(userid);
-            userid.add(Columns.UserID.name());
-            userid.add(Console.ROW_DIVIDER);
-        }
-
-        List<String> msgHeaders = new LinkedList<String>();
-        if (showMessageHeaders)
-        {
-            data.add(msgHeaders);
-            msgHeaders.add(Columns.MsgHeaders.name());
-            msgHeaders.add(Console.ROW_DIVIDER);
-        }
-
-        //Add create the table of data
-        for (AMQMessage msg : messages)
-        {
-            if (!includeMsg(msg, msgids))
-            {
-                continue;
-            }
-
-            id.add("" + msg.getMessageId());
-
-            size.add("" + msg.getSize());
-
-            arrival.add("" + msg.getArrivalTime());
-
-            try
-            {
-                ispersitent.add(msg.isPersistent() ? "true" : "false");
-            }
-            catch (AMQException e)
-            {
-                ispersitent.add("n/a");
-            }
-
-            isredelivered.add(msg.isRedelivered() ? "true" : "false");
-
-            isdelivered.add(msg.getDeliveredToConsumer() ? "true" : "false");
-
-//        msg.getMessageHandle();
-
-            BasicContentHeaderProperties headers = null;
-
-            try
-            {
-                headers = ((BasicContentHeaderProperties) msg.getContentHeaderBody().properties);
-            }
-            catch (AMQException e)
-            {
-                //ignore
-//                commandError("Unable to read properties for message: " + e.getMessage(), null);
-            }
-
-            if (headers != null)
-            {
-                String appidS = headers.getAppIdAsString();
-                appid.add(appidS == null ? "null" : appidS);
-
-                String clusterS = headers.getClusterIdAsString();
-                clusterid.add(clusterS == null ? "null" : clusterS);
-
-                String contentS = headers.getContentTypeAsString();
-                contenttype.add(contentS == null ? "null" : contentS);
-
-                String correlationS = headers.getCorrelationIdAsString();
-                correlationid.add(correlationS == null ? "null" : correlationS);
-
-                deliverymode.add("" + headers.getDeliveryMode());
-
-                AMQShortString encodeSS = headers.getEncoding();
-                encoding.add(encodeSS == null ? "null" : encodeSS.toString());
-
-                expiration.add("" + headers.getExpiration());
-
-                FieldTable headerFT = headers.getHeaders();
-                msgHeaders.add(headerFT == null ? "none" : "" + headerFT.toString());
-
-                priority.add("" + headers.getPriority());
-                propertyflag.add("" + headers.getPropertyFlags());
-
-                AMQShortString replytoSS = headers.getReplyTo();
-                replyto.add(replytoSS == null ? "null" : replytoSS.toString());
-
-                timestamp.add("" + headers.getTimestamp());
-
-                AMQShortString typeSS = headers.getType();
-                type.add(typeSS == null ? "null" : typeSS.toString());
-
-                AMQShortString useridSS = headers.getUserId();
-                userid.add(useridSS == null ? "null" : useridSS.toString());
-
-                MessagePublishInfo info = null;
-                try
-                {
-                    info = msg.getMessagePublishInfo();
-                }
-                catch (AMQException e)
-                {
-                    //ignore
-                }
-
-                if (info != null)
-                {
-                    AMQShortString exchangeSS = info.getExchange();
-                    exchange.add(exchangeSS == null ? "null" : exchangeSS.toString());
-
-                    AMQShortString routingkeySS = info.getRoutingKey();
-                    routingkey.add(routingkeySS == null ? "null" : routingkeySS.toString());
-
-                    immediate.add(info.isImmediate() ? "true" : "false");
-                    mandatory.add(info.isMandatory() ? "true" : "false");
-                }
-
-//        msg.getPublisher(); -- only used in clustering
-//        msg.getStoreContext();
-//        msg.isAllContentReceived();
-
-            }// if headers!=null
-
-// need to access internal map and do lookups.
-//        msg.isTaken();
-//        msg.getDeliveredSubscription();
-//        msg.isRejectedBy();
-
-        }
-
-        // if id only had the header and the divider in it then we have no data to display
-        if (id.size() == 2)
-        {
-            return null;
-        }
-        return data;
-    }
-
-    protected boolean includeMsg(AMQMessage msg, List<Long> msgids)
-    {
-        if (msgids == null)
-        {
-            return true;
-        }
-
-        Long msgid = msg.getMessageId();
-
-        boolean found = false;
-
-        if (msgids != null)
-        {
-            //check msgid is in msgids
-            for (Long l : msgids)
-            {
-                if (l.equals(msgid))
-                {
-                    found = true;
-                    break;
-                }
-            }
-        }
-        return found;
-    }
-
-    public enum Columns
-    {
-        ID,
-        Size,
-        Exchange,
-        RoutingKey,
-        isImmediate,
-        isMandatory,
-        isPersistent,
-        isRedelivered,
-        isDelivered,
-        App_ID,
-        Cluster_ID,
-        Content_Type,
-        Correlation_ID,
-        Delivery_Mode,
-        Encoding,
-        Arrival,
-        Expiration,
-        Priority,
-        Property_Flag,
-        ReplyTo,
-        Timestamp,
-        Type,
-        UserID,
-        MsgHeaders
-    }
-}
-
-
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/tools/security/Passwd.java b/qpid/java/broker/src/main/java/org/apache/qpid/tools/security/Passwd.java
deleted file mode 100644
index c27c52eb8e..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/tools/security/Passwd.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.    
- *
- * 
- */
-package org.apache.qpid.tools.security;
-
-import org.apache.commons.codec.binary.Base64;
-
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.security.DigestException;
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.PrintStream;
-
-public class Passwd
-{
-    public static void main(String args[]) throws NoSuchAlgorithmException, DigestException, IOException
-    {
-        if (args.length != 2)
-        {
-            System.out.println("Passwd <username> <password>");
-            System.exit(0);
-        }
-
-        byte[] data = args[1].getBytes("utf-8");
-
-        MessageDigest md = MessageDigest.getInstance("MD5");
-
-        for (byte b : data)
-        {
-            md.update(b);
-        }
-
-        byte[] digest = md.digest();
-
-        Base64 b64 = new Base64();
-
-        byte[] encoded = b64.encode(digest);
-
-        output(args[0], encoded);
-    }
-
-    private static void output(String user, byte[] encoded) throws IOException
-    {
-
-//        File passwdFile = new File("qpid.passwd");
-
-        PrintStream ps = new PrintStream(System.out);
-
-        user += ":";
-        ps.write(user.getBytes("utf-8"));
-
-        for (byte b : encoded)
-        {
-            ps.write(b);
-        }
-
-        ps.println();
-
-        ps.flush();
-        ps.close();
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/tools/utils/CommandParser.java b/qpid/java/broker/src/main/java/org/apache/qpid/tools/utils/CommandParser.java
deleted file mode 100644
index 986fea32cc..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/tools/utils/CommandParser.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.    
- *
- * 
- */
-package org.apache.qpid.tools.utils;
-
-public interface CommandParser
-{
-    /**
-     * If there is more than one command received on the last parse request.
-     *
-     * Subsequent calls to parse will utilise this input rather than reading new data from the input source
-     * @return boolean
-     */
-    boolean more();
-
-    /**
-     * True if the currently parsed command has been requested as a background operation
-     *
-     * @return boolean
-     */
-    boolean isBackground();
-
-    /**
-     * Parses user commands, and groups tokens in the
-     * String[] format that all Java main's love.
-     *
-     * If more than one command is provided in one input line then the more() method will return true.
-     * A subsequent call to parse() will continue to parse that input line before reading new input.
-     *
-     * @return <code>input</code> split in args[] format; null if eof.
-     * @throws java.io.IOException if there is a problem reading from the input stream
-     */
-    String[] parse() throws java.io.IOException;
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/tools/utils/Console.java b/qpid/java/broker/src/main/java/org/apache/qpid/tools/utils/Console.java
deleted file mode 100644
index cf457d1ea5..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/tools/utils/Console.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.    
- *
- * 
- */
-package org.apache.qpid.tools.utils;
-
-import java.util.List;
-
-public interface Console
-{
-    public enum CellFormat
-    {
-        CENTRED, LEFT, RIGHT
-    }    
-
-    public static String ROW_DIVIDER = "*divider";
-
-    public void print(String... message);
-
-    public void println(String... message);
-
-    public String readln();
-
-    /**
-     * Reads and parses the command line.
-     * 
-     *
-     * @return The next command or null
-     */
-    public String[] readCommand();
-
-    public CommandParser getCommandParser();
-
-    public void setCommandParser(CommandParser parser);
-
-    /**
-     *
-     *  Prints the list of String nicely.
-     *
-     *  +-------------+
-     *  |  Heading    |
-     *  +-------------+
-     *  |  Item 1     |
-     *  |  Item 2     |
-     *  |  Item 3     |
-     *  +-------------+
-     *
-     * @param hasTitle should list[0] be used as a heading
-     * @param list The list of Strings to display     
-     */
-    public void displayList(boolean hasTitle, String... list);
-
-    /**
-     *
-     *  Prints the list of String nicely.
-     *
-     *  +----------------------------+
-     *  |  Heading                   |
-     *  +----------------------------+
-     *  |  title      |  title       |   ..
-     *  +----------------------------+
-     *  |  Item 2     |  value 2     |   ..
-     *  +----------------------------+ (*divider)
-     *  |  Item 3     |  value 2     |   ..
-     *  +----------------------------+
-     *
-     * @param title The title to display if any
-     * @param entries the entries to display in a map.
-     */
-    void printMap(String title, List<List> entries);
-
-
-    public void close();
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/tools/utils/SimpleCommandParser.java b/qpid/java/broker/src/main/java/org/apache/qpid/tools/utils/SimpleCommandParser.java
deleted file mode 100644
index 09444ccdd7..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/tools/utils/SimpleCommandParser.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.    
- *
- * 
- */
-package org.apache.qpid.tools.utils;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.util.StringTokenizer;
-
-public class SimpleCommandParser implements CommandParser
-{
-    private static final String COMMAND_SEPERATOR = ";";
-
-    /** Input source of commands */
-    protected BufferedReader _reader;
-
-    /** The next list of commands from the command line */
-    private StringBuilder _nextCommand = null;
-
-    public SimpleCommandParser(BufferedReader reader)
-    {
-        _reader = reader;
-    }
-
-    public boolean more()
-    {
-        return _nextCommand != null;
-    }
-
-    public boolean isBackground()
-    {
-        return false;
-    }
-
-    public String[] parse() throws IOException
-    {
-        String[] commands = null;
-
-        String input = null;
-
-        if (_nextCommand == null)
-        {
-            input = _reader.readLine();
-        }
-        else
-        {
-            input = _nextCommand.toString();
-            _nextCommand = null;
-        }
-
-        if (input == null)
-        {
-            return null;
-        }
-
-        StringTokenizer tok = new StringTokenizer(input, " ");
-
-        int tokenCount = tok.countTokens();
-        int index = 0;
-
-        if (tokenCount > 0)
-        {
-            commands = new String[tokenCount];
-            boolean commandComplete = false;
-
-            while (tok.hasMoreTokens())
-            {
-                String next = tok.nextToken();
-
-                if (next.equals(COMMAND_SEPERATOR))
-                {
-                    commandComplete = true;
-                    _nextCommand = new StringBuilder();
-                    continue;
-                }
-
-                if (commandComplete)
-                {
-                    _nextCommand.append(next);
-                    _nextCommand.append(" ");
-                }
-                else
-                {
-                    commands[index] = next;
-                    index++;
-                }
-            }
-
-        }
-
-        //Reduce the String[] if not all the tokens were used in this command.
-        // i.e. there is more than one command on the line.
-        if (index != tokenCount)
-        {
-            String[] shortCommands = new String[index];
-            System.arraycopy(commands, 0, shortCommands, 0, index);
-            return shortCommands;
-        }
-        else
-        {
-            return commands;
-        }
-    }
-}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/tools/utils/SimpleConsole.java b/qpid/java/broker/src/main/java/org/apache/qpid/tools/utils/SimpleConsole.java
deleted file mode 100644
index ec080a4611..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/tools/utils/SimpleConsole.java
+++ /dev/null
@@ -1,363 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.    
- *
- * 
- */
-package org.apache.qpid.tools.utils;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.IOException;
-import java.util.LinkedList;
-import java.util.List;
-
-public class SimpleConsole implements Console
-{
-    /** SLF4J Logger. */
-    private static Logger _devlog = LoggerFactory.getLogger(SimpleConsole.class);
-
-    /** Console Writer. */
-    protected static BufferedWriter _consoleWriter;
-
-    /** Console Reader. */
-    protected static BufferedReader _consoleReader;
-
-    /** Parser for command-line input. */
-    protected CommandParser _parser;
-
-    public SimpleConsole(BufferedWriter writer, BufferedReader reader)
-    {
-        _consoleWriter = writer;
-        _consoleReader = reader;
-        _parser = new SimpleCommandParser(_consoleReader);
-    }
-
-    public void print(String... message)
-    {
-        try
-        {
-            for (String s : message)
-            {
-                _consoleWriter.write(s);
-            }
-            _consoleWriter.flush();
-        }
-        catch (IOException e)
-        {
-            _devlog.error(e.getMessage() + ": Occured whilst trying to write:" + message);
-        }
-
-    }
-
-    public void println(String... message)
-    {
-        print(message);
-        print(System.getProperty("line.separator"));
-    }
-
-
-    public String readln()
-    {
-        try
-        {
-            return _consoleReader.readLine();
-        }
-        catch (IOException e)
-        {
-            _devlog.debug("Unable to read input due to:" + e.getMessage());
-            return null;
-        }
-    }
-
-    public String[] readCommand()
-    {
-        try
-        {
-            return _parser.parse();
-        }
-        catch (IOException e)
-        {
-            _devlog.error("Error reading command:" + e.getMessage());
-            return new String[0];
-        }
-    }
-
-    public CommandParser getCommandParser()
-    {
-        return _parser;
-    }
-
-    public void setCommandParser(CommandParser parser)
-    {
-        _parser = parser;
-    }
-
-    public void displayList(boolean hasTitle, String... list)
-    {
-        java.util.List<java.util.List> data = new LinkedList<List>();
-
-        java.util.List<String> values = new LinkedList<String>();
-
-        data.add(values);
-
-        for (String value : list)
-        {
-            values.add(value);
-        }
-
-        if (hasTitle)
-        {
-            values.add(1, "*divider");
-        }
-
-        printMap(null, data);
-    }
-
-    /**
-     *
-     *  Prints the list of String nicely.
-     *
-     *  +----------------------------+
-     *  |  Heading                   |
-     *  +----------------------------+
-     *  |  title      |  title       |   ..
-     *  +----------------------------+
-     *  |  Item 2     |  value 2     |   ..
-     *  |  Item 3     |  value 2     |   ..
-     *  +----------------------------+
-     *
-     * @param title The title to display if any
-     * @param entries the entries to display in a map.
-     */
-    public void printMap(String title, java.util.List<java.util.List> entries)
-    {
-        try
-        {
-            int columns = entries.size();
-
-            int[] columnWidth = new int[columns];
-
-            // calculate row count
-            int rowMax = 0;
-
-            //the longest item
-            int itemMax = 0;
-
-            for (int i = 0; i < columns; i++)
-            {
-                int columnIRowMax = entries.get(i).size();
-
-                if (columnIRowMax > rowMax)
-                {
-                    rowMax = columnIRowMax;
-                }
-                for (Object values : entries.get(i))
-                {
-                    if (values.toString().equals(Console.ROW_DIVIDER))
-                    {
-                        continue;
-                    }
-
-                    int itemLength = values.toString().length();
-
-                    //note for single width
-                    if (itemLength > itemMax)
-                    {
-                        itemMax = itemLength;
-                    }
-
-                    //note for mulit width
-                    if (itemLength > columnWidth[i])
-                    {
-                        columnWidth[i] = itemLength;
-                    }
-
-                }
-            }
-
-            int tableWidth = 0;
-
-
-            for (int i = 0; i < columns; i++)
-            {
-                // plus 2 for the space padding
-                columnWidth[i] += 2;
-            }
-            for (int size : columnWidth)
-            {
-                tableWidth += size;
-            }
-            tableWidth += (columns - 1);
-
-            if (title != null)
-            {
-                if (title.length() > tableWidth)
-                {
-                    tableWidth = title.length();
-                }
-
-                printCellRow("+", "-", tableWidth);
-
-                printCell(CellFormat.CENTRED, "|", tableWidth, " " + title + " ", 0);
-                _consoleWriter.newLine();
-
-            }
-
-            //put top line | or bottom of title
-            printCellRow("+", "-", tableWidth);
-
-            //print the table data
-            int row = 0;
-
-            for (; row < rowMax; row++)
-            {
-                for (int i = 0; i < columns; i++)
-                {
-                    java.util.List columnData = entries.get(i);
-
-                    String value;
-                    // does this column have a value for this row
-                    if (columnData.size() > row)
-                    {
-                        value = " " + columnData.get(row).toString() + " ";
-                    }
-                    else
-                    {
-                        value = "  ";
-                    }
-
-                    if (i == 0 && value.equals(" " + Console.ROW_DIVIDER + " "))
-                    {
-                        printCellRow("+", "-", tableWidth);
-                        //move on to the next row
-                        break;
-                    }
-                    else
-                    {
-                        printCell(CellFormat.LEFT, "|", columnWidth[i], value, i);
-                    }
-
-                    // if it is the last row then do a new line.
-                    if (i == columns - 1)
-                    {
-                        _consoleWriter.newLine();
-                    }
-                }
-            }
-
-            printCellRow("+", "-", tableWidth);
-
-        }
-        catch (IOException e)
-        {
-            _devlog.error(e.getMessage() + ": Occured whilst trying to write.");
-        }
-    }
-
-    public void close()
-    {
-
-        try
-        {
-            _consoleReader.close();
-        }
-        catch (IOException e)
-        {
-            _devlog.error(e.getMessage() + ": Occured whilst trying to close reader.");
-        }
-
-        try
-        {
-
-            _consoleWriter.close();
-        }
-        catch (IOException e)
-        {
-            _devlog.error(e.getMessage() + ": Occured whilst trying to close writer.");
-        }
-
-    }
-
-    private void printCell(CellFormat format, String edge, int cellWidth, String cell, int column) throws IOException
-    {
-        int pad = cellWidth - cell.length();
-
-        if (column == 0)
-        {
-            _consoleWriter.write(edge);
-        }
-
-        switch (format)
-        {
-            case CENTRED:
-                printPad(" ", pad / 2);
-                break;
-            case RIGHT:
-                printPad(" ", pad);
-                break;
-        }
-
-        _consoleWriter.write(cell);
-
-
-        switch (format)
-        {
-            case CENTRED:
-                // if pad isn't even put the extra one on the right
-                if (pad % 2 == 0)
-                {
-                    printPad(" ", pad / 2);
-                }
-                else
-                {
-                    printPad(" ", (pad / 2) + 1);
-                }
-                break;
-            case LEFT:
-                printPad(" ", pad);
-                break;
-        }
-
-
-        _consoleWriter.write(edge);
-
-    }
-
-    private void printCellRow(String edge, String mid, int cellWidth) throws IOException
-    {
-        _consoleWriter.write(edge);
-
-        printPad(mid, cellWidth);
-
-        _consoleWriter.write(edge);
-        _consoleWriter.newLine();
-    }
-
-    private void printPad(String padChar, int count) throws IOException
-    {
-        for (int i = 0; i < count; i++)
-        {
-            _consoleWriter.write(padChar);
-        }
-    }
-
-
-}
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/RunBrokerWithCommand.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/RunBrokerWithCommand.java
deleted file mode 100644
index 1ebecbacb6..0000000000
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/RunBrokerWithCommand.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.    
- *
- * 
- */
-package org.apache.qpid.server;
-
-import org.apache.log4j.Logger;
-import org.apache.log4j.Level;
-
-import java.io.InputStream;
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.io.IOException;
-
-public class RunBrokerWithCommand
-{
-    public static void main(String[] args)
-    {
-        //Start broker
-
-        try
-        {
-
-            String[] fudge = new String[1];
-            fudge[0] = "-v";
-            new Main(fudge).startup();
-        }
-        catch (Exception e)
-        {
-            System.out.println("Unable to start broker due to: " + e.getMessage());
-
-            e.printStackTrace();
-            exit(1);
-        }
-
-        Logger.getRootLogger().setLevel(Level.ERROR);
-
-        //run command
-        try
-        {
-            Process task = Runtime.getRuntime().exec(args[0]);
-            System.out.println("Started Proccess: " + args[0]);
-
-            InputStream inputStream = task.getInputStream();
-
-            InputStream errorStream = task.getErrorStream();
-
-            Thread out = new Thread(new Outputter("[OUT]", new BufferedReader(new InputStreamReader(inputStream))));
-            Thread err = new Thread(new Outputter("[ERR]", new BufferedReader(new InputStreamReader(errorStream))));
-
-            out.start();
-            err.start();
-
-            out.join();
-            err.join();
-
-            System.out.println("Waiting for process to exit: " + args[0]);
-            task.waitFor();
-            System.out.println("Done Proccess: " + args[0]);
-
-        }
-        catch (IOException e)
-        {
-            System.out.println("Proccess had problems: " + e.getMessage());
-            exit(1);
-        }
-        catch (InterruptedException e)
-        {
-            System.out.println("Proccess had problems: " + e.getMessage());
-
-            exit(1);
-        }
-
-
-        exit(0);
-    }
-
-    private static void exit(int i)
-    {
-        Logger.getRootLogger().setLevel(Level.INFO);
-        System.exit(i);
-    }
-
-    static class Outputter implements Runnable
-    {
-
-        BufferedReader reader;
-        String prefix;
-
-        Outputter(String s, BufferedReader r)
-        {
-            prefix = s;
-            reader = r;
-        }
-
-        public void run()
-        {
-            String line;
-            try
-            {
-                while ((line = reader.readLine()) != null)
-                {
-                    System.out.println(prefix + line);
-                }
-            }
-            catch (IOException e)
-            {
-                System.out.println("Error occured reading; " + e.getMessage());
-            }
-        }
-
-    }
-
-}
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/TestPropertyUtils.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/TestPropertyUtils.java
deleted file mode 100644
index 3b83190e42..0000000000
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/TestPropertyUtils.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.configuration;
-
-import org.apache.qpid.configuration.PropertyException;
-import org.apache.qpid.configuration.PropertyUtils;
-
-import junit.framework.TestCase;
-
-// TODO: This belongs in the "common" module.
-public class TestPropertyUtils extends TestCase
-{
-    public void testSimpleExpansion() throws PropertyException
-    {
-        System.setProperty("banana", "fruity");
-        String expandedProperty = PropertyUtils.replaceProperties("${banana}");
-        assertEquals(expandedProperty, "fruity");
-    }
-
-    public void testDualExpansion() throws PropertyException
-    {
-        System.setProperty("banana", "fruity");
-        System.setProperty("concrete", "horrible");
-        String expandedProperty = PropertyUtils.replaceProperties("${banana}xyz${concrete}");
-        assertEquals(expandedProperty, "fruityxyzhorrible");
-    }
-
-    public static junit.framework.Test suite()
-    {
-        return new junit.framework.TestSuite(TestPropertyUtils.class);
-    }
-}
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/DestWildExchangeTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/DestWildExchangeTest.java
deleted file mode 100644
index 3dbcb1c14b..0000000000
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/DestWildExchangeTest.java
+++ /dev/null
@@ -1,583 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.    
- *
- * 
- */
-package org.apache.qpid.server.exchange;
-
-import java.util.HashSet;
-import java.util.LinkedList;
-
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.framing.ContentHeaderBody;
-import org.apache.qpid.framing.abstraction.MessagePublishInfo;
-import org.apache.qpid.server.RequiredDeliveryException;
-import org.apache.qpid.server.store.MemoryMessageStore;
-import org.apache.qpid.server.store.MessageStore;
-import org.apache.qpid.server.queue.AMQMessage;
-import org.apache.qpid.server.queue.AMQQueue;
-import org.apache.qpid.server.queue.MessageHandleFactory;
-import org.apache.qpid.server.registry.ApplicationRegistry;
-import org.apache.qpid.server.store.StoreContext;
-import org.apache.qpid.server.txn.NonTransactionalContext;
-import org.apache.qpid.server.txn.TransactionalContext;
-import org.apache.qpid.server.virtualhost.VirtualHost;
-
-public class DestWildExchangeTest extends TestCase
-{
-
-    DestWildExchange _exchange;
-
-    VirtualHost _vhost;
-    MessageStore _store;
-    StoreContext _context;
-
-    public void setUp() throws AMQException
-    {
-        _exchange = new DestWildExchange();
-        _vhost = ApplicationRegistry.getInstance().getVirtualHostRegistry().getVirtualHosts().iterator().next();
-        _store = new MemoryMessageStore();
-        _context = new StoreContext();
-    }
-
-    public void testNoRoute() throws AMQException
-    {
-        AMQQueue queue = new AMQQueue(new AMQShortString("a*#b"), false, null, false, _vhost);
-        _exchange.registerQueue(new AMQShortString("a.*.#.b"), queue, null);
-
-        MessagePublishInfo info = new PublishInfo(new AMQShortString("a.b"));
-
-        AMQMessage message = new AMQMessage(0L, info, null);
-
-        try
-        {
-            _exchange.route(message);
-            fail("Message has no route and shouldn't be routed");
-        }
-        catch (NoRouteException nre)
-        {
-            // normal
-        }
-
-        Assert.assertEquals(0, queue.getMessageCount());
-    }
-
-    public void testDirectMatch() throws AMQException
-    {
-        AMQQueue queue = new AMQQueue(new AMQShortString("ab"), false, null, false, _vhost);
-        _exchange.registerQueue(new AMQShortString("a.b"), queue, null);
-
-        AMQMessage message = createMessage("a.b");
-
-        try
-        {
-            _exchange.route(message);
-            message.routingComplete(_store, _context, new MessageHandleFactory());
-        }
-        catch (AMQException nre)
-        {
-            fail("Message has  route and should be routed");
-        }
-
-        Assert.assertEquals(1, queue.getMessageCount());
-
-        Assert.assertEquals("Wrong message recevied", message, queue.getMessagesOnTheQueue().get(0));
-
-        queue.deleteMessageFromTop(_context);
-        Assert.assertEquals(0, queue.getMessageCount());
-
-        message = createMessage("a.c");
-
-        try
-        {
-            _exchange.route(message);
-            message.routingComplete(_store, _context, new MessageHandleFactory());
-            fail("Message has no route and should fail to be routed");
-        }
-        catch (AMQException nre)
-        {
-        }
-
-        Assert.assertEquals(0, queue.getMessageCount());
-    }
-
-    public void testStarMatch() throws AMQException
-    {
-        AMQQueue queue = new AMQQueue(new AMQShortString("a*"), false, null, false, _vhost);
-        _exchange.registerQueue(new AMQShortString("a.*"), queue, null);
-
-        AMQMessage message = createMessage("a.b");
-
-        try
-        {
-            _exchange.route(message);
-            message.routingComplete(_store, _context, new MessageHandleFactory());
-        }
-        catch (AMQException nre)
-        {
-            fail("Message has  route and should be routed");
-        }
-
-        Assert.assertEquals(1, queue.getMessageCount());
-
-        Assert.assertEquals("Wrong message recevied", message, queue.getMessagesOnTheQueue().get(0));
-
-        queue.deleteMessageFromTop(_context);
-        Assert.assertEquals(0, queue.getMessageCount());
-
-        message = createMessage("a.c");
-
-        try
-        {
-            _exchange.route(message);
-            message.routingComplete(_store, _context, new MessageHandleFactory());
-        }
-        catch (AMQException nre)
-        {
-            fail("Message has route and should be routed");
-        }
-
-        Assert.assertEquals(1, queue.getMessageCount());
-
-        Assert.assertEquals("Wrong message recevied", message, queue.getMessagesOnTheQueue().get(0));
-
-        queue.deleteMessageFromTop(_context);
-        Assert.assertEquals(0, queue.getMessageCount());
-
-        message = createMessage("a");
-
-        try
-        {
-            _exchange.route(message);
-            message.routingComplete(_store, _context, new MessageHandleFactory());
-            fail("Message has no route and should fail to be routed");
-        }
-        catch (AMQException nre)
-        { }
-        {
-        }
-
-        Assert.assertEquals(0, queue.getMessageCount());
-    }
-
-    public void testHashMatch() throws AMQException
-    {
-        AMQQueue queue = new AMQQueue(new AMQShortString("a#"), false, null, false, _vhost);
-        _exchange.registerQueue(new AMQShortString("a.#"), queue, null);
-
-        AMQMessage message = createMessage("a.b.c");
-
-        try
-        {
-            _exchange.route(message);
-            message.routingComplete(_store, _context, new MessageHandleFactory());
-        }
-        catch (AMQException nre)
-        {
-            fail("Message has route and should be routed");
-        }
-
-        Assert.assertEquals(1, queue.getMessageCount());
-
-        Assert.assertEquals("Wrong message recevied", message, queue.getMessagesOnTheQueue().get(0));
-
-        queue.deleteMessageFromTop(_context);
-        Assert.assertEquals(0, queue.getMessageCount());
-
-        message = createMessage("a.b");
-
-        try
-        {
-            _exchange.route(message);
-            message.routingComplete(_store, _context, new MessageHandleFactory());
-        }
-        catch (AMQException nre)
-        {
-            fail("Message has route and should be routed");
-        }
-
-        Assert.assertEquals(1, queue.getMessageCount());
-
-        Assert.assertEquals("Wrong message recevied", message, queue.getMessagesOnTheQueue().get(0));
-
-        queue.deleteMessageFromTop(_context);
-        Assert.assertEquals(0, queue.getMessageCount());
-
-        message = createMessage("a.c");
-
-        try
-        {
-            _exchange.route(message);
-            message.routingComplete(_store, _context, new MessageHandleFactory());
-        }
-        catch (AMQException nre)
-        {
-            fail("Message has route and should be routed");
-        }
-
-        Assert.assertEquals(1, queue.getMessageCount());
-
-        Assert.assertEquals("Wrong message recevied", message, queue.getMessagesOnTheQueue().get(0));
-
-        queue.deleteMessageFromTop(_context);
-        Assert.assertEquals(0, queue.getMessageCount());
-
-        message = createMessage("a");
-
-        try
-        {
-            _exchange.route(message);
-            message.routingComplete(_store, _context, new MessageHandleFactory());
-        }
-        catch (AMQException nre)
-        {
-            fail("Message has route and should be routed");
-        }
-
-        Assert.assertEquals(1, queue.getMessageCount());
-
-        Assert.assertEquals("Wrong message recevied", message, queue.getMessagesOnTheQueue().get(0));
-
-        queue.deleteMessageFromTop(_context);
-        Assert.assertEquals(0, queue.getMessageCount());
-
-        message = createMessage("b");
-
-        try
-        {
-            _exchange.route(message);
-            message.routingComplete(_store, _context, new MessageHandleFactory());
-            fail("Message has no route and should fail to be routed");
-        }
-        catch (AMQException nre)
-        {
-        }
-
-        Assert.assertEquals(0, queue.getMessageCount());
-    }
-
-    public void testMidHash() throws AMQException
-    {
-        AMQQueue queue = new AMQQueue(new AMQShortString("a"), false, null, false, _vhost);
-        _exchange.registerQueue(new AMQShortString("a.*.#.b"), queue, null);
-
-        AMQMessage message = createMessage("a.c.d.b");
-
-        try
-        {
-            _exchange.route(message);
-            message.routingComplete(_store, _context, new MessageHandleFactory());
-        }
-        catch (AMQException nre)
-        {
-            fail("Message has no route and should be routed");
-        }
-
-        Assert.assertEquals(1, queue.getMessageCount());
-
-        Assert.assertEquals("Wrong message recevied", message, queue.getMessagesOnTheQueue().get(0));
-
-        queue.deleteMessageFromTop(_context);
-        Assert.assertEquals(0, queue.getMessageCount());
-
-        message = createMessage("a.c.b");
-
-        try
-        {
-            _exchange.route(message);
-            message.routingComplete(_store, _context, new MessageHandleFactory());
-        }
-        catch (AMQException nre)
-        {
-            fail("Message has no route and should be routed");
-        }
-
-        Assert.assertEquals(1, queue.getMessageCount());
-
-        Assert.assertEquals("Wrong message recevied", message, queue.getMessagesOnTheQueue().get(0));
-
-        queue.deleteMessageFromTop(_context);
-        Assert.assertEquals(0, queue.getMessageCount());
-
-    }
-
-    public void testMatchafterHash() throws AMQException
-    {
-        AMQQueue queue = new AMQQueue(new AMQShortString("a#"), false, null, false, _vhost);
-        _exchange.registerQueue(new AMQShortString("a.*.#.b.c"), queue, null);
-
-        AMQMessage message = createMessage("a.c.b.b");
-
-        try
-        {
-            _exchange.route(message);
-            message.routingComplete(_store, _context, new MessageHandleFactory());
-            fail("Message has route and should not be routed");
-        }
-        catch (AMQException nre)
-        {
-        }
-
-        Assert.assertEquals(0, queue.getMessageCount());
-
-        message = createMessage("a.a.b.c");
-
-        try
-        {
-            _exchange.route(message);
-            message.routingComplete(_store, _context, new MessageHandleFactory());
-        }
-        catch (AMQException nre)
-        {
-            fail("Message has no route and should be routed");
-        }
-
-        Assert.assertEquals(1, queue.getMessageCount());
-
-        Assert.assertEquals("Wrong message recevied", message, queue.getMessagesOnTheQueue().get(0));
-
-        queue.deleteMessageFromTop(_context);
-        Assert.assertEquals(0, queue.getMessageCount());
-
-        message = createMessage("a.b.c.b");
-
-        try
-        {
-            _exchange.route(message);
-            message.routingComplete(_store, _context, new MessageHandleFactory());
-            fail("Message has  route and should not be routed");
-        }
-        catch (AMQException nre)
-        {
-        }
-
-        Assert.assertEquals(0, queue.getMessageCount());
-
-        message = createMessage("a.b.c.b.c");
-
-        try
-        {
-            _exchange.route(message);
-            message.routingComplete(_store, _context, new MessageHandleFactory());
-        }
-        catch (AMQException nre)
-        {
-            fail("Message has no route and should be routed");
-
-        }
-
-        Assert.assertEquals(1, queue.getMessageCount());
-
-        Assert.assertEquals("Wrong message recevied", message, queue.getMessagesOnTheQueue().get(0));
-
-        queue.deleteMessageFromTop(_context);
-        Assert.assertEquals(0, queue.getMessageCount());
-
-    }
-
-    public void testHashAfterHash() throws AMQException
-    {
-        AMQQueue queue = new AMQQueue(new AMQShortString("a#"), false, null, false, _vhost);
-        _exchange.registerQueue(new AMQShortString("a.*.#.b.c.#.d"), queue, null);
-
-        AMQMessage message = createMessage("a.c.b.b.c");
-
-        try
-        {
-            _exchange.route(message);
-            message.routingComplete(_store, _context, new MessageHandleFactory());
-            fail("Message has route and should not be routed");
-        }
-        catch (AMQException nre)
-        {
-        }
-
-        Assert.assertEquals(0, queue.getMessageCount());
-
-        message = createMessage("a.a.b.c.d");
-
-        try
-        {
-            _exchange.route(message);
-            message.routingComplete(_store, _context, new MessageHandleFactory());
-        }
-        catch (AMQException nre)
-        {
-            fail("Message has no route and should be routed");
-        }
-
-        Assert.assertEquals(1, queue.getMessageCount());
-
-        Assert.assertEquals("Wrong message recevied", message, queue.getMessagesOnTheQueue().get(0));
-
-        queue.deleteMessageFromTop(_context);
-        Assert.assertEquals(0, queue.getMessageCount());
-
-    }
-
-    public void testHashHash() throws AMQException
-    {
-        AMQQueue queue = new AMQQueue(new AMQShortString("a#"), false, null, false, _vhost);
-        _exchange.registerQueue(new AMQShortString("a.#.*.#.d"), queue, null);
-
-        AMQMessage message = createMessage("a.c.b.b.c");
-
-        try
-        {
-            _exchange.route(message);
-            message.routingComplete(_store, _context, new MessageHandleFactory());
-            fail("Message has route and should not be routed");
-        }
-        catch (AMQException nre)
-        {
-        }
-
-        Assert.assertEquals(0, queue.getMessageCount());
-
-        message = createMessage("a.a.b.c.d");
-
-        try
-        {
-            _exchange.route(message);
-            message.routingComplete(_store, _context, new MessageHandleFactory());
-        }
-        catch (AMQException nre)
-        {
-            fail("Message has no route and should be routed");
-        }
-
-        Assert.assertEquals(1, queue.getMessageCount());
-
-        Assert.assertEquals("Wrong message recevied", message, queue.getMessagesOnTheQueue().get(0));
-
-        queue.deleteMessageFromTop(_context);
-        Assert.assertEquals(0, queue.getMessageCount());
-
-    }
-
-    public void testSubMatchFails() throws AMQException
-    {
-        AMQQueue queue = new AMQQueue(new AMQShortString("a"), false, null, false, _vhost);
-        _exchange.registerQueue(new AMQShortString("a.b.c.d"), queue, null);
-
-        AMQMessage message = createMessage("a.b.c");
-
-        try
-        {
-            _exchange.route(message);
-            message.routingComplete(_store, _context, new MessageHandleFactory());
-            fail("Message has route and should not be routed");
-        }
-        catch (AMQException nre)
-        {
-        }
-
-        Assert.assertEquals(0, queue.getMessageCount());
-
-    }
-
-    public void testMoreRouting() throws AMQException
-    {
-        AMQQueue queue = new AMQQueue(new AMQShortString("a"), false, null, false, _vhost);
-        _exchange.registerQueue(new AMQShortString("a.b"), queue, null);
-
-        AMQMessage message = createMessage("a.b.c");
-
-        try
-        {
-            _exchange.route(message);
-            message.routingComplete(_store, _context, new MessageHandleFactory());
-            fail("Message has route and should not be routed");
-        }
-        catch (AMQException nre)
-        {
-        }
-
-        Assert.assertEquals(0, queue.getMessageCount());
-
-    }
-
-    public void testMoreQueue() throws AMQException
-    {
-        AMQQueue queue = new AMQQueue(new AMQShortString("a"), false, null, false, _vhost);
-        _exchange.registerQueue(new AMQShortString("a.b"), queue, null);
-
-        AMQMessage message = createMessage("a");
-
-        try
-        {
-            _exchange.route(message);
-            message.routingComplete(_store, _context, new MessageHandleFactory());
-            fail("Message has route and should not be routed");
-        }
-        catch (AMQException nre)
-        {
-        }
-
-        Assert.assertEquals(0, queue.getMessageCount());
-
-    }
-
-    private AMQMessage createMessage(String s) throws AMQException
-    {
-        MessagePublishInfo info = new PublishInfo(new AMQShortString(s));
-
-        TransactionalContext trancontext = new NonTransactionalContext(_store, _context, null,
-                                                                       new LinkedList<RequiredDeliveryException>(),
-                                                                       new HashSet<Long>());
-
-        AMQMessage message = new AMQMessage(0L, info, trancontext);
-        message.setContentHeaderBody(new ContentHeaderBody());
-
-        return message;
-    }
-
-    class PublishInfo implements MessagePublishInfo
-    {
-        AMQShortString _routingkey;
-
-        PublishInfo(AMQShortString routingkey)
-        {
-            _routingkey = routingkey;
-        }
-
-        public AMQShortString getExchange()
-        {
-            return null;
-        }
-
-        public boolean isImmediate()
-        {
-            return false;
-        }
-
-        public boolean isMandatory()
-        {
-            return true;
-        }
-
-        public AMQShortString getRoutingKey()
-        {
-            return _routingkey;
-        }
-    }
-}
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/ExchangeMBeanTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/ExchangeMBeanTest.java
deleted file mode 100644
index e306f0449a..0000000000
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/ExchangeMBeanTest.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.exchange;
-
-import junit.framework.TestCase;
-import org.apache.qpid.server.queue.AMQQueue;
-import org.apache.qpid.server.queue.QueueRegistry;
-import org.apache.qpid.server.registry.ApplicationRegistry;
-import org.apache.qpid.server.registry.IApplicationRegistry;
-import org.apache.qpid.server.management.ManagedObject;
-import org.apache.qpid.server.virtualhost.VirtualHost;
-import org.apache.qpid.exchange.ExchangeDefaults;
-import org.apache.qpid.framing.AMQShortString;
-
-import javax.management.openmbean.CompositeData;
-import javax.management.openmbean.TabularData;
-import java.util.ArrayList;
-
-/**
- * Unit test class for testing different Exchange MBean operations
- */
-public class ExchangeMBeanTest  extends TestCase
-{
-    private AMQQueue _queue;
-    private QueueRegistry _queueRegistry;
-    private VirtualHost _virtualHost;
-
-    /**
-     * Test for direct exchange mbean
-     * @throws Exception
-     */
-
-    public void testDirectExchangeMBean() throws Exception
-    {
-        DestNameExchange exchange = new DestNameExchange();
-        exchange.initialise(_virtualHost, ExchangeDefaults.DIRECT_EXCHANGE_NAME, false, true);
-        ManagedObject managedObj = exchange.getManagedObject();
-        ManagedExchange mbean = (ManagedExchange)managedObj;
-
-        mbean.createNewBinding(_queue.getName().toString(), "binding1");
-        mbean.createNewBinding(_queue.getName().toString(), "binding2");
-
-        TabularData data = mbean.bindings();
-        ArrayList<Object> list = new ArrayList<Object>(data.values());
-        assertTrue(list.size() == 2);
-
-        // test general exchange properties
-        assertEquals(mbean.getName(), "amq.direct");
-        assertEquals(mbean.getExchangeType(), "direct");
-        assertTrue(!mbean.isDurable());
-        assertTrue(mbean.isAutoDelete());
-    }
-
-    /**
-     * Test for "topic" exchange mbean
-     * @throws Exception
-     */
-
-    public void testTopicExchangeMBean() throws Exception
-    {
-        DestWildExchange exchange = new DestWildExchange();
-        exchange.initialise(_virtualHost,ExchangeDefaults.TOPIC_EXCHANGE_NAME, false, true);
-        ManagedObject managedObj = exchange.getManagedObject();
-        ManagedExchange mbean = (ManagedExchange)managedObj;
-
-        mbean.createNewBinding(_queue.getName().toString(), "binding1");
-        mbean.createNewBinding(_queue.getName().toString(), "binding2");
-
-        TabularData data = mbean.bindings();
-        ArrayList<Object> list = new ArrayList<Object>(data.values());
-        assertTrue(list.size() == 2);
-
-        // test general exchange properties
-        assertEquals(mbean.getName(), "amq.topic");
-        assertEquals(mbean.getExchangeType(), "topic");
-        assertTrue(!mbean.isDurable());
-        assertTrue(mbean.isAutoDelete());
-    }
-
-    /**
-     * Test for "Headers" exchange mbean
-     * @throws Exception
-     */
-
-    public void testHeadersExchangeMBean() throws Exception
-    {
-        HeadersExchange exchange = new HeadersExchange();
-        exchange.initialise(_virtualHost,ExchangeDefaults.HEADERS_EXCHANGE_NAME, false, true);
-        ManagedObject managedObj = exchange.getManagedObject();
-        ManagedExchange mbean = (ManagedExchange)managedObj;
-
-        mbean.createNewBinding(_queue.getName().toString(), "key1=binding1,key2=binding2");
-        mbean.createNewBinding(_queue.getName().toString(), "key3=binding3");
-
-        TabularData data = mbean.bindings();
-        ArrayList<Object> list = new ArrayList<Object>(data.values());
-        assertTrue(list.size() == 2);
-
-        // test general exchange properties
-        assertEquals(mbean.getName(), "amq.match");
-        assertEquals(mbean.getExchangeType(), "headers");
-        assertTrue(!mbean.isDurable());
-        assertTrue(mbean.isAutoDelete());
-    }
-
-    @Override
-    protected void setUp() throws Exception
-    {
-        super.setUp();
-
-        IApplicationRegistry applicationRegistry = ApplicationRegistry.getInstance();
-        _virtualHost = applicationRegistry.getVirtualHostRegistry().getVirtualHost("test");
-        _queueRegistry = _virtualHost.getQueueRegistry();
-        _queue = new AMQQueue(new AMQShortString("testQueue"), false, new AMQShortString("ExchangeMBeanTest"), false, _virtualHost);
-        _queueRegistry.registerQueue(_queue);
-    }
-}
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/HeadersBindingTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/HeadersBindingTest.java
deleted file mode 100644
index 86ba96bf5d..0000000000
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/HeadersBindingTest.java
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.exchange;
-
-import java.util.Map;
-import java.util.HashMap;
-
-import junit.framework.TestCase;
-import org.apache.qpid.framing.FieldTable;
-
-/**
- */
-public class HeadersBindingTest extends TestCase
-{
-    private FieldTable bindHeaders = new FieldTable();
-    private FieldTable matchHeaders = new FieldTable();
-
-    public void testDefault_1()
-    {
-        bindHeaders.setString("A", "Value of A");
-
-        matchHeaders.setString("A", "Value of A");
-
-        assertTrue(new HeadersBinding(bindHeaders).matches(matchHeaders));
-    }
-
-    public void testDefault_2()
-    {
-        bindHeaders.setString("A", "Value of A");
-
-        matchHeaders.setString("A", "Value of A");
-        matchHeaders.setString("B", "Value of B");
-
-        assertTrue(new HeadersBinding(bindHeaders).matches(matchHeaders));
-    }
-
-    public void testDefault_3()
-    {
-        bindHeaders.setString("A", "Value of A");
-
-        matchHeaders.setString("A", "Altered value of A");
-
-        assertFalse(new HeadersBinding(bindHeaders).matches(matchHeaders));
-    }
-
-    public void testAll_1()
-    {
-        bindHeaders.setString("X-match", "all");
-        bindHeaders.setString("A", "Value of A");
-
-        matchHeaders.setString("A", "Value of A");
-
-        assertTrue(new HeadersBinding(bindHeaders).matches(matchHeaders));
-    }
-
-    public void testAll_2()
-    {
-        bindHeaders.setString("X-match", "all");
-        bindHeaders.setString("A", "Value of A");
-        bindHeaders.setString("B", "Value of B");
-
-        matchHeaders.setString("A", "Value of A");
-
-        assertFalse(new HeadersBinding(bindHeaders).matches(matchHeaders));
-    }
-
-    public void testAll_3()
-    {
-        bindHeaders.setString("X-match", "all");
-        bindHeaders.setString("A", "Value of A");
-        bindHeaders.setString("B", "Value of B");
-
-        matchHeaders.setString("A", "Value of A");
-        matchHeaders.setString("B", "Value of B");
-
-        assertTrue(new HeadersBinding(bindHeaders).matches(matchHeaders));
-    }
-
-    public void testAll_4()
-    {
-        bindHeaders.setString("X-match", "all");
-        bindHeaders.setString("A", "Value of A");
-        bindHeaders.setString("B", "Value of B");
-
-        matchHeaders.setString("A", "Value of A");
-        matchHeaders.setString("B", "Value of B");
-        matchHeaders.setString("C", "Value of C");
-
-        assertTrue(new HeadersBinding(bindHeaders).matches(matchHeaders));
-    }
-
-    public void testAll_5()
-    {
-        bindHeaders.setString("X-match", "all");
-        bindHeaders.setString("A", "Value of A");
-        bindHeaders.setString("B", "Value of B");
-
-        matchHeaders.setString("A", "Value of A");
-        matchHeaders.setString("B", "Altered value of B");
-        matchHeaders.setString("C", "Value of C");
-
-        assertFalse(new HeadersBinding(bindHeaders).matches(matchHeaders));
-    }
-
-    public void testAny_1()
-    {
-        bindHeaders.setString("X-match", "any");
-        bindHeaders.setString("A", "Value of A");
-
-        matchHeaders.setString("A", "Value of A");
-
-        assertTrue(new HeadersBinding(bindHeaders).matches(matchHeaders));
-    }
-
-    public void testAny_2()
-    {
-        bindHeaders.setString("X-match", "any");
-        bindHeaders.setString("A", "Value of A");
-        bindHeaders.setString("B", "Value of B");
-
-        matchHeaders.setString("A", "Value of A");
-
-        assertTrue(new HeadersBinding(bindHeaders).matches(matchHeaders));
-    }
-
-    public void testAny_3()
-    {
-        bindHeaders.setString("X-match", "any");
-        bindHeaders.setString("A", "Value of A");
-        bindHeaders.setString("B", "Value of B");
-
-        matchHeaders.setString("A", "Value of A");
-        matchHeaders.setString("B", "Value of B");
-
-        assertTrue(new HeadersBinding(bindHeaders).matches(matchHeaders));
-    }
-
-    public void testAny_4()
-    {
-        bindHeaders.setString("X-match", "any");
-        bindHeaders.setString("A", "Value of A");
-        bindHeaders.setString("B", "Value of B");
-
-        matchHeaders.setString("A", "Value of A");
-        matchHeaders.setString("B", "Value of B");
-        matchHeaders.setString("C", "Value of C");
-
-        assertTrue(new HeadersBinding(bindHeaders).matches(matchHeaders));
-    }
-
-    public void testAny_5()
-    {
-        bindHeaders.setString("X-match", "any");
-        bindHeaders.setString("A", "Value of A");
-        bindHeaders.setString("B", "Value of B");
-
-        matchHeaders.setString("A", "Value of A");
-        matchHeaders.setString("B", "Altered value of B");
-        matchHeaders.setString("C", "Value of C");
-
-        assertTrue(new HeadersBinding(bindHeaders).matches(matchHeaders));
-    }
-
-    public void testAny_6()
-    {
-        bindHeaders.setString("X-match", "any");
-        bindHeaders.setString("A", "Value of A");
-        bindHeaders.setString("B", "Value of B");
-
-        matchHeaders.setString("A", "Altered value of A");
-        matchHeaders.setString("B", "Altered value of B");
-        matchHeaders.setString("C", "Value of C");
-
-        assertFalse(new HeadersBinding(bindHeaders).matches(matchHeaders));
-    }
-
-    public static junit.framework.Test suite()
-    {
-        return new junit.framework.TestSuite(HeadersBindingTest.class);
-    }
-}
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/TestIoSession.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/TestIoSession.java
deleted file mode 100644
index ff4d3ed9fb..0000000000
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/TestIoSession.java
+++ /dev/null
@@ -1,295 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.protocol;
-
-import org.apache.mina.common.*;
-import org.apache.mina.transport.socket.nio.SocketAcceptorConfig;
-import org.apache.qpid.pool.ReadWriteThreadModel;
-
-import java.net.SocketAddress;
-import java.net.InetSocketAddress;
-import java.util.Set;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.ConcurrentHashMap;
-
-/**
- * Test implementation of IoSession, which is required for some tests. Methods not being used are not implemented,
- * so if this class is being used and some methods are to be used, then please update those.
- */
-public class TestIoSession implements IoSession
-{
-    private final ConcurrentMap attributes = new ConcurrentHashMap();
-
-    public TestIoSession()
-    {
-    }
-
-    public IoService getService()
-    {
-        return null;
-    }
-
-    public IoServiceConfig getServiceConfig()
-    {
-        return new TestIoConfig();
-    }
-
-    public IoHandler getHandler()
-    {
-        return null;
-    }
-
-    public IoSessionConfig getConfig()
-    {
-        return null;
-    }
-
-    public IoFilterChain getFilterChain()
-    {
-        return null;
-    }
-
-    public WriteFuture write(Object message)
-    {
-        return null;
-    }
-
-    public CloseFuture close()
-    {
-        return null;
-    }
-
-    public Object getAttachment()
-    {
-        return getAttribute("");
-    }
-
-    public Object setAttachment(Object attachment)
-    {
-        return setAttribute("",attachment);
-    }
-
-    public Object getAttribute(String key)
-    {
-        return attributes.get(key);
-    }
-
-    public Object setAttribute(String key, Object value)
-    {
-        return attributes.put(key,value);
-    }
-
-    public Object setAttribute(String key)
-    {
-        return attributes.put(key, Boolean.TRUE);
-    }
-
-    public Object removeAttribute(String key)
-    {
-        return attributes.remove(key);
-    }
-
-    public boolean containsAttribute(String key)
-    {
-        return attributes.containsKey(key);
-    }
-
-    public Set getAttributeKeys()
-    {
-        return attributes.keySet();
-    }
-
-    public TransportType getTransportType()
-    {
-        return null;
-    }
-
-    public boolean isConnected()
-    {
-        return false;
-    }
-
-    public boolean isClosing()
-    {
-        return false;
-    }
-
-    public CloseFuture getCloseFuture()
-    {
-        return null;
-    }
-
-    public SocketAddress getRemoteAddress()
-    {
-        return new InetSocketAddress("127.0.0.1", 1234);
-    }
-
-    public SocketAddress getLocalAddress()
-    {
-        return null;
-    }
-
-    public SocketAddress getServiceAddress()
-    {
-        return null;
-    }
-
-    public int getIdleTime(IdleStatus status)
-    {
-        return 0;
-    }
-
-    public long getIdleTimeInMillis(IdleStatus status)
-    {
-        return 0;
-    }
-
-    public void setIdleTime(IdleStatus status, int idleTime)
-    {
-
-    }
-
-    public int getWriteTimeout()
-    {
-        return 0;
-    }
-
-    public long getWriteTimeoutInMillis()
-    {
-        return 0;
-    }
-
-    public void setWriteTimeout(int writeTimeout)
-    {
-
-    }
-
-    public TrafficMask getTrafficMask()
-    {
-        return null;
-    }
-
-    public void setTrafficMask(TrafficMask trafficMask)
-    {
-
-    }
-
-    public void suspendRead()
-    {
-
-    }
-
-    public void suspendWrite()
-    {
-
-    }
-
-    public void resumeRead()
-    {
-
-    }
-
-    public void resumeWrite()
-    {
-
-    }
-
-    public long getReadBytes()
-    {
-        return 0;
-    }
-
-    public long getWrittenBytes()
-    {
-        return 0;
-    }
-
-    public long getReadMessages()
-    {
-        return 0;
-    }
-
-    public long getWrittenMessages()
-    {
-        return 0;
-    }
-
-    public long getWrittenWriteRequests()
-    {
-        return 0;
-    }
-
-    public int getScheduledWriteRequests()
-    {
-        return 0;
-    }
-
-    public int getScheduledWriteBytes()
-    {
-        return 0;
-    }
-
-    public long getCreationTime()
-    {
-        return 0;
-    }
-
-    public long getLastIoTime()
-    {
-        return 0;
-    }
-
-    public long getLastReadTime()
-    {
-        return 0;
-    }
-
-    public long getLastWriteTime()
-    {
-        return 0;
-    }
-
-    public boolean isIdle(IdleStatus status)
-    {
-        return false;
-    }
-
-    public int getIdleCount(IdleStatus status)
-    {
-        return 0;
-    }
-
-    public long getLastIdleTime(IdleStatus status)
-    {
-        return 0; 
-    }
-
-    /**
-     * Test implementation of IoServiceConfig
-     */
-    private class TestIoConfig extends SocketAcceptorConfig
-    {
-        public ThreadModel getThreadModel()
-        {
-            return ReadWriteThreadModel.getInstance();
-        }
-    }
-}
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/TestMinaProtocolSession.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/TestMinaProtocolSession.java
deleted file mode 100644
index 0c0d8f471e..0000000000
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/TestMinaProtocolSession.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.protocol;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.codec.AMQCodecFactory;
-import org.apache.qpid.server.registry.ApplicationRegistry;
-import org.apache.qpid.server.output.ProtocolOutputConverter;
-import org.apache.qpid.server.output.ProtocolOutputConverterRegistry;
-
-public class TestMinaProtocolSession extends AMQMinaProtocolSession
-{
-    public TestMinaProtocolSession() throws AMQException
-    {
-        super(new TestIoSession(),
-              ApplicationRegistry.getInstance().getVirtualHostRegistry(),
-              new AMQCodecFactory(true));
-    }
-
-    public ProtocolOutputConverter getProtocolOutputConverter()
-    {
-        return ProtocolOutputConverterRegistry.getConverter(this);
-    }
-
-    public byte getProtocolMajorVersion()
-    {
-        return (byte)8;
-    }
-
-    public byte getProtocolMinorVersion()
-    {
-        return (byte)0;
-    }
-}
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
deleted file mode 100644
index dd9f3e7723..0000000000
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueAlertTest.java
+++ /dev/null
@@ -1,306 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.queue;
-
-import junit.framework.TestCase;
-import org.apache.qpid.AMQException;
-import org.apache.qpid.server.store.MessageStore;
-import org.apache.qpid.server.store.MemoryMessageStore;
-import org.apache.qpid.server.store.StoreContext;
-import org.apache.qpid.server.virtualhost.VirtualHost;
-import org.apache.qpid.server.registry.IApplicationRegistry;
-import org.apache.qpid.server.registry.ApplicationRegistry;
-import org.apache.qpid.server.txn.TransactionalContext;
-import org.apache.qpid.server.txn.NonTransactionalContext;
-import org.apache.qpid.server.txn.TransactionManager;
-import org.apache.qpid.server.txn.MemoryTransactionManager;
-import org.apache.qpid.server.RequiredDeliveryException;
-import org.apache.qpid.server.AMQChannel;
-import org.apache.qpid.server.protocol.TestMinaProtocolSession;
-import org.apache.qpid.server.protocol.AMQMinaProtocolSession;
-import org.apache.qpid.framing.ContentHeaderBody;
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.framing.abstraction.MessagePublishInfo;
-
-import javax.management.Notification;
-import java.util.LinkedList;
-import java.util.HashSet;
-
-/** This class tests all the alerts an AMQQueue can throw based on threshold values of different parameters */
-public class AMQQueueAlertTest extends TestCase
-{
-    private final static long MAX_MESSAGE_COUNT = 50;
-    private final static long MAX_MESSAGE_AGE = 250;   // 0.25 sec
-    private final static long MAX_MESSAGE_SIZE = 2000;  // 2 KB
-    private final static long MAX_QUEUE_DEPTH = 10000;  // 10 KB
-    private AMQQueue _queue;
-    private AMQQueueMBean _queueMBean;
-    private VirtualHost _virtualHost;
-    private AMQMinaProtocolSession protocolSession = null;
-    private MessageStore _messageStore = new MemoryMessageStore();
-    private TransactionManager _txm = new MemoryTransactionManager();
-
-    private StoreContext _storeContext = new StoreContext();
-
-    private TransactionalContext _transactionalContext = new NonTransactionalContext(_messageStore, _storeContext,
-                                                                                     null,
-                                                                                     new LinkedList<RequiredDeliveryException>(),
-                                                                                     new HashSet<Long>());
-
-    /**
-     * Tests if the alert gets thrown when message count increases the threshold limit
-     *
-     * @throws Exception
-     */
-    public void testMessageCountAlert() throws Exception
-    {
-        _queue = new AMQQueue(new AMQShortString("testQueue1"), false, new AMQShortString("AMQueueAlertTest"),
-                              false, _virtualHost);
-        _queueMBean = (AMQQueueMBean) _queue.getManagedObject();
-
-        _queueMBean.setMaximumMessageCount(MAX_MESSAGE_COUNT);
-
-        sendMessages(MAX_MESSAGE_COUNT, 256l);
-        assertTrue(_queueMBean.getMessageCount() == MAX_MESSAGE_COUNT);
-
-        Notification lastNotification = _queueMBean.getLastNotification();
-        assertNotNull(lastNotification);
-
-        String notificationMsg = lastNotification.getMessage();
-        assertTrue(notificationMsg.startsWith(NotificationCheck.MESSAGE_COUNT_ALERT.name()));
-    }
-
-    /**
-     * Tests if the Message Size alert gets thrown when message of higher than threshold limit is sent
-     *
-     * @throws Exception
-     */
-    public void testMessageSizeAlert() throws Exception
-    {
-        _queue = new AMQQueue(new AMQShortString("testQueue2"), false, new AMQShortString("AMQueueAlertTest"),
-                              false, _virtualHost);
-        _queueMBean = (AMQQueueMBean) _queue.getManagedObject();
-        _queueMBean.setMaximumMessageCount(MAX_MESSAGE_COUNT);
-        _queueMBean.setMaximumMessageSize(MAX_MESSAGE_SIZE);
-
-        sendMessages(1, MAX_MESSAGE_SIZE * 2);
-        assertTrue(_queueMBean.getMessageCount() == 1);
-
-        Notification lastNotification = _queueMBean.getLastNotification();
-        assertNotNull(lastNotification);
-
-        String notificationMsg = lastNotification.getMessage();
-        assertTrue(notificationMsg.startsWith(NotificationCheck.MESSAGE_SIZE_ALERT.name()));
-    }
-
-    /**
-     * Tests if Queue Depth alert is thrown when queue depth reaches the threshold value
-     *
-     * Based on FT-402 subbmitted by client
-     *
-     * @throws Exception
-     */
-    public void testQueueDepthAlertNoSubscriber() throws Exception
-    {
-        _queue = new AMQQueue(new AMQShortString("testQueue3"), false, new AMQShortString("AMQueueAlertTest"),
-                              false, _virtualHost);
-        _queueMBean = (AMQQueueMBean) _queue.getManagedObject();
-        _queueMBean.setMaximumMessageCount(MAX_MESSAGE_COUNT);
-        _queueMBean.setMaximumQueueDepth(MAX_QUEUE_DEPTH);
-
-        while (_queue.getQueueDepth() < MAX_QUEUE_DEPTH)
-        {
-            sendMessages(1, MAX_MESSAGE_SIZE);
-        }
-
-        Notification lastNotification = _queueMBean.getLastNotification();
-        assertNotNull(lastNotification);
-
-        String notificationMsg = lastNotification.getMessage();
-        assertTrue(notificationMsg.startsWith(NotificationCheck.QUEUE_DEPTH_ALERT.name()));
-    }
-
-    /**
-     * Tests if MESSAGE AGE alert is thrown, when a message is in the queue for time higher than threshold value of
-     * message age
-     *
-     * Alternative test to FT-401 provided by client
-     *
-     * @throws Exception
-     */
-    public void testMessageAgeAlert() throws Exception
-    {
-        _queue = new AMQQueue(new AMQShortString("testQueue4"), false, new AMQShortString("AMQueueAlertTest"),
-                              false, _virtualHost);
-        _queueMBean = (AMQQueueMBean) _queue.getManagedObject();
-        _queueMBean.setMaximumMessageCount(MAX_MESSAGE_COUNT);
-        _queueMBean.setMaximumMessageAge(MAX_MESSAGE_AGE);
-
-        sendMessages(1, MAX_MESSAGE_SIZE);
-
-        // Ensure message sits on queue long enough to age.
-        Thread.sleep(MAX_MESSAGE_AGE * 2);
-
-        sendMessages(1, MAX_MESSAGE_SIZE);
-        assertTrue(_queueMBean.getMessageCount() == 2);
-
-        Notification lastNotification = _queueMBean.getLastNotification();
-        assertNotNull(lastNotification);
-
-        String notificationMsg = lastNotification.getMessage();
-        assertTrue(notificationMsg.startsWith(NotificationCheck.MESSAGE_AGE_ALERT.name()));
-    }
-
-    /*
-     This test sends some messages to the queue with subscribers needing message to be acknowledged.
-     The messages will not be acknowledged and will be required twice. Why we are checking this is because
-     the bug reported said that the queueDepth keeps increasing when messages are requeued.
-     The QueueDepth should decrease when messages are delivered from the queue (QPID-408)
-    */
-    public void testQueueDepthAlertWithSubscribers() throws Exception
-    {
-        protocolSession = new TestMinaProtocolSession();
-        AMQChannel channel = new AMQChannel(protocolSession, 2,_txm, _messageStore, null);
-        protocolSession.addChannel(channel);
-
-        // Create queue
-        _queue = getNewQueue();
-        _queue.registerProtocolSession(protocolSession, channel.getChannelId(),
-                                       new AMQShortString("consumer_tag"), true, null, false, false);
-
-        _queueMBean = (AMQQueueMBean) _queue.getManagedObject();
-        _queueMBean.setMaximumMessageCount(9999l);   // Set a high value, because this is not being tested
-        _queueMBean.setMaximumQueueDepth(MAX_QUEUE_DEPTH);
-
-        // Send messages(no of message to be little more than what can cause a Queue_Depth alert)
-        int messageCount = Math.round(MAX_QUEUE_DEPTH / MAX_MESSAGE_SIZE) + 10;
-        long totalSize = (messageCount * MAX_MESSAGE_SIZE) >> 10;
-        sendMessages(messageCount, MAX_MESSAGE_SIZE);
-
-        // Check queueDepth. There should be no messages on the queue and as the subscriber is listening
-        // so there should be no Queue_Deoth alert raised
-        assertEquals(new Long(0), new Long(_queueMBean.getQueueDepth()));
-        Notification lastNotification = _queueMBean.getLastNotification();
-        assertNull(lastNotification);
-
-        // Kill the subscriber and check for the queue depth values.
-        // Messages are unacknowledged, so those should get requeued. All messages should be on the Queue
-        _queue.unregisterProtocolSession(protocolSession, channel.getChannelId(), new AMQShortString("consumer_tag"));
-        channel.requeue();
-
-        assertEquals(new Long(totalSize), new Long(_queueMBean.getQueueDepth()));
-
-        lastNotification = _queueMBean.getLastNotification();
-        assertNotNull(lastNotification);
-        String notificationMsg = lastNotification.getMessage();
-        assertTrue(notificationMsg.startsWith(NotificationCheck.QUEUE_DEPTH_ALERT.name()));
-
-        // Connect a consumer again and check QueueDepth values. The queue should get emptied.
-        // Messages will get delivered but still are unacknowledged.
-        _queue.registerProtocolSession(protocolSession, channel.getChannelId(),
-                                       new AMQShortString("consumer_tag"), true, null, false, false);
-        _queue.deliverAsync();
-        while (_queue.getMessageCount() != 0)
-        {
-            Thread.sleep(100);
-        }
-        assertEquals(new Long(0), new Long(_queueMBean.getQueueDepth()));
-
-        // Kill the subscriber again. Now those messages should get requeued again. Check if the queue depth
-        // value is correct.
-        _queue.unregisterProtocolSession(protocolSession, channel.getChannelId(), new AMQShortString("consumer_tag"));
-        channel.requeue();
-
-        assertEquals(new Long(totalSize), new Long(_queueMBean.getQueueDepth()));
-        protocolSession.closeSession();
-
-        // Check the clear queue
-        _queueMBean.clearQueue();
-        assertEquals(new Long(0), new Long(_queueMBean.getQueueDepth()));
-    }
-
-    protected AMQMessage message(final boolean immediate, long size) throws AMQException
-    {
-        MessagePublishInfo publish = new MessagePublishInfo()
-        {
-
-            public AMQShortString getExchange()
-            {
-                return null;
-            }
-
-            public boolean isImmediate()
-            {
-                return immediate;
-            }
-
-            public boolean isMandatory()
-            {
-                return false;
-            }
-
-            public AMQShortString getRoutingKey()
-            {
-                return null;
-            }
-        };
-
-        ContentHeaderBody contentHeaderBody = new ContentHeaderBody();
-        contentHeaderBody.bodySize = size;   // in bytes
-        AMQMessage message = new AMQMessage(_messageStore.getNewMessageId(), publish, _transactionalContext);
-        message.setContentHeaderBody(contentHeaderBody);
-        message.setPublisher(protocolSession);
-        return message;
-    }
-
-    @Override
-    protected void setUp() throws Exception
-    {
-        super.setUp();
-        IApplicationRegistry applicationRegistry = ApplicationRegistry.getInstance();
-        _virtualHost = applicationRegistry.getVirtualHostRegistry().getVirtualHost("test");
-    }
-
-    private void sendMessages(long messageCount, long size) throws AMQException
-    {
-        AMQMessage[] messages = new AMQMessage[(int) messageCount];
-        for (int i = 0; i < messages.length; i++)
-        {
-            messages[i] = message(false, size);
-            messages[i].enqueue(_queue);
-            messages[i].routingComplete(_messageStore, _storeContext, new MessageHandleFactory());
-        }
-
-        for (int i = 0; i < messageCount; i++)
-        {
-            _queue.process(_storeContext, messages[i], false);
-        }
-    }
-
-    private AMQQueue getNewQueue() throws AMQException
-    {
-        return new AMQQueue(new AMQShortString("testQueue" + Math.random()),
-                            false,
-                            new AMQShortString("AMQueueAlertTest"),
-                            false,
-                            _virtualHost);
-    }
-}
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
deleted file mode 100644
index 32dba5e15d..0000000000
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java
+++ /dev/null
@@ -1,245 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.queue;
-
-import junit.framework.TestCase;
-import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.ContentHeaderBody;
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.framing.abstraction.MessagePublishInfo;
-import org.apache.qpid.server.AMQChannel;
-import org.apache.qpid.server.RequiredDeliveryException;
-import org.apache.qpid.server.protocol.TestMinaProtocolSession;
-import org.apache.qpid.server.virtualhost.VirtualHost;
-import org.apache.qpid.server.registry.IApplicationRegistry;
-import org.apache.qpid.server.registry.ApplicationRegistry;
-import org.apache.qpid.server.txn.TransactionalContext;
-import org.apache.qpid.server.txn.NonTransactionalContext;
-import org.apache.qpid.server.txn.TransactionManager;
-import org.apache.qpid.server.txn.MemoryTransactionManager;
-import org.apache.qpid.server.store.MessageStore;
-import org.apache.qpid.server.store.StoreContext;
-import org.apache.qpid.server.store.MemoryMessageStore;
-
-import javax.management.JMException;
-import java.util.LinkedList;
-import java.util.HashSet;
-
-/**
- * Test class to test AMQQueueMBean attribtues and operations
- */
-public class AMQQueueMBeanTest extends TestCase
-{
-    private static long MESSAGE_SIZE = 1000;
-    private AMQQueue _queue;
-    private AMQQueueMBean _queueMBean;
-    private MessageStore _messageStore = new MemoryMessageStore();
-    private TransactionManager _txm = new MemoryTransactionManager();
-    private StoreContext _storeContext = new StoreContext();
-    private TransactionalContext _transactionalContext = new NonTransactionalContext(_messageStore, _storeContext,
-                                                                                     null,
-                                                                                     new LinkedList<RequiredDeliveryException>(),
-                                                                                     new HashSet<Long>());
-    private VirtualHost _virtualHost;
-
-    public void testMessageCount() throws Exception
-    {
-        int messageCount = 10;
-        sendMessages(messageCount);
-        assertTrue(_queueMBean.getMessageCount() == messageCount);
-        assertTrue(_queueMBean.getReceivedMessageCount() == messageCount);
-        long queueDepth = (messageCount * MESSAGE_SIZE) >> 10;
-        assertTrue(_queueMBean.getQueueDepth() == queueDepth);
-
-        _queueMBean.deleteMessageFromTop();
-        assertTrue(_queueMBean.getMessageCount() == (messageCount - 1));
-        assertTrue(_queueMBean.getReceivedMessageCount() == messageCount);
-
-        _queueMBean.clearQueue();
-        assertTrue(_queueMBean.getMessageCount() == 0);
-        assertTrue(_queueMBean.getReceivedMessageCount() == messageCount);
-    }
-
-    public void testConsumerCount() throws AMQException
-    {
-        SubscriptionManager mgr = _queue.getSubscribers();
-        assertFalse(mgr.hasActiveSubscribers());
-        assertTrue(_queueMBean.getActiveConsumerCount() == 0);
-
-
-        TestMinaProtocolSession protocolSession = new TestMinaProtocolSession();
-        AMQChannel channel = new AMQChannel(protocolSession, 1,_txm, _messageStore, null);
-        protocolSession.addChannel(channel);
-
-        _queue.registerProtocolSession(protocolSession, 1, new AMQShortString("test"), false, null,false,false);
-        assertTrue(_queueMBean.getActiveConsumerCount() == 1);
-
-        SubscriptionSet _subscribers = (SubscriptionSet) mgr;
-        SubscriptionFactory subscriptionFactory = new SubscriptionImpl.Factory();
-        Subscription s1 =  subscriptionFactory.createSubscription(channel.getChannelId(),
-                                                                  protocolSession,
-                                                                  new AMQShortString("S1"),
-                                                                  false,
-                                                                  null,
-                                                                  true,
-                                                                  _queue);
-
-        Subscription s2 =  subscriptionFactory.createSubscription(channel.getChannelId(),
-                                                                  protocolSession,
-                                                                  new AMQShortString("S2"),
-                                                                  false,
-                                                                  null,
-                                                                  true,
-                                                                  _queue);
-        _subscribers.addSubscriber(s1);
-        _subscribers.addSubscriber(s2);
-        assertTrue(_queueMBean.getActiveConsumerCount() == 3);
-        assertTrue(_queueMBean.getConsumerCount() == 3);
-
-        s1.close();
-        assertTrue(_queueMBean.getActiveConsumerCount() == 2);
-        assertTrue(_queueMBean.getConsumerCount() == 3);
-    }
-
-    public void testGeneralProperties()
-    {
-        long maxQueueDepth = 1000; // in bytes
-        _queueMBean.setMaximumMessageCount(50000l);
-        _queueMBean.setMaximumMessageSize(2000l);
-        _queueMBean.setMaximumQueueDepth(maxQueueDepth);
-
-        assertTrue(_queueMBean.getMaximumMessageCount() == 50000);
-        assertTrue(_queueMBean.getMaximumMessageSize() == 2000);
-        assertTrue(_queueMBean.getMaximumQueueDepth() == (maxQueueDepth >> 10));
-
-        assertTrue(_queueMBean.getName().equals("testQueue"));
-        assertTrue(_queueMBean.getOwner().equals("AMQueueMBeanTest"));
-        assertFalse(_queueMBean.isAutoDelete());
-        assertFalse(_queueMBean.isDurable());
-    }
-
-    public void testExceptions() throws Exception
-    {
-        try
-        {
-            _queueMBean.viewMessages(0, 3);
-            fail();
-        }
-        catch (JMException ex)
-        {
-
-        }
-
-        try
-        {
-            _queueMBean.viewMessages(2, 1);
-            fail();
-        }
-        catch (JMException ex)
-        {
-
-        }
-
-        try
-        {
-            _queueMBean.viewMessages(-1, 1);
-            fail();
-        }
-        catch (JMException ex)
-        {
-
-        }
-
-        AMQMessage msg = message(false);
-        long id = msg.getMessageId();
-        _queue.clearQueue(_storeContext);
-
-        msg.enqueue(_queue);
-        msg.routingComplete(_messageStore, _storeContext, new MessageHandleFactory());
-        _queue.process(_storeContext, msg, false);
-        _queueMBean.viewMessageContent(id);
-        try
-        {
-            _queueMBean.viewMessageContent(id + 1);
-            fail();
-        }
-        catch (JMException ex)
-        {
-
-        }
-    }
-
-    private AMQMessage message(final boolean immediate) throws AMQException
-    {
-        MessagePublishInfo publish = new MessagePublishInfo()
-        {
-
-            public AMQShortString getExchange()
-            {
-                return null;
-            }
-
-            public boolean isImmediate()
-            {
-                return immediate;
-            }
-
-            public boolean isMandatory()
-            {
-                return false;
-            }
-
-            public AMQShortString getRoutingKey()
-            {
-                return null;
-            }
-        };
-                              
-        ContentHeaderBody contentHeaderBody = new ContentHeaderBody();
-        contentHeaderBody.bodySize = MESSAGE_SIZE;   // in bytes
-        return new AMQMessage(_messageStore.getNewMessageId(), publish, _transactionalContext, contentHeaderBody);
-    }
-
-    @Override
-    protected void setUp() throws Exception
-    {
-        super.setUp();
-        IApplicationRegistry applicationRegistry = ApplicationRegistry.getInstance();
-        _virtualHost = applicationRegistry.getVirtualHostRegistry().getVirtualHost("test");
-        _queue = new AMQQueue(new AMQShortString("testQueue"), false, new AMQShortString("AMQueueMBeanTest"), false, _virtualHost);
-        _queueMBean = new AMQQueueMBean(_queue);
-    }
-
-    private void sendMessages(int messageCount) throws AMQException
-    {
-        AMQMessage[] messages = new AMQMessage[messageCount];
-        for (int i = 0; i < messages.length; i++)
-        {
-            messages[i] = message(false);
-            messages[i].enqueue(_queue);
-            messages[i].routingComplete(_messageStore, _storeContext, new MessageHandleFactory());
-        }
-        for (int i = 0; i < messageCount; i++)
-        {
-            _queue.process(_storeContext, messages[i], false);
-        }
-    }
-}
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/util/LoggingProxyTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/util/LoggingProxyTest.java
deleted file mode 100644
index c7db51016e..0000000000
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/util/LoggingProxyTest.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.util;
-
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-public class LoggingProxyTest extends TestCase
-{
-    static interface IFoo {
-        void foo();
-        void foo(int i, Collection c);
-        String bar();
-        String bar(String s, List l);
-    }
-
-    static class Foo implements IFoo {
-        public void foo()
-        {
-        }
-
-        public void foo(int i, Collection c)
-        {
-        }
-
-        public String bar()
-        {
-            return null;
-        }
-
-        public String bar(String s, List l)
-        {
-            return "ha";
-        }
-    }
-
-    public void testSimple() {
-        LoggingProxy proxy = new LoggingProxy(new Foo(), 20);
-        IFoo foo = (IFoo)proxy.getProxy(IFoo.class);
-        foo.foo();
-        assertEquals(2, proxy.getBufferSize());
-        assertTrue(proxy.getBuffer().get(0).toString().matches(".*: foo\\(\\) entered$"));
-        assertTrue(proxy.getBuffer().get(1).toString().matches(".*: foo\\(\\) returned$"));
-
-        foo.foo(3, Arrays.asList(0, 1, 2));
-        assertEquals(4, proxy.getBufferSize());
-        assertTrue(proxy.getBuffer().get(2).toString().matches(".*: foo\\(\\[3, \\[0, 1, 2\\]\\]\\) entered$"));
-        assertTrue(proxy.getBuffer().get(3).toString().matches(".*: foo\\(\\) returned$"));
-
-        foo.bar();
-        assertEquals(6, proxy.getBufferSize());
-        assertTrue(proxy.getBuffer().get(4).toString().matches(".*: bar\\(\\) entered$"));
-        assertTrue(proxy.getBuffer().get(5).toString().matches(".*: bar\\(\\) returned null$"));
-
-        foo.bar("hello", Arrays.asList(1, 2, 3));
-        assertEquals(8, proxy.getBufferSize());
-        assertTrue(proxy.getBuffer().get(6).toString().matches(".*: bar\\(\\[hello, \\[1, 2, 3\\]\\]\\) entered$"));
-        assertTrue(proxy.getBuffer().get(7).toString().matches(".*: bar\\(\\) returned ha$"));
-
-        proxy.dump();
-    }
-
-    public static junit.framework.Test suite()
-    {
-        return new junit.framework.TestSuite(LoggingProxyTest.class);
-    }
-}
diff --git a/qpid/java/integrationtests/README.txt b/qpid/java/integrationtests/README.txt
deleted file mode 100644
index 00a21883a9..0000000000
--- a/qpid/java/integrationtests/README.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-This module contains integration tests, for testing a java client againt *any* broker

-implementation or against other clients. These tests must not rely on starting the

-Java broker in-vm but must depend on a broker being started independantly before running

-the tests in this module. By default tests in this module will expect the broker to be

-started on localhost on the default port, but this can be overridden by passing in a

-sys property to maven. Interop tests are in this module. Java broker specific tests that

-use an in-vm broker should go in the systests module.

-

-Don't set the tests in this module to run by default as part of the maven build, until

-there is a script to start and stop the broker; needed to fully automate these tests.

-Interop tests will always be run using a seperate script (not from maven) but it might

-be worthwile to script into the maven build starting of the Java broker, and running

-these tests against it.
\ No newline at end of file
diff --git a/qpid/java/integrationtests/build.xml b/qpid/java/integrationtests/build.xml
deleted file mode 100644
index c37dd4a893..0000000000
--- a/qpid/java/integrationtests/build.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<!--
- -
- - Licensed to the Apache Software Foundation (ASF) under one
- - or more contributor license agreements.  See the NOTICE file
- - distributed with this work for additional information
- - regarding copyright ownership.  The ASF licenses this file
- - to you under the Apache License, Version 2.0 (the
- - "License"); you may not use this file except in compliance
- - with the License.  You may obtain a copy of the License at
- - 
- -   http://www.apache.org/licenses/LICENSE-2.0
- - 
- - Unless required by applicable law or agreed to in writing,
- - software distributed under the License is distributed on an
- - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- - KIND, either express or implied.  See the License for the
- - specific language governing permissions and limitations
- - under the License.
- -
- -->
-<project name="Integration Tests" default="build">
-
-    <property name="module.depends" value="systests client common"/>
-    <property name="module.dist" value="false"/>
-
-    <import file="../module.xml"/>
-
-</project>
diff --git a/qpid/java/integrationtests/docs/RunningSustainedTests.txt b/qpid/java/integrationtests/docs/RunningSustainedTests.txt
deleted file mode 100644
index 2b37f4c5a7..0000000000
--- a/qpid/java/integrationtests/docs/RunningSustainedTests.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-In addition to the integration tests the framework provided by this package also allows for
-sustained tests to be run. Currently avaible tests:
-- org.apache.qpid.sustained.SustainedTestClient : Pub Sub test to determine steady state throughput.
-
-
-Running Tests.
-
-Run the tests as per the integration tests.
- - Start a broker
- - Start at least one Client [java org.apache.qpid.sustained.TestClient], ensuring unique naming
- - Start Test Controller [java org.apache.qpid.sustained.TestCoordinator]
- - Additional Test clients can be started:
-    [java org.apache.qpid.sustained.TestClient -j org.apache.qpid.sustained.SustainedTestClient]
-
-
diff --git a/qpid/java/integrationtests/jar-with-dependencies.xml b/qpid/java/integrationtests/jar-with-dependencies.xml
deleted file mode 100644
index 3e95e7ab22..0000000000
--- a/qpid/java/integrationtests/jar-with-dependencies.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<!--

-    Licensed to the Apache Software Foundation (ASF) under one

-    or more contributor license agreements. See the NOTICE file

-    distributed with this work for additional information

-    regarding copyright ownership. The ASF licenses this file

-    to you under the Apache License, Version 2.0 (the

-    "License"); you may not use this file except in compliance

-    with the License. You may obtain a copy of the License at

-

-    http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing,

-    software distributed under the License is distributed on an

-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    KIND, either express or implied. See the License for the

-    specific language governing permissions and limitations

-    under the License.

--->

-<!-- This is an assembly descriptor that produces a jar file that contains all the

-     dependencies, fully expanded into a single jar, required to run the tests of

-     a maven project. 

- -->

-<assembly>

-  <id>all-test-deps</id>

-  <formats>

-    <format>jar</format>

-  </formats>

-  <includeBaseDirectory>false</includeBaseDirectory>

-  <dependencySets>

-    <dependencySet>

-      <outputDirectory></outputDirectory>

-      <outputFileNameMapping></outputFileNameMapping>

-      <unpack>true</unpack>

-      <scope>test</scope>

-    </dependencySet>

-  </dependencySets>

-  <fileSets>

-    <fileSet>

-      <directory>target/classes</directory>

-      <outputDirectory></outputDirectory>

-    </fileSet>

-    <fileSet>

-      <directory>target/test-classes</directory>

-      <outputDirectory></outputDirectory>

-    </fileSet>

-  </fileSets>

-</assembly>

diff --git a/qpid/java/integrationtests/pom.xml b/qpid/java/integrationtests/pom.xml
deleted file mode 100644
index 78a05e4f28..0000000000
--- a/qpid/java/integrationtests/pom.xml
+++ /dev/null
@@ -1,147 +0,0 @@
-<!--

-    Licensed to the Apache Software Foundation (ASF) under one

-    or more contributor license agreements. See the NOTICE file

-    distributed with this work for additional information

-    regarding copyright ownership. The ASF licenses this file

-    to you under the Apache License, Version 2.0 (the

-    "License"); you may not use this file except in compliance

-    with the License. You may obtain a copy of the License at

-    

-    http://www.apache.org/licenses/LICENSE-2.0

-    

-    Unless required by applicable law or agreed to in writing,

-    software distributed under the License is distributed on an

-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    KIND, either express or implied. See the License for the

-    specific language governing permissions and limitations

-    under the License.

-  -->

-<project xmlns="http://maven.apache.org/POM/4.0.0"

-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

-

-    <modelVersion>4.0.0</modelVersion>

-    <groupId>org.apache.qpid</groupId>

-    <artifactId>qpid-integrationtests</artifactId>

-    <packaging>jar</packaging>

-    <version>1.0-incubating-M3-SNAPSHOT</version>

-    <name>Qpid Integration Tests</name>

-

-    <parent>

-        <groupId>org.apache.qpid</groupId>

-        <artifactId>qpid</artifactId>

-        <version>1.0-incubating-M3-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-

-    <properties>

-        <topDirectoryLocation>..</topDirectoryLocation>

-    </properties>

-

-    <dependencies>

-

-        <dependency>

-            <groupId>org.apache.qpid</groupId>

-            <artifactId>qpid-client</artifactId>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.qpid</groupId>

-            <artifactId>qpid-systests</artifactId>

-        </dependency>

-

-        <dependency>  

-            <groupId>org.slf4j</groupId> 

-            <artifactId>slf4j-log4j12</artifactId>  

-            <version>1.4.0</version>

-        </dependency>

-

-        <dependency>

-            <groupId>uk.co.thebadgerset</groupId>

-            <artifactId>junit-toolkit</artifactId>

-            <version>0.6-SNAPSHOT</version>

-            <scope>compile</scope>

-        </dependency>

-

-        <!-- JUnit is a compile and runtime dependancy for these tests, not just a test time dependency. -->

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <scope>compile</scope>

-        </dependency>

-

-        <!-- These need to be included at compile time only, for the retrotranslator verification to find them. -->

-        <dependency>

-            <groupId>net.sf.retrotranslator</groupId>

-            <artifactId>retrotranslator-runtime</artifactId>

-            <scope>provided</scope>

-        </dependency>

-

-    </dependencies>

-

-    <build>

-        <plugins>

-            <plugin>

-                <groupId>org.apache.maven.plugins</groupId>

-                <artifactId>maven-surefire-plugin</artifactId>

-            </plugin>

-

-            <!-- Backports the module to Java 1.4. This is done during the packaging phase as a transformation of the Jar. -->

-            <plugin>

-                <groupId>org.codehaus.mojo</groupId>

-                <artifactId>retrotranslator-maven-plugin</artifactId>

-                <executions>

-                    <execution>

-                        <id>retro-intergration-tests</id>

-                        <phase>package</phase>

-                        <goals>

-                            <goal>translate-project</goal>

-                        </goals>

-                        <configuration>

-                            <!--<destdir>${project.build.directory}/retro-classes</destdir>-->

-                            <destjar>${project.build.directory}/${project.build.finalName}-java14.jar</destjar>

-                            <verify>${retrotranslator.verify}</verify>

-                            <verifyClasspath>

-                                <element>${retrotranslator.1.4-rt-path}</element>

-                                <element>${retrotranslator.1.4-jce-path}</element>

-                                <element>${retrotranslator.1.4-jsse-path}</element>

-                                <element>${retrotranslator.1.4-sasl-path}</element>

-                            </verifyClasspath>

-                            <failonwarning>false</failonwarning>

-                            <classifier>java14</classifier>

-                            <attach>true</attach>

-                        </configuration>

-                    </execution>

-                </executions>

-            </plugin>

-

-            <plugin>

-                <groupId>org.apache.maven.plugins</groupId>

-                <artifactId>maven-assembly-plugin</artifactId>

-                <version>2.2-SNAPSHOT</version>

-                <configuration>

-                    <descriptors>

-                        <descriptor>jar-with-dependencies.xml</descriptor>

-                    </descriptors>

-                    <outputDirectory>target</outputDirectory>

-                    <workDirectory>target/assembly/work</workDirectory>

-                </configuration>

-            </plugin>

-            

-        </plugins>

-

-        <resources>

-            <!-- Ensure all resources defined in the resources directory are copied into the build jar. -->

-            <resource>

-                <targetPath></targetPath>

-                <filtering>false</filtering>

-                <directory>src/resources</directory>

-                <includes>

-                    <include>**/*</include>

-                </includes>

-            </resource>

-        </resources>

-

-    </build>

-

-</project>

diff --git a/qpid/java/integrationtests/src/main/java/org/apache/qpid/interop/clienttestcases/TestCase1DummyRun.java b/qpid/java/integrationtests/src/main/java/org/apache/qpid/interop/clienttestcases/TestCase1DummyRun.java
deleted file mode 100644
index db17c7aacc..0000000000
--- a/qpid/java/integrationtests/src/main/java/org/apache/qpid/interop/clienttestcases/TestCase1DummyRun.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.interop.clienttestcases;
-
-import org.apache.log4j.Logger;
-
-import org.apache.qpid.test.framework.distributedtesting.TestClientControlledTest;
-
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.Session;
-
-/**
- * Implements tet case 1, dummy run. This test case sends no test messages, it exists to confirm that the test harness
- * is interacting with the coordinator correctly.
- *
- * <p><table id="crc"><caption>CRC Card</caption>
- * <tr><th> Responsibilities <th> Collaborations
- * <tr><td> Supply the name of the test case that this implements.
- * <tr><td> Accept/Reject invites based on test parameters.
- * <tr><td> Adapt to assigned roles.
- * <tr><td> Perform test case actions.
- * <tr><td> Generate test reports.
- * </table>
- */
-public class TestCase1DummyRun implements TestClientControlledTest
-{
-    /** Used for debugging. */
-    private static final Logger log = Logger.getLogger(TestCase1DummyRun.class);
-
-    /**
-     * Should provide the name of the test case that this class implements. The exact names are defined in the
-     * interop testing spec.
-     *
-     * @return The name of the test case that this implements.
-     */
-    public String getName()
-    {
-        log.debug("public String getName(): called");
-
-        return "TC1_DummyRun";
-    }
-
-    /**
-     * Determines whether the test invite that matched this test case is acceptable.
-     *
-     * @param inviteMessage The invitation to accept or reject.
-     *
-     * @return <tt>true</tt> to accept the invitation, <tt>false</tt> to reject it.
-     *
-     * @throws JMSException Any JMSException resulting from reading the message are allowed to fall through.
-     */
-    public boolean acceptInvite(Message inviteMessage) throws JMSException
-    {
-        log.debug("public boolean acceptInvite(Message inviteMessage): called");
-
-        // Test parameters don't matter, accept all invites.
-        return true;
-    }
-
-    /**
-     * Assigns the role to be played by this test case. The test parameters are fully specified in the
-     * assignment message. When this method return the test case will be ready to execute.
-     *
-     * @param role              The role to be played; sender or receivers.
-     * @param assignRoleMessage The role assingment message, contains the full test parameters.
-     *
-     * @throws JMSException Any JMSException resulting from reading the message are allowed to fall through.
-     */
-    public void assignRole(Roles role, Message assignRoleMessage) throws JMSException
-    {
-        log.debug("public void assignRole(Roles role, Message assignRoleMessage): called");
-
-        // Do nothing, both roles are the same.
-    }
-
-    /**
-     * Performs the test case actions. Returning from here, indicates that the sending role has completed its test.
-     * 
-     * @param numMessages The number of test messages to send.
-     */
-    public void start(int numMessages)
-    {
-        log.debug("public void start(): called");
-
-        // Do nothing.
-    }
-
-    /**
-     * Gets a report on the actions performed by the test case in its assigned role.
-     *
-     * @param session The controlSession to create the report message in.
-     *
-     * @return The report message.
-     *
-     * @throws JMSException Any JMSExceptions resulting from creating the report are allowed to fall through.
-     */
-    public Message getReport(Session session) throws JMSException
-    {
-        log.debug("public Message getReport(Session controlSession): called");
-
-        // Generate a dummy report, the coordinator expects a report but doesn't care what it is.
-        return session.createTextMessage("Dummy Run, Ok.");
-    }
-
-    /**
-     * Handles incoming test messages. Does nothing.
-     *
-     * @param message The incoming test message.
-     */
-    public void onMessage(Message message)
-    {
-        log.debug("public void onMessage(Message message = " + message + "): called");
-
-        // Ignore any messages.
-    }
-}
diff --git a/qpid/java/integrationtests/src/main/java/org/apache/qpid/interop/clienttestcases/TestCase2BasicP2P.java b/qpid/java/integrationtests/src/main/java/org/apache/qpid/interop/clienttestcases/TestCase2BasicP2P.java
deleted file mode 100644
index 36d3cce7f7..0000000000
--- a/qpid/java/integrationtests/src/main/java/org/apache/qpid/interop/clienttestcases/TestCase2BasicP2P.java
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.interop.clienttestcases;
-
-import org.apache.log4j.Logger;
-
-import org.apache.qpid.test.framework.TestUtils;
-import org.apache.qpid.test.framework.distributedtesting.TestClient;
-import org.apache.qpid.test.framework.distributedtesting.TestClientControlledTest;
-
-import javax.jms.*;
-
-/**
- * Implements test case 2, basic P2P. Sends/received a specified number of messages to a specified route on the
- * default direct exchange. Produces reports on the actual number of messages sent/received.
- *
- * <p><table id="crc"><caption>CRC Card</caption>
- * <tr><th> Responsibilities <th> Collaborations
- * <tr><td> Supply the name of the test case that this implements.
- * <tr><td> Accept/Reject invites based on test parameters.
- * <tr><td> Adapt to assigned roles.
- * <tr><td> Send required number of test messages.
- * <tr><td> Generate test reports.
- * </table>
- */
-public class TestCase2BasicP2P implements TestClientControlledTest, MessageListener
-{
-    /** Used for debugging. */
-    private static final Logger log = Logger.getLogger(TestCase2BasicP2P.class);
-
-    /** Holds the count of test messages received. */
-    private int messageCount;
-
-    /** The role to be played by the test. */
-    private Roles role;
-
-    /** The number of test messages to send. */
-    private int numMessages;
-
-    /** The connection to send the test messages on. */
-    private Connection connection;
-
-    /** The controlSession to send the test messages on. */
-    private Session session;
-
-    /** The producer to send the test messages with. */
-    MessageProducer producer;
-
-    /**
-     * Should provide the name of the test case that this class implements. The exact names are defined in the
-     * interop testing spec.
-     *
-     * @return The name of the test case that this implements.
-     */
-    public String getName()
-    {
-        log.debug("public String getName(): called");
-
-        return "TC2_BasicP2P";
-    }
-
-    /**
-     * Determines whether the test invite that matched this test case is acceptable.
-     *
-     * @param inviteMessage The invitation to accept or reject.
-     *
-     * @return <tt>true</tt> to accept the invitation, <tt>false</tt> to reject it.
-     *
-     * @throws JMSException Any JMSException resulting from reading the message are allowed to fall through.
-     */
-    public boolean acceptInvite(Message inviteMessage) throws JMSException
-    {
-        log.debug("public boolean acceptInvite(Message inviteMessage = " + inviteMessage + "): called");
-
-        // All invites are acceptable.
-        return true;
-    }
-
-    /**
-     * Assigns the role to be played by this test case. The test parameters are fully specified in the
-     * assignment message. When this method return the test case will be ready to execute.
-     *
-     * @param role              The role to be played; sender or receivers.
-     *
-     * @param assignRoleMessage The role assingment message, contains the full test parameters.
-     *
-     * @throws JMSException Any JMSException resulting from reading the message are allowed to fall through.
-     */
-    public void assignRole(Roles role, Message assignRoleMessage) throws JMSException
-    {
-        log.debug("public void assignRole(Roles role = " + role + ", Message assignRoleMessage = " + assignRoleMessage
-            + "): called");
-
-        // Reset the message count for a new test.
-        messageCount = 0;
-
-        // Take note of the role to be played.
-        this.role = role;
-
-        // Create a new connection to pass the test messages on.
-        connection = TestUtils.createConnection(TestClient.testContextProperties);
-        session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
-
-        // Extract and retain the test parameters.
-        numMessages = assignRoleMessage.getIntProperty("P2P_NUM_MESSAGES");
-        Destination sendDestination = session.createQueue(assignRoleMessage.getStringProperty("P2P_QUEUE_AND_KEY_NAME"));
-
-        log.debug("numMessages = " + numMessages);
-        log.debug("sendDestination = " + sendDestination);
-        log.debug("role = " + role);
-
-        switch (role)
-        {
-        // Check if the sender role is being assigned, and set up a message producer if so.
-        case SENDER:
-            producer = session.createProducer(sendDestination);
-            break;
-
-        // Otherwise the receivers role is being assigned, so set this up to listen for messages.
-        case RECEIVER:
-            MessageConsumer consumer = session.createConsumer(sendDestination);
-            consumer.setMessageListener(this);
-            break;
-        }
-
-        connection.start();
-    }
-
-    /**
-     * Performs the test case actions. Returning from here, indicates that the sending role has completed its test.
-     *
-     * @param numMessages The number of test messages to send.
-     *
-     * @throws JMSException Any JMSException resulting from reading the message are allowed to fall through.
-     */
-    public void start(int numMessages) throws JMSException
-    {
-        log.debug("public void start(): called");
-
-        // Check that the sender role is being performed.
-        if (role.equals(Roles.SENDER))
-        {
-            Message testMessage = session.createTextMessage("test");
-
-            for (int i = 0; i < this.numMessages; i++)
-            {
-                producer.send(testMessage);
-
-                // Increment the message count.
-                messageCount++;
-            }
-        }
-    }
-
-    /**
-     * Gets a report on the actions performed by the test case in its assigned role.
-     *
-     * @param session The controlSession to create the report message in.
-     *
-     * @return The report message.
-     *
-     * @throws JMSException Any JMSExceptions resulting from creating the report are allowed to fall through.
-     */
-    public Message getReport(Session session) throws JMSException
-    {
-        log.debug("public Message getReport(Session controlSession): called");
-
-        // Close the test connection.
-        connection.close();
-
-        // Generate a report message containing the count of the number of messages passed.
-        Message report = session.createMessage();
-        report.setStringProperty("CONTROL_TYPE", "REPORT");
-        report.setIntProperty("MESSAGE_COUNT", messageCount);
-
-        return report;
-    }
-
-    /**
-     * Counts incoming test messages.
-     *
-     * @param message The incoming test message.
-     */
-    public void onMessage(Message message)
-    {
-        log.debug("public void onMessage(Message message = " + message + "): called");
-
-        // Increment the message count.
-        messageCount++;
-    }
-}
diff --git a/qpid/java/integrationtests/src/main/java/org/apache/qpid/interop/clienttestcases/TestCase3BasicPubSub.java b/qpid/java/integrationtests/src/main/java/org/apache/qpid/interop/clienttestcases/TestCase3BasicPubSub.java
deleted file mode 100644
index 205472716b..0000000000
--- a/qpid/java/integrationtests/src/main/java/org/apache/qpid/interop/clienttestcases/TestCase3BasicPubSub.java
+++ /dev/null
@@ -1,239 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.interop.clienttestcases;
-
-import org.apache.log4j.Logger;
-
-import org.apache.qpid.test.framework.TestUtils;
-import org.apache.qpid.test.framework.distributedtesting.TestClient;
-import org.apache.qpid.test.framework.distributedtesting.TestClientControlledTest;
-
-import javax.jms.*;
-
-/**
- * Implements test case 3, basic pub/sub. Sends/received a specified number of messages to a specified route on the
- * default topic exchange, using the specified number of receivers connections. Produces reports on the actual number of
- * messages sent/received.
- *
- * <p><table id="crc"><caption>CRC Card</caption>
- * <tr><th> Responsibilities <th> Collaborations
- * <tr><td> Supply the name of the test case that this implements.
- * <tr><td> Accept/Reject invites based on test parameters.
- * <tr><td> Adapt to assigned roles.
- * <tr><td> Send required number of test messages using pub/sub.
- * <tr><td> Generate test reports.
- * </table>
- */
-public class TestCase3BasicPubSub implements TestClientControlledTest, MessageListener
-{
-    /** Used for debugging. */
-    private static final Logger log = Logger.getLogger(TestCase3BasicPubSub.class);
-
-    /** Holds the count of test messages received. */
-    private int messageCount;
-
-    /** The role to be played by the test. */
-    private Roles role;
-
-    /** The number of test messages to send. */
-    private int numMessages;
-
-    /** The connections to send/receive the test messages on. */
-    private Connection[] connection;
-
-    /** The sessions to send/receive the test messages on. */
-    private Session[] session;
-
-    /** The producer to send the test messages with. */
-    MessageProducer producer;
-
-    /**
-     * Should provide the name of the test case that this class implements. The exact names are defined in the
-     * interop testing spec.
-     *
-     * @return The name of the test case that this implements.
-     */
-    public String getName()
-    {
-        log.debug("public String getName(): called");
-
-        return "TC3_BasicPubSub";
-    }
-
-    /**
-     * Determines whether the test invite that matched this test case is acceptable.
-     *
-     * @param inviteMessage The invitation to accept or reject.
-     *
-     * @return <tt>true</tt> to accept the invitation, <tt>false</tt> to reject it.
-     *
-     * @throws javax.jms.JMSException Any JMSException resulting from reading the message are allowed to fall through.
-     */
-    public boolean acceptInvite(Message inviteMessage) throws JMSException
-    {
-        log.debug("public boolean acceptInvite(Message inviteMessage = " + inviteMessage + "): called");
-
-        // All invites are acceptable.
-        return true;
-    }
-
-    /**
-     * Assigns the role to be played by this test case. The test parameters are fully specified in the
-     * assignment message. When this method return the test case will be ready to execute.
-     *
-     * @param role              The role to be played; sender or receivers.
-     *
-     * @param assignRoleMessage The role assingment message, contains the full test parameters.
-     *
-     * @throws JMSException Any JMSException resulting from reading the message are allowed to fall through.
-     */
-    public void assignRole(Roles role, Message assignRoleMessage) throws JMSException
-    {
-        log.debug("public void assignRole(Roles role = " + role + ", Message assignRoleMessage = " + assignRoleMessage
-            + "): called");
-
-        // Reset the message count for a new test.
-        messageCount = 0;
-
-        // Take note of the role to be played.
-        this.role = role;
-
-        // Extract and retain the test parameters.
-        numMessages = assignRoleMessage.getIntProperty("PUBSUB_NUM_MESSAGES");
-        int numReceivers = assignRoleMessage.getIntProperty("PUBSUB_NUM_RECEIVERS");
-        String sendKey = assignRoleMessage.getStringProperty("PUBSUB_KEY");
-
-        log.debug("numMessages = " + numMessages);
-        log.debug("numReceivers = " + numReceivers);
-        log.debug("sendKey = " + sendKey);
-        log.debug("role = " + role);
-
-        switch (role)
-        {
-        // Check if the sender role is being assigned, and set up a single message producer if so.
-        case SENDER:
-            // Create a new connection to pass the test messages on.
-            connection = new Connection[1];
-            session = new Session[1];
-
-            connection[0] = TestUtils.createConnection(TestClient.testContextProperties);
-            session[0] = connection[0].createSession(false, Session.AUTO_ACKNOWLEDGE);
-
-            // Extract and retain the test parameters.
-            Destination sendDestination = session[0].createTopic(sendKey);
-
-            producer = session[0].createProducer(sendDestination);
-            break;
-
-        // Otherwise the receivers role is being assigned, so set this up to listen for messages on the required number
-        // of receivers connections.
-        case RECEIVER:
-            // Create the required number of receivers connections.
-            connection = new Connection[numReceivers];
-            session = new Session[numReceivers];
-
-            for (int i = 0; i < numReceivers; i++)
-            {
-                connection[i] = TestUtils.createConnection(TestClient.testContextProperties);
-                session[i] = connection[i].createSession(false, Session.AUTO_ACKNOWLEDGE);
-
-                sendDestination = session[i].createTopic(sendKey);
-
-                MessageConsumer consumer = session[i].createConsumer(sendDestination);
-                consumer.setMessageListener(this);
-            }
-
-            break;
-        }
-
-        // Start all the connection dispatcher threads running.
-        for (Connection conn : connection)
-        {
-            conn.start();
-        }
-    }
-
-    /**
-     * Performs the test case actions. Returning from here, indicates that the sending role has completed its test.
-     *
-     * @param numMessages The number of test messages to send.
-     *
-     * @throws JMSException Any JMSException resulting from reading the message are allowed to fall through.
-     */
-    public void start(int numMessages) throws JMSException
-    {
-        log.debug("public void start(): called");
-
-        // Check that the sender role is being performed.
-        if (role.equals(Roles.SENDER))
-        {
-            Message testMessage = session[0].createTextMessage("test");
-
-            for (int i = 0; i < this.numMessages; i++)
-            {
-                producer.send(testMessage);
-
-                // Increment the message count.
-                messageCount++;
-            }
-        }
-    }
-
-    /**
-     * Gets a report on the actions performed by the test case in its assigned role.
-     *
-     * @param session The controlSession to create the report message in.
-     *
-     * @return The report message.
-     *
-     * @throws JMSException Any JMSExceptions resulting from creating the report are allowed to fall through.
-     */
-    public Message getReport(Session session) throws JMSException
-    {
-        log.debug("public Message getReport(Session controlSession): called");
-
-        // Close the test connections.
-        for (Connection conn : connection)
-        {
-            conn.close();
-        }
-
-        // Generate a report message containing the count of the number of messages passed.
-        Message report = session.createMessage();
-        report.setStringProperty("CONTROL_TYPE", "REPORT");
-        report.setIntProperty("MESSAGE_COUNT", messageCount);
-
-        return report;
-    }
-
-    /**
-     * Counts incoming test messages.
-     *
-     * @param message The incoming test message.
-     */
-    public void onMessage(Message message)
-    {
-        log.debug("public void onMessage(Message message = " + message + "): called");
-
-        // Increment the message count.
-        messageCount++;
-    }
-}
diff --git a/qpid/java/integrationtests/src/main/java/org/apache/qpid/interop/testcases/InteropTestCase1DummyRun.java b/qpid/java/integrationtests/src/main/java/org/apache/qpid/interop/testcases/InteropTestCase1DummyRun.java
deleted file mode 100644
index a2e4a00aa6..0000000000
--- a/qpid/java/integrationtests/src/main/java/org/apache/qpid/interop/testcases/InteropTestCase1DummyRun.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.interop.testcases;
-
-import org.apache.log4j.Logger;
-
-import org.apache.qpid.test.framework.FrameworkBaseCase;
-
-import java.util.Properties;
-
-/**
- * Coordinates test case 1, from the interop test specification. This test connects up the sender and receivers roles,
- * and gets some dummy test reports from them, in order to check that the test framework itself is operational.
- *
- * <p><table id="crc"><caption>CRC Card</caption>
- * <tr><th> Responsibilities <th> Collaborations
- * <tr><td> Exercises the interop testing framework without actually sending any test messages.
- *     <td> {@link FrameworkBaseCase}
- * </table>
- */
-public class InteropTestCase1DummyRun extends FrameworkBaseCase
-{
-    /** Used for debugging. */
-    private static final Logger log = Logger.getLogger(InteropTestCase1DummyRun.class);
-
-    /**
-     * Creates a new coordinating test case with the specified name.
-     *
-     * @param name The test case name.
-     */
-    public InteropTestCase1DummyRun(String name)
-    {
-        super(name);
-    }
-
-    /**
-     * Performs the basic P2P test case, "Test Case 2" in the specification.
-     *
-     * @throws Exception Any exceptions are allowed to fall through and fail the test.
-     */
-    public void testDummyRun() throws Exception
-    {
-        log.debug("public void testDummyRun(): called");
-
-        Properties testConfig = new Properties();
-        testConfig.put("TEST_NAME", "TC1_DummyRun");
-
-        /*Message[] reports =*/ getCircuitFactory().sequenceTest(null, null, testConfig);
-
-        // Compare sender and receivers reports.
-        // Assert.assertEquals("Expected to get 2 dummy reports.", 2, reports.length);
-    }
-
-    /**
-     * Should provide a translation from the junit method name of a test to its test case name as defined in the
-     * interop testing specification. For example the method "testP2P" might map onto the interop test case name
-     * "TC2_BasicP2P".
-     *
-     * @param methodName The name of the JUnit test method.
-     * @return The name of the corresponding interop test case.
-     */
-    public String getTestCaseNameForTestMethod(String methodName)
-    {
-        return "TC1_DummyRun";
-    }
-}
diff --git a/qpid/java/integrationtests/src/main/java/org/apache/qpid/interop/testcases/InteropTestCase2BasicP2P.java b/qpid/java/integrationtests/src/main/java/org/apache/qpid/interop/testcases/InteropTestCase2BasicP2P.java
deleted file mode 100644
index 6d6515f1fd..0000000000
--- a/qpid/java/integrationtests/src/main/java/org/apache/qpid/interop/testcases/InteropTestCase2BasicP2P.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.interop.testcases;
-
-import org.apache.log4j.Logger;
-
-import org.apache.qpid.test.framework.FrameworkBaseCase;
-
-import java.util.Properties;
-
-/**
- * Implements test case 2, from the interop test specification. This test sets up the TC2_BasicP2P test for 50
- * messages. It checks that the sender and receivers reports both indicate that all the test messages were transmitted
- * successfully.
- *
- * <p><table id="crc"><caption>CRC Card</caption>
- * <tr><th> Responsibilities <th> Collaborations
- * <tr><td> Setup p2p test parameters and compare with test output. <td> {@link FrameworkBaseCase}
- * </table>
- */
-public class InteropTestCase2BasicP2P extends FrameworkBaseCase
-{
-    /** Used for debugging. */
-    private static final Logger log = Logger.getLogger(InteropTestCase2BasicP2P.class);
-
-    /**
-     * Creates a new coordinating test case with the specified name.
-     *
-     * @param name The test case name.
-     */
-    public InteropTestCase2BasicP2P(String name)
-    {
-        super(name);
-    }
-
-    /**
-     * Performs the basic P2P test case, "Test Case 2" in the specification.
-     *
-     * @throws Exception Any exceptions are allowed to fall through and fail the test.
-     */
-    public void testBasicP2P() throws Exception
-    {
-        log.debug("public void testBasicP2P(): called");
-
-        Properties testConfig = new Properties();
-        testConfig.setProperty("TEST_NAME", "TC2_BasicP2P");
-        testConfig.setProperty("P2P_QUEUE_AND_KEY_NAME", "tc2queue");
-        testConfig.put("P2P_NUM_MESSAGES", 50);
-
-        /*Message[] reports =*/ getCircuitFactory().sequenceTest(null, null, testConfig);
-
-        // Compare sender and receivers reports.
-        /*int messagesSent = reports[0].getIntProperty("MESSAGE_COUNT");
-        int messagesReceived = reports[1].getIntProperty("MESSAGE_COUNT");
-
-        Assert.assertEquals("The requested number of messages were not sent.", 50, messagesSent);
-        Assert.assertEquals("Sender and receivers messages sent did not match up.", messagesSent, messagesReceived);*/
-    }
-
-    /**
-     * Should provide a translation from the junit method name of a test to its test case name as defined in the
-     * interop testing specification. For example the method "testP2P" might map onto the interop test case name
-     * "TC2_BasicP2P".
-     *
-     * @param methodName The name of the JUnit test method.
-     * @return The name of the corresponding interop test case.
-     */
-    public String getTestCaseNameForTestMethod(String methodName)
-    {
-        return "TC2_BasicP2P";
-    }
-}
diff --git a/qpid/java/integrationtests/src/main/java/org/apache/qpid/interop/testcases/InteropTestCase3BasicPubSub.java b/qpid/java/integrationtests/src/main/java/org/apache/qpid/interop/testcases/InteropTestCase3BasicPubSub.java
deleted file mode 100644
index 2faca91e73..0000000000
--- a/qpid/java/integrationtests/src/main/java/org/apache/qpid/interop/testcases/InteropTestCase3BasicPubSub.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.interop.testcases;
-
-import org.apache.log4j.Logger;
-
-import org.apache.qpid.test.framework.FrameworkBaseCase;
-
-import java.util.Properties;
-
-/**
- * <p><table id="crc"><caption>CRC Card</caption>
- * <tr><th> Responsibilities <th> Collaborations
- * <tr><td> Setup pub/sub test parameters and compare with test output. <td> {@link FrameworkBaseCase}
- * </table>
- */
-public class InteropTestCase3BasicPubSub extends FrameworkBaseCase
-{
-    /** Used for debugging. */
-    private static final Logger log = Logger.getLogger(InteropTestCase3BasicPubSub.class);
-
-    /**
-     * Creates a new coordinating test case with the specified name.
-     *
-     * @param name The test case name.
-     */
-    public InteropTestCase3BasicPubSub(String name)
-    {
-        super(name);
-    }
-
-    /**
-     * Performs the basic P2P test case, "Test Case 2" in the specification.
-     *
-     * @throws Exception Any exceptions are allowed to fall through and fail the test.
-     */
-    public void testBasicPubSub() throws Exception
-    {
-        log.debug("public void testBasicPubSub(): called");
-
-        Properties testConfig = new Properties();
-        testConfig.put("TEST_NAME", "TC3_BasicPubSub");
-        testConfig.put("PUBSUB_KEY", "tc3route");
-        testConfig.put("PUBSUB_NUM_MESSAGES", 10);
-        testConfig.put("PUBSUB_NUM_RECEIVERS", 5);
-
-        /*Message[] reports =*/ getCircuitFactory().sequenceTest(null, null, testConfig);
-
-        // Compare sender and receivers reports.
-        /*int messagesSent = reports[0].getIntProperty("MESSAGE_COUNT");
-        int messagesReceived = reports[1].getIntProperty("MESSAGE_COUNT");
-
-        Assert.assertEquals("The requested number of messages were not sent.", 10, messagesSent);
-        Assert.assertEquals("Received messages did not match up to num sent * num receivers.", messagesSent * 5,
-            messagesReceived);*/
-    }
-
-    /**
-     * Should provide a translation from the junit method name of a test to its test case name as defined in the
-     * interop testing specification. For example the method "testP2P" might map onto the interop test case name
-     * "TC2_BasicP2P".
-     *
-     * @param methodName The name of the JUnit test method.
-     * @return The name of the corresponding interop test case.
-     */
-    public String getTestCaseNameForTestMethod(String methodName)
-    {
-        return "TC3_BasicPubSub";
-    }
-}
diff --git a/qpid/java/integrationtests/src/main/java/org/apache/qpid/sustained/SustainedClientTestCase.java b/qpid/java/integrationtests/src/main/java/org/apache/qpid/sustained/SustainedClientTestCase.java
deleted file mode 100644
index 642f91b772..0000000000
--- a/qpid/java/integrationtests/src/main/java/org/apache/qpid/sustained/SustainedClientTestCase.java
+++ /dev/null
@@ -1,906 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.sustained;
-
-import org.apache.log4j.Logger;
-
-import org.apache.qpid.client.AMQNoConsumersException;
-import org.apache.qpid.client.AMQNoRouteException;
-import org.apache.qpid.test.framework.distributedtesting.TestClient;
-import org.apache.qpid.interop.clienttestcases.TestCase3BasicPubSub;
-import org.apache.qpid.test.framework.TestUtils;
-
-import javax.jms.Connection;
-import javax.jms.Destination;
-import javax.jms.ExceptionListener;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageListener;
-import javax.jms.MessageProducer;
-import javax.jms.Session;
-import javax.jms.TextMessage;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.concurrent.CountDownLatch;
-
-/**
- * Implements test case 3, basic pub/sub. Sends/received a specified number of messages to a specified route on the
- * default topic exchange, using the specified number of receivers connections. Produces reports on the actual number of
- * messages sent/received.
- *
- * <p><table id="crc"><caption>CRC Card</caption>
- * <tr><th> Responsibilities <th> Collaborations
- * <tr><td> Supply the name of the test case that this implements.
- * <tr><td> Accept/Reject invites based on test parameters.
- * <tr><td> Adapt to assigned roles.
- * <tr><td> Send required number of test messages using pub/sub. <tr><td> Generate test reports.
- * </table>
- */
-public class SustainedClientTestCase extends TestCase3BasicPubSub implements ExceptionListener, MessageListener
-{
-    /** Used for debugging. */
-    private static final Logger log = Logger.getLogger(SustainedClientTestCase.class);
-
-    /** Used to log to the console. */
-    private static final Logger console = Logger.getLogger("SustainedTest");
-
-    /** The role to be played by the test. */
-    private Roles role;
-
-    /** The number of receivers connection to use. */
-    private int numReceivers;
-
-    /** The routing key to send them to on the default direct exchange. */
-    private Destination sendDestination;
-
-    /** The routing key to send updates to on the default direct exchange. */
-    private Destination sendUpdateDestination;
-
-    /** The connections to send/receive the test messages on. */
-    private Connection[] connection;
-
-    /** The sessions to send/receive the test messages on. */
-    private Session[] session;
-
-    /** The producer to send the test messages with. */
-    MessageProducer producer;
-
-    /** Adapter that adjusts the send rate based on the updates from clients. */
-    SustainedRateAdapter _rateAdapter;
-
-    /**  */
-    int _batchSize;
-
-    private static final long TEN_MILLI_SEC = 10000000;
-    private static final int DEBUG_LOG_UPATE_INTERVAL = 10;
-    private static final int LOG_UPATE_INTERVAL = 10;
-    private static final boolean SLEEP_PER_MESSAGE = Boolean.getBoolean("sleepPerMessage");
-
-    /**
-     * Should provide the name of the test case that this class implements. The exact names are defined in the interop
-     * testing spec.
-     *
-     * @return The name of the test case that this implements.
-     */
-    public String getName()
-    {
-        log.debug("public String getName(): called");
-
-        return "Perf_SustainedPubSub";
-    }
-
-    /**
-     * Assigns the role to be played by this test case. The test parameters are fully specified in the assignment
-     * message. When this method return the test case will be ready to execute.
-     *
-     * @param role              The role to be played; sender or receivers.
-     * @param assignRoleMessage The role assingment message, contains the full test parameters.
-     *
-     * @throws JMSException Any JMSException resulting from reading the message are allowed to fall through.
-     */
-    public void assignRole(Roles role, Message assignRoleMessage) throws JMSException
-    {
-        log.debug("public void assignRole(Roles role = " + role + ", Message assignRoleMessage = " + assignRoleMessage
-            + "): called");
-
-        // Take note of the role to be played.
-        this.role = role;
-
-        // Extract and retain the test parameters.
-        numReceivers = assignRoleMessage.getIntProperty("SUSTAINED_NUM_RECEIVERS");
-        _batchSize = assignRoleMessage.getIntProperty("SUSTAINED_UPDATE_INTERVAL");
-        String sendKey = assignRoleMessage.getStringProperty("SUSTAINED_KEY");
-        String sendUpdateKey = assignRoleMessage.getStringProperty("SUSTAINED_UPDATE_KEY");
-        int ackMode = assignRoleMessage.getIntProperty("ACKNOWLEDGE_MODE");
-        String clientName = assignRoleMessage.getStringProperty("CLIENT_NAME");
-
-        if (log.isDebugEnabled())
-        {
-            log.debug("numReceivers = " + numReceivers);
-            log.debug("_batchSize = " + _batchSize);
-            log.debug("ackMode = " + ackMode);
-            log.debug("sendKey = " + sendKey);
-            log.debug("sendUpdateKey = " + sendUpdateKey);
-            log.debug("role = " + role);
-        }
-
-        switch (role)
-        {
-        // Check if the sender role is being assigned, and set up a single message producer if so.
-        case SENDER:
-            console.info("Creating Sender");
-            // Create a new connection to pass the test messages on.
-            connection = new Connection[1];
-            session = new Session[1];
-
-            connection[0] = TestUtils.createConnection(TestClient.testContextProperties);
-            session[0] = connection[0].createSession(false, ackMode);
-
-            // Extract and retain the test parameters.
-            sendDestination = session[0].createTopic(sendKey);
-
-            connection[0].setExceptionListener(this);
-
-            producer = session[0].createProducer(sendDestination);
-
-            sendUpdateDestination = session[0].createTopic(sendUpdateKey);
-            MessageConsumer updateConsumer = session[0].createConsumer(sendUpdateDestination);
-
-            _rateAdapter = new SustainedRateAdapter(this);
-            updateConsumer.setMessageListener(_rateAdapter);
-
-            break;
-
-        // Otherwise the receivers role is being assigned, so set this up to listen for messages on the required number
-        // of receivers connections.
-        case RECEIVER:
-            console.info("Creating Receiver");
-            // Create the required number of receivers connections.
-            connection = new Connection[numReceivers];
-            session = new Session[numReceivers];
-
-            for (int i = 0; i < numReceivers; i++)
-            {
-                connection[i] = TestUtils.createConnection(TestClient.testContextProperties);
-                session[i] = connection[i].createSession(false, ackMode);
-
-                sendDestination = session[i].createTopic(sendKey);
-
-                sendUpdateDestination = session[i].createTopic(sendUpdateKey);
-
-                MessageConsumer consumer = session[i].createConsumer(sendDestination);
-
-                consumer.setMessageListener(new SustainedListener(clientName + "-" + i, _batchSize, session[i],
-                        sendUpdateDestination));
-            }
-
-            break;
-        }
-
-        // Start all the connection dispatcher threads running.
-        for (int i = 0; i < connection.length; i++)
-        {
-            connection[i].start();
-        }
-    }
-
-    /** Performs the test case actions.
-     * @param numMessages*/
-    public void start(int numMessages) throws JMSException
-    {
-        log.debug("public void start(): called");
-
-        // Check that the sender role is being performed.
-        switch (role)
-        {
-        // Check if the sender role is being assigned, and set up a single message producer if so.
-        case SENDER:
-            _rateAdapter.run();
-            break;
-        case RECEIVER:
-
-        }
-
-        // return from here when you have finished the test.. this will signal the controller and
-    }
-
-    public void terminate() throws JMSException, InterruptedException
-    {
-        if (_rateAdapter != null)
-        {
-            _rateAdapter.stop();
-        }
-    }
-
-    /**
-     * Gets a report on the actions performed by the test case in its assigned role.
-     *
-     * @param session The controlSession to create the report message in.
-     *
-     * @return The report message.
-     *
-     * @throws JMSException Any JMSExceptions resulting from creating the report are allowed to fall through.
-     */
-    public Message getReport(Session session) throws JMSException
-    {
-        log.debug("public Message getReport(Session controlSession): called");
-
-        // Close the test connections.
-        for (int i = 0; i < connection.length; i++)
-        {
-            connection[i].close();
-        }
-
-        Message report = session.createMessage();
-        report.setStringProperty("CONTROL_TYPE", "REPORT");
-
-        return report;
-    }
-
-    public void onException(JMSException jmsException)
-    {
-        Exception linked = jmsException.getLinkedException();
-
-        if (linked != null)
-        {
-            if (log.isDebugEnabled())
-            {
-                log.debug("Linked Exception:" + linked);
-            }
-
-            if ((linked instanceof AMQNoRouteException) || (linked instanceof AMQNoConsumersException))
-            {
-                if (log.isDebugEnabled())
-                {
-                    if (linked instanceof AMQNoConsumersException)
-                    {
-                        log.warn("No clients currently available for message:"
-                            + ((AMQNoConsumersException) linked).getUndeliveredMessage());
-                    }
-                    else
-                    {
-                        log.warn("No route for message");
-                    }
-                }
-
-                // Tell the rate adapter that there are no clients ready yet
-                _rateAdapter.NO_CLIENTS = true;
-            }
-        }
-        else
-        {
-            log.warn("Exception:" + linked);
-        }
-    }
-
-    /**
-     * Inner class that listens for messages and sends a report for the time taken between receiving the 'start' and
-     * 'end' messages.
-     */
-    class SustainedListener implements MessageListener
-    {
-        /** Number of messages received */
-        private long _received = 0;
-        /** The number of messages in the batch */
-        private int _batchSize = 0;
-        /** Record of the when the 'start' messagse was sen */
-        private Long _startTime;
-        /** Message producer to use to send reports */
-        MessageProducer _updater;
-        /** Session to create the report message on */
-        Session _session;
-        /** Record of the client ID used for this SustainedListnener */
-        String _client;
-
-        /**
-         * Main Constructor
-         *
-         * @param clientname      The _client id used to identify this connection.
-         * @param batchSize       The number of messages that are to be sent per batch. Note: This is not used to
-         *                        control the interval between sending reports.
-         * @param session         The controlSession used for communication.
-         * @param sendDestination The destination that update reports should be sent to.
-         *
-         * @throws JMSException My occur if creatingthe Producer fails
-         */
-        public SustainedListener(String clientname, int batchSize, Session session, Destination sendDestination)
-            throws JMSException
-        {
-            _batchSize = batchSize;
-            _client = clientname;
-            _session = session;
-            _updater = session.createProducer(sendDestination);
-        }
-
-        public void onMessage(Message message)
-        {
-            if (log.isTraceEnabled())
-            {
-                log.trace("Message " + _received + "received in listener");
-            }
-
-            if (message instanceof TextMessage)
-            {
-                try
-                {
-                    _received++;
-                    if (((TextMessage) message).getText().equals("start"))
-                    {
-                        log.debug("Starting Batch");
-                        _startTime = System.nanoTime();
-                    }
-                    else if (((TextMessage) message).getText().equals("end"))
-                    {
-                        if (_startTime != null)
-                        {
-                            long currentTime = System.nanoTime();
-                            sendStatus(currentTime - _startTime, _received, message.getIntProperty("BATCH"));
-                            log.debug("End Batch");
-                        }
-                    }
-                }
-                catch (JMSException e)
-                {
-                    // ignore error
-                }
-            }
-
-        }
-
-        /**
-         * sendStatus creates and sends the report back to the publisher
-         *
-         * @param time     taken for the the last batch
-         * @param received Total number of messages received.
-         * @param batchNumber the batch number
-         * @throws JMSException if an error occurs during the send
-         */
-        private void sendStatus(long time, long received, int batchNumber) throws JMSException
-        {
-            Message updateMessage = _session.createTextMessage("update");
-            updateMessage.setStringProperty("CLIENT_ID", ":" + _client);
-            updateMessage.setStringProperty("CONTROL_TYPE", "UPDATE");
-            updateMessage.setLongProperty("RECEIVED", received);
-            updateMessage.setIntProperty("BATCH", batchNumber);
-            updateMessage.setLongProperty("DURATION", time);
-
-            if (log.isInfoEnabled())
-            {
-                log.info("**** SENDING [" + batchNumber + "]**** " + "CLIENT_ID:" + _client + " RECEIVED:" + received
-                    + " BATCH:" + batchNumber + " DURATION:" + time);
-            }
-
-            // Output on the main console.info the details of this batch
-            if ((batchNumber % 10) == 0)
-            {
-                console.info("Sending Report [" + batchNumber + "] " + "CLIENT_ID:" + _client + " RECEIVED:" + received
-                    + " BATCH:" + batchNumber + " DURATION:" + time);
-            }
-
-            _updater.send(updateMessage);
-        }
-    }
-
-    /**
-     * This class is used here to adjust the _delay value which in turn is used to control the number of messages/second
-     * that are sent through the test system.
-     *
-     * By keeping a record of the messages recevied and the average time taken to process the batch size can be
-     * calculated and so the delay can be adjusted to maintain that rate.
-     *
-     * Given that delays of < 10ms can be rounded up the delay is only used between messages if the _delay > 10ms * no
-     * messages in the batch. Otherwise the delay is used at the end of the batch.
-     */
-    class SustainedRateAdapter implements MessageListener, Runnable
-    {
-        private SustainedClientTestCase _client;
-        private long _batchVariance = Integer.getInteger("batchVariance", 3); // no. batches to allow drifting
-        private long _timeVariance = TEN_MILLI_SEC * 5; // no. nanos between send and report delay (10ms)
-        private volatile long _delay; // in nanos
-        private long _sent;
-        private Map<String, Long> _slowClients = new HashMap<String, Long>();
-        private static final long PAUSE_SLEEP = TEN_MILLI_SEC / 1000; // 10 ms
-        private static final long NO_CLIENT_SLEEP = 1000; // 1s
-        private volatile boolean NO_CLIENTS = true;
-        private int _delayShifting;
-        private final int REPORTS_WITHOUT_CHANGE = Integer.getInteger("stableReportCount", 5);
-        private boolean _warmedup = false;
-        private static final long EXPECTED_TIME_PER_BATCH = 100000L;
-        private int _warmUpBatches = Integer.getInteger("warmUpBatches", 10);
-
-        SustainedRateAdapter(SustainedClientTestCase client)
-        {
-            _client = client;
-        }
-
-        public void onMessage(Message message)
-        {
-            if (log.isDebugEnabled())
-            {
-                log.debug("SustainedRateAdapter onMessage(Message message = " + message + "): called");
-            }
-
-            try
-            {
-                String controlType = message.getStringProperty("CONTROL_TYPE");
-
-                // Check if the message is a test invite.
-                if ("UPDATE".equals(controlType))
-                {
-                    NO_CLIENTS = false;
-                    long duration = message.getLongProperty("DURATION");
-                    long totalReceived = message.getLongProperty("RECEIVED");
-                    String client = message.getStringProperty("CLIENT_ID");
-                    int batchNumber = message.getIntProperty("BATCH");
-
-                    if (log.isInfoEnabled() && ((batchNumber % DEBUG_LOG_UPATE_INTERVAL) == 0))
-                    {
-                        log.info("Update Report: CLIENT_ID:" + client + " RECEIVED:" + totalReceived + " Recevied BATCH:"
-                            + batchNumber + " DURATION:" + duration);
-                    }
-
-                    recordSlow(client, totalReceived, batchNumber);
-
-                    adjustDelay(client, batchNumber, duration);
-
-                    // Warm up completes when:
-                    // we haven't warmed up
-                    // and the number of batches sent to each client is at least half of the required warmup batches
-                    if (!_warmedup && (batchNumber >= _warmUpBatches))
-                    {
-                        _warmedup = true;
-                        _warmup.countDown();
-
-                    }
-                }
-            }
-            catch (JMSException e)
-            {
-                //
-            }
-        }
-
-        CountDownLatch _warmup = new CountDownLatch(1);
-
-        int _numBatches = 10000;
-
-        // long[] _timings = new long[_numBatches];
-        private boolean _running = true;
-
-        public void run()
-        {
-            console.info("Warming up");
-
-            doBatch(_warmUpBatches);
-
-            try
-            {
-                // wait for warmup to complete.
-                _warmup.await();
-
-                // set delay to the average length of the batches
-                _delay = _totalDuration / _warmUpBatches / delays.size();
-
-                console.info("Warmup complete delay set : " + _delay + " based on _totalDuration: " + _totalDuration
-                    + " over no. batches: " + _warmUpBatches + " with client count: " + delays.size());
-
-                _totalDuration = 0L;
-                _totalReceived = 0L;
-                _sent = 0L;
-            }
-            catch (InterruptedException e)
-            {
-                //
-            }
-
-            doBatch(_numBatches);
-
-        }
-
-        private void doBatch(int batchSize) // long[] timings,
-        {
-            TextMessage testMessage = null;
-            try
-            {
-                testMessage = _client.session[0].createTextMessage("start");
-
-                for (int batch = 0; batch <= batchSize; batch++)
-                // while (_running)
-                {
-                    long start = System.nanoTime();
-
-                    testMessage.setText("start");
-                    testMessage.setIntProperty("BATCH", batch);
-
-                    _client.producer.send(testMessage);
-                    _rateAdapter.sentMessage();
-
-                    testMessage.setText("test");
-                    // start at 2 so start and end count as part of batch
-                    for (int m = 2; m < _batchSize; m++)
-                    {
-                        _client.producer.send(testMessage);
-                        _rateAdapter.sentMessage();
-                    }
-
-                    testMessage.setText("end");
-                    _client.producer.send(testMessage);
-                    _rateAdapter.sentMessage();
-
-                    long end = System.nanoTime();
-
-                    long sendtime = end - start;
-
-                    if (log.isDebugEnabled())
-                    {
-                        log.info("Sent batch[" + batch + "](" + _batchSize + ") in " + sendtime); // timings[batch]);
-                    }
-
-                    if ((batch % LOG_UPATE_INTERVAL) == 0)
-                    {
-                        console.info("Sent Batch[" + batch + "](" + _batchSize + ")" + status());
-                    }
-
-                    _rateAdapter.sleepBatch();
-
-                }
-            }
-            catch (JMSException e)
-            {
-                console.error("Runner ended");
-            }
-        }
-
-        private String status()
-        {
-            return " TotalDuration: " + _totalDuration + " for " + delays.size() + " consumers" + " Delay is " + _delay
-                + " resulting in "
-                + ((_delay > (TEN_MILLI_SEC * _batchSize)) ? ((_delay / _batchSize) + "/msg") : (_delay + "/batch"));
-        }
-
-        private void sleepBatch()
-        {
-            if (checkForSlowClients())
-            { // if there werwe slow clients we have already slept so don't sleep anymore again.
-                return;
-            }
-
-            if (!SLEEP_PER_MESSAGE)
-            {
-                // per batch sleep.. if sleep is to small to spread over the batch.
-                if (_delay <= (TEN_MILLI_SEC * _batchSize))
-                {
-                    sleepLong(_delay);
-                }
-                else
-                {
-                    log.info("Not sleeping _delay > ten*batch is:" + _delay);
-                }
-            }
-        }
-
-        public void stop()
-        {
-            _running = false;
-        }
-
-        Map<String, Long> delays = new HashMap<String, Long>();
-        Long _totalReceived = 0L;
-        Long _totalDuration = 0L;
-        int _skipUpdate = 0;
-
-        /**
-         * Adjust the delay for sending messages based on this update from the client
-         *
-         * @param client        The client that send this update
-         * @param duration      The time taken for the last batch of messagse
-         * @param batchNumber   The reported batchnumber from the client
-         */
-        private void adjustDelay(String client, int batchNumber, long duration)
-        {
-            // Retrieve the current total time taken for this client.
-            Long currentTime = delays.get(client);
-
-            // Add the new duration time to this client
-            if (currentTime == null)
-            {
-                currentTime = duration;
-            }
-            else
-            {
-                currentTime += duration;
-            }
-
-            delays.put(client, currentTime);
-
-            long batchesSent = _sent / _batchSize;
-
-            // ensure we don't divide by zero
-            if (batchesSent == 0)
-            {
-                batchesSent = 1L;
-            }
-
-            _totalReceived += _batchSize;
-            _totalDuration += duration;
-
-            // calculate average duration accross clients per batch
-            long averageDuration = _totalDuration / delays.size() / batchesSent;
-
-            // calculate the difference between current send delay and average report delay
-            long diff = (duration) - averageDuration;
-
-            if (log.isInfoEnabled() && ((batchNumber % DEBUG_LOG_UPATE_INTERVAL) == 0))
-            {
-                log.info("TotalDuration:" + _totalDuration + " for " + delays.size() + " consumers." + " on batch: "
-                    + batchesSent + " received batch: " + batchNumber + " Batch Duration: " + duration + " Average: "
-                    + averageDuration + " so diff: " + diff + " for : " + client + " Delay is " + _delay + " resulting in "
-                    + ((_delay > (TEN_MILLI_SEC * _batchSize)) ? ((_delay / _batchSize) + "/msg") : (_delay + "/batch")));
-            }
-
-            // if the averageDuration differs from the current by more than the specified variane then adjust delay.
-            if (Math.abs(diff) > _timeVariance)
-            {
-
-                // if the the _delay is larger than the required duration to send report
-                // speed up
-                if (diff > TEN_MILLI_SEC)
-                {
-                    _delay -= TEN_MILLI_SEC;
-
-                    if (_delay < 0)
-                    {
-                        _delay = 0;
-                        log.info("Reset _delay to 0");
-                        delayStable();
-                    }
-                    else
-                    {
-                        delayChanged();
-                    }
-
-                }
-                else if (diff < 0) // diff < 0 diff cannot be 0 as it is > _timeVariance
-                {
-                    // the report took longer
-                    _delay += TEN_MILLI_SEC;
-                    delayChanged();
-                }
-            }
-            else
-            {
-                delayStable();
-            }
-
-            // If we have a consumer that is behind with the batches.
-            if ((batchesSent - batchNumber) > _batchVariance)
-            {
-                log.debug("Increasing _delay as sending more than receiving");
-
-                _delay += 2 * TEN_MILLI_SEC;
-                delayChanged();
-            }
-
-        }
-
-        /** Reset the number of iterations before we say the delay has stabilised. */
-        private void delayChanged()
-        {
-            _delayShifting = REPORTS_WITHOUT_CHANGE;
-        }
-
-        /**
-         * Record the fact that delay has stabilised If delay has stablised for REPORTS_WITHOUT_CHANGE then it will
-         * output Delay stabilised
-         */
-        private void delayStable()
-        {
-            _delayShifting--;
-
-            if (_delayShifting < 0)
-            {
-                _delayShifting = 0;
-                console.debug("Delay stabilised:" + _delay);
-            }
-        }
-
-        /**
-         * Checks that the client has received enough messages. If the client has fallen behind then they are put in the
-         * _slowClients lists which will increase the delay.
-         *
-         * @param client   The client identifier to check
-         * @param received the number of messages received by that client
-         * @param batchNumber
-         */
-        private void recordSlow(String client, long received, int batchNumber)
-        {
-            if (Math.abs(batchNumber - (_sent / _batchSize)) > _batchVariance)
-            {
-                _slowClients.put(client, received);
-            }
-            else
-            {
-                _slowClients.remove(client);
-            }
-        }
-
-        /** Incrment the number of sent messages and then sleep, if required. */
-        public void sentMessage()
-        {
-
-            _sent++;
-
-            if (_delay > (TEN_MILLI_SEC * _batchSize))
-            {
-                long batchDelay = _delay / _batchSize;
-                // less than 10ms sleep doesn't always work.
-                // _delay is in nano seconds
-                // if (batchDelay < (TEN_MILLI_SEC))
-                // {
-                // sleep(0, (int) batchDelay);
-                // }
-                // else
-                {
-                    // if (batchDelay < 30000000000L)
-                    {
-                        sleepLong(batchDelay);
-                    }
-                }
-            }
-            else
-            {
-                if (SLEEP_PER_MESSAGE && (_delay > 0))
-                {
-                    sleepLong(_delay / _batchSize);
-                }
-            }
-        }
-
-        /**
-         * Check at the end of each batch and pause sending messages to allow slow clients to catch up.
-         *
-         * @return true if there were slow clients that caught up.
-         */
-        private boolean checkForSlowClients()
-        {
-            // This will allways be true as we are running this at the end of each batchSize
-            // if (_sent % _batchSize == 0)
-            {
-                // Cause test to pause when we have slow
-                if (!_slowClients.isEmpty() || NO_CLIENTS)
-                {
-
-                    while (!_slowClients.isEmpty())
-                    {
-                        if (log.isInfoEnabled() && ((_sent / _batchSize % DEBUG_LOG_UPATE_INTERVAL) == 0))
-                        {
-                            String clients = "";
-                            Iterator it = _slowClients.keySet().iterator();
-                            while (it.hasNext())
-                            {
-                                clients += it.next();
-                                if (it.hasNext())
-                                {
-                                    clients += ", ";
-                                }
-                            }
-
-                            log.info("Pausing for slow clients:" + clients);
-                        }
-
-                        if (console.isDebugEnabled() && ((_sent / _batchSize % LOG_UPATE_INTERVAL) == 0))
-                        {
-                            console.debug(_slowClients.size() + " slow clients.");
-                        }
-
-                        sleep(PAUSE_SLEEP);
-                    }
-
-                    if (NO_CLIENTS)
-                    {
-                        sleep(NO_CLIENT_SLEEP);
-                    }
-
-                    log.debug("Continuing");
-
-                    return true;
-                }
-                else
-                {
-                    if ((_sent / _batchSize % LOG_UPATE_INTERVAL) == 0)
-                    {
-                        console.info("Total Delay :" + _delay + " "
-                            + ((_delayShifting == 0) ? "Stablised" : ("Not Stablised(" + _delayShifting + ")")));
-                    }
-                }
-
-            }
-
-            return false;
-        }
-
-        /**
-         * Sleep normally takes micro-seconds this allows the use of a nano-second value.
-         *
-         * @param delay nanoseconds to sleep for.
-         */
-        private void sleepLong(long delay)
-        {
-            sleep(delay / 1000000, (int) (delay % 1000000));
-        }
-
-        /**
-         * Sleep for the specified micro-seconds.
-         * @param sleep microseconds to sleep for.
-         */
-        private void sleep(long sleep)
-        {
-            sleep(sleep, 0);
-        }
-
-        /**
-         * Perform the sleep , swallowing any InteruptException.
-         *
-         * NOTE: If a sleep request is > 10s then reset only sleep for 5s
-         *
-         * @param milli to sleep for
-         * @param nano sub miliseconds to sleep for
-         */
-        private void sleep(long milli, int nano)
-        {
-            try
-            {
-                log.debug("Sleep:" + milli + ":" + nano);
-                if (milli > 10000)
-                {
-
-                    if (_delay == milli)
-                    {
-                        _totalDuration = _totalReceived / _batchSize * EXPECTED_TIME_PER_BATCH;
-                        log.error("Sleeping for more than 10 seconds adjusted to 5s!:" + (milli / 1000)
-                            + "s. Reset _totalDuration:" + _totalDuration);
-                    }
-                    else
-                    {
-                        log.error("Sleeping for more than 10 seconds adjusted to 5s!:" + (milli / 1000) + "s");
-                    }
-
-                    milli = 5000;
-                }
-
-                Thread.sleep(milli, nano);
-            }
-            catch (InterruptedException e)
-            {
-                //
-            }
-        }
-
-        public void setClient(SustainedClientTestCase client)
-        {
-            _client = client;
-        }
-    }
-
-}
diff --git a/qpid/java/integrationtests/src/main/java/org/apache/qpid/sustained/SustainedTestCase.java b/qpid/java/integrationtests/src/main/java/org/apache/qpid/sustained/SustainedTestCase.java
deleted file mode 100644
index 0077b4727a..0000000000
--- a/qpid/java/integrationtests/src/main/java/org/apache/qpid/sustained/SustainedTestCase.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.sustained;
-
-import org.apache.log4j.Logger;
-
-import org.apache.qpid.client.AMQSession;
-import org.apache.qpid.test.framework.DropInTest;
-import org.apache.qpid.test.framework.FrameworkBaseCase;
-
-import javax.jms.JMSException;
-import javax.jms.Message;
-
-import java.util.Properties;
-
-/**
- * SustainedTestCase is a {@link FrameworkBaseCase} that runs the "Perf_SustainedPubSub" test case. This consists of one
- * test client sending, and several receiving, and attempts to find the highest rate at which messages can be broadcast
- * to the receivers. It is also a {@link DropInTest} to which more test clients may be added during a test run.
- *
- * <p/><table id="crc"><caption>CRC Card</caption>
- * <tr><th> Responsibilities <th> Collaborations
- * <tr><td>
- * </table>
- */
-public class SustainedTestCase extends FrameworkBaseCase implements DropInTest
-{
-    /** Used for debugging. */
-    Logger log = Logger.getLogger(SustainedTestCase.class);
-
-    /** Holds the root name of the topic on which to send the test messages. */
-    private static final String SUSTAINED_KEY = "Perf_SustainedPubSub";
-
-    /**
-     * Creates a new coordinating test case with the specified name.
-     *
-     * @param name The test case name.
-     */
-    public SustainedTestCase(String name)
-    {
-        super(name);
-    }
-
-    /**
-     * Performs a single test run of the sustained test.
-     *
-     * @throws Exception Any exceptions are allowed to fall through and fail the test.
-     */
-    public void testBasicPubSub() throws Exception
-    {
-        log.debug("public void testSinglePubSubCycle(): called");
-
-        Properties testConfig = new Properties();
-        testConfig.put("TEST_NAME", "Perf_SustainedPubSub");
-        testConfig.put("SUSTAINED_KEY", SUSTAINED_KEY);
-        testConfig.put("SUSTAINED_NUM_RECEIVERS", Integer.getInteger("numReceives", 2));
-        testConfig.put("SUSTAINED_UPDATE_INTERVAL", Integer.getInteger("batchSize", 1000));
-        testConfig.put("SUSTAINED_UPDATE_KEY", SUSTAINED_KEY + ".UPDATE");
-        testConfig.put("ACKNOWLEDGE_MODE", Integer.getInteger("ackMode", AMQSession.AUTO_ACKNOWLEDGE));
-
-        log.info("Created Config: " + testConfig.entrySet().toArray());
-
-        getCircuitFactory().sequenceTest(null, null, testConfig);
-    }
-
-    /**
-     * Accepts a late joining client into this test case. The client will be enlisted with a control message
-     * with the 'CONTROL_TYPE' field set to the value 'LATEJOIN'. It should also provide values for the fields:
-     *
-     * <p/><table>
-     * <tr><td> CLIENT_NAME <td> A unique name for the new client.
-     * <tr><td> CLIENT_PRIVATE_CONTROL_KEY <td> The key for the route on which the client receives its control messages.
-     * </table>
-     *
-     * @param message The late joiners join message.
-     *
-     * @throws JMSException Any JMS Exception are allowed to fall through, indicating that the join failed.
-     */
-    public void lateJoin(Message message) throws JMSException
-    {
-        throw new RuntimeException("Not implemented.");
-        /*
-        // Extract the joining clients details from its join request message.
-        TestClientDetails clientDetails = new TestClientDetails();
-        clientDetails.clientName = message.getStringProperty("CLIENT_NAME");
-        clientDetails.privateControlKey = message.getStringProperty("CLIENT_PRIVATE_CONTROL_KEY");
-
-        // Register the joining client, but do block for confirmation as cannot do a synchronous receivers during this
-        // method call, as it may have been called from an 'onMessage' method.
-        assignReceiverRole(clientDetails, new Properties(), false);
-         */
-    }
-
-    /**
-     * Should provide a translation from the junit method name of a test to its test case name as known to the test
-     * clients that will run the test. The purpose of this is to convert the JUnit method name into the correct test
-     * case name to place into the test invite. For example the method "testP2P" might map onto the interop test case
-     * name "TC2_BasicP2P".
-     *
-     * @param methodName The name of the JUnit test method.
-     *
-     * @return The name of the corresponding interop test case.
-     */
-    public String getTestCaseNameForTestMethod(String methodName)
-    {
-        return "Perf_SustainedPubSub";
-    }
-}
diff --git a/qpid/java/integrationtests/src/main/java/org/apache/qpid/test/framework/distributedtesting/TestClient.java b/qpid/java/integrationtests/src/main/java/org/apache/qpid/test/framework/distributedtesting/TestClient.java
deleted file mode 100644
index 56cc0dbd98..0000000000
--- a/qpid/java/integrationtests/src/main/java/org/apache/qpid/test/framework/distributedtesting/TestClient.java
+++ /dev/null
@@ -1,464 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.test.framework.distributedtesting;
-
-import org.apache.log4j.Logger;
-import org.apache.log4j.NDC;
-
-import org.apache.qpid.interop.clienttestcases.TestCase1DummyRun;
-import org.apache.qpid.interop.clienttestcases.TestCase2BasicP2P;
-import org.apache.qpid.interop.clienttestcases.TestCase3BasicPubSub;
-import org.apache.qpid.sustained.SustainedClientTestCase;
-import org.apache.qpid.test.framework.MessagingTestConfigProperties;
-import org.apache.qpid.test.framework.TestUtils;
-import org.apache.qpid.test.framework.clocksynch.ClockSynchThread;
-import org.apache.qpid.test.framework.clocksynch.ClockSynchronizer;
-import org.apache.qpid.test.framework.clocksynch.UDPClockSynchronizer;
-import org.apache.qpid.test.framework.distributedcircuit.TestClientCircuitEnd;
-
-import uk.co.thebadgerset.junit.extensions.SleepThrottle;
-import uk.co.thebadgerset.junit.extensions.Throttle;
-import uk.co.thebadgerset.junit.extensions.util.ParsedProperties;
-import uk.co.thebadgerset.junit.extensions.util.TestContextProperties;
-
-import javax.jms.*;
-
-import java.util.*;
-
-/**
- * Implements a test client as described in the interop testing spec
- * (http://cwiki.apache.org/confluence/display/qpid/Interop+Testing+Specification). A test client is an agent that
- * reacts to control message sequences send by the test {@link Coordinator}.
- *
- * <p/><table><caption>Messages Handled by SustainedTestClient</caption>
- * <tr><th> Message               <th> Action
- * <tr><td> Invite(compulsory)    <td> Reply with Enlist.
- * <tr><td> Invite(test case)     <td> Reply with Enlist if test case available.
- * <tr><td> AssignRole(test case) <td> Reply with Accept Role if matches an enlisted test. Keep test parameters.
- * <tr><td> Start                 <td> Send test messages defined by test parameters. Send report on messages sent.
- * <tr><td> Status Request        <td> Send report on messages received.
- * <tr><td> Terminate             <td> Terminate the test client.
- * <tr><td> ClockSynch            <td> Synch clock against the supplied UDP address.
- * </table>
- *
- * <p><table id="crc"><caption>CRC Card</caption>
- * <tr><th> Responsibilities <th> Collaborations
- * <tr><td> Handle all incoming control messages. <td> {@link TestClientControlledTest}
- * <tr><td> Configure and look up test cases by name. <td> {@link TestClientControlledTest}
- * </table>
- */
-public class TestClient implements MessageListener
-{
-    /** Used for debugging. */
-    private static final Logger log = Logger.getLogger(TestClient.class);
-
-    /** Used for reporting to the console. */
-    private static final Logger console = Logger.getLogger("CONSOLE");
-
-    /** Holds the default identifying name of the test client. */
-    public static final String CLIENT_NAME = "java";
-
-    /** Holds the URL of the broker to run the tests on. */
-    public static String brokerUrl;
-
-    /** Holds the virtual host to run the tests on. If <tt>null</tt>, then the default virtual host is used. */
-    public static String virtualHost;
-
-    /**
-     * Holds the test context properties that provides the default test parameters, plus command line overrides.
-     * This is initialized with the default test parameters, to which command line overrides may be applied.
-     */
-    public static ParsedProperties testContextProperties =
-        TestContextProperties.getInstance(MessagingTestConfigProperties.defaults);
-
-    /** Holds all the test cases loaded from the classpath. */
-    Map<String, TestClientControlledTest> testCases = new HashMap<String, TestClientControlledTest>();
-
-    /** Holds the test case currently being run by this client. */
-    protected TestClientControlledTest currentTestCase;
-
-    /** Holds the connection to the broker that the test is being coordinated on. */
-    protected Connection connection;
-
-    /** Holds the message producer to hold the test coordination over. */
-    protected MessageProducer producer;
-
-    /** Holds the JMS controlSession for the test coordination. */
-    protected Session session;
-
-    /** Holds the name of this client, with a default value. */
-    protected String clientName = CLIENT_NAME;
-
-    /** This flag indicates that the test client should attempt to join the currently running test case on start up. */
-    protected boolean join;
-
-    /** Holds the clock synchronizer for the test node. */
-    ClockSynchThread clockSynchThread;
-
-    /**
-     * Creates a new interop test client, listenting to the specified broker and virtual host, with the specified client
-     * identifying name.
-     *
-     * @param brokerUrl   The url of the broker to connect to.
-     * @param virtualHost The virtual host to conect to.
-     * @param clientName  The client name to use.
-     * @param join        Flag to indicate that this client should attempt to join running tests.
-     */
-    public TestClient(String brokerUrl, String virtualHost, String clientName, boolean join)
-    {
-        log.debug("public TestClient(String brokerUrl = " + brokerUrl + ", String virtualHost = " + virtualHost
-            + ", String clientName = " + clientName + ", boolean join = " + join + "): called");
-
-        // Retain the connection parameters.
-        this.brokerUrl = brokerUrl;
-        this.virtualHost = virtualHost;
-        this.clientName = clientName;
-        this.join = join;
-    }
-
-    /**
-     * The entry point for the interop test coordinator. This client accepts the following command line arguments:
-     *
-     * <p/><table>
-     * <tr><td> -b         <td> The broker URL.       <td> Optional.
-     * <tr><td> -h         <td> The virtual host.     <td> Optional.
-     * <tr><td> -n         <td> The test client name. <td> Optional.
-     * <tr><td> name=value <td> Trailing argument define name/value pairs. Added to system properties. <td> Optional.
-     * </table>
-     *
-     * @param args The command line arguments.
-     */
-    public static void main(String[] args)
-    {
-        log.debug("public static void main(String[] args = " + Arrays.toString(args) + "): called");
-        console.info("Qpid Distributed Test Client.");
-
-        // Override the default broker url to be localhost:5672.
-        testContextProperties.setProperty(MessagingTestConfigProperties.BROKER_PROPNAME, "tcp://localhost:5672");
-
-        // Use the command line parser to evaluate the command line with standard handling behaviour (print errors
-        // and usage then exist if there are errors).
-        // Any options and trailing name=value pairs are also injected into the test context properties object,
-        // to override any defaults that may have been set up.
-        ParsedProperties options =
-            new ParsedProperties(uk.co.thebadgerset.junit.extensions.util.CommandLineParser.processCommandLine(args,
-                    new uk.co.thebadgerset.junit.extensions.util.CommandLineParser(
-                        new String[][]
-                        {
-                            { "b", "The broker URL.", "broker", "false" },
-                            { "h", "The virtual host to use.", "virtual host", "false" },
-                            { "o", "The name of the directory to output test timings to.", "dir", "false" },
-                            { "n", "The name of the test client.", "name", "false" },
-                            { "j", "Join this test client to running test.", "false" }
-                        }), testContextProperties));
-
-        // Extract the command line options.
-        String brokerUrl = options.getProperty("b");
-        String virtualHost = options.getProperty("h");
-        String clientName = options.getProperty("n");
-        clientName = (clientName == null) ? CLIENT_NAME : clientName;
-        boolean join = options.getPropertyAsBoolean("j");
-
-        // To distinguish logging output set up an NDC on the client name.
-        NDC.push(clientName);
-
-        // Create a test client and start it running.
-        TestClient client = new TestClient(brokerUrl, virtualHost, clientName, join);
-
-        // Use a class path scanner to find all the interop test case implementations.
-        // Hard code the test classes till the classpath scanner is fixed.
-        Collection<Class<? extends TestClientControlledTest>> testCaseClasses =
-            new ArrayList<Class<? extends TestClientControlledTest>>();
-        // ClasspathScanner.getMatches(TestClientControlledTest.class, "^TestCase.*", true);
-        Collections.addAll(testCaseClasses, TestCase1DummyRun.class, TestCase2BasicP2P.class, TestCase3BasicPubSub.class,
-            SustainedClientTestCase.class, TestClientCircuitEnd.class);
-
-        try
-        {
-            client.start(testCaseClasses);
-        }
-        catch (Exception e)
-        {
-            log.error("The test client was unable to start.", e);
-            console.info(e.getMessage());
-            System.exit(1);
-        }
-    }
-
-    /**
-     * Starts the interop test client running. This causes it to start listening for incoming test invites.
-     *
-     * @param testCaseClasses The classes of the available test cases. The test case names from these are used to
-     *                        matchin incoming test invites against.
-     *
-     * @throws JMSException Any underlying JMSExceptions are allowed to fall through.
-     */
-    protected void start(Collection<Class<? extends TestClientControlledTest>> testCaseClasses) throws JMSException
-    {
-        log.debug("protected void start(Collection<Class<? extends TestClientControlledTest>> testCaseClasses = "
-            + testCaseClasses + "): called");
-
-        // Create all the test case implementations and index them by the test names.
-        for (Class<? extends TestClientControlledTest> nextClass : testCaseClasses)
-        {
-            try
-            {
-                TestClientControlledTest testCase = nextClass.newInstance();
-                testCases.put(testCase.getName(), testCase);
-            }
-            catch (InstantiationException e)
-            {
-                log.warn("Could not instantiate test case class: " + nextClass.getName(), e);
-                // Ignored.
-            }
-            catch (IllegalAccessException e)
-            {
-                log.warn("Could not instantiate test case class due to illegal access: " + nextClass.getName(), e);
-                // Ignored.
-            }
-        }
-
-        // Open a connection to communicate with the coordinator on.
-        connection = TestUtils.createConnection(testContextProperties);
-        session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
-
-        // Set this up to listen for control messages.
-        Topic privateControlTopic = session.createTopic("iop.control." + clientName);
-        MessageConsumer consumer = session.createConsumer(privateControlTopic);
-        consumer.setMessageListener(this);
-
-        Topic controlTopic = session.createTopic("iop.control");
-        MessageConsumer consumer2 = session.createConsumer(controlTopic);
-        consumer2.setMessageListener(this);
-
-        // Create a producer to send replies with.
-        producer = session.createProducer(null);
-
-        // If the join flag was set, then broadcast a join message to notify the coordinator that a new test client
-        // is available to join the current test case, if it supports it. This message may be ignored, or it may result
-        // in this test client receiving a test invite.
-        if (join)
-        {
-            Message joinMessage = session.createMessage();
-
-            joinMessage.setStringProperty("CONTROL_TYPE", "JOIN");
-            joinMessage.setStringProperty("CLIENT_NAME", clientName);
-            joinMessage.setStringProperty("CLIENT_PRIVATE_CONTROL_KEY", "iop.control." + clientName);
-            producer.send(controlTopic, joinMessage);
-        }
-
-        // Start listening for incoming control messages.
-        connection.start();
-    }
-
-    /**
-     * Handles all incoming control messages.
-     *
-     * @param message The incoming message.
-     */
-    public void onMessage(Message message)
-    {
-        NDC.push(clientName);
-        log.debug("public void onMessage(Message message = " + message + "): called");
-
-        try
-        {
-            String controlType = message.getStringProperty("CONTROL_TYPE");
-            String testName = message.getStringProperty("TEST_NAME");
-
-            log.debug("Received control of type '" + controlType + "' for the test '" + testName + "'");
-
-            // Check if the message is a test invite.
-            if ("INVITE".equals(controlType))
-            {
-                // Flag used to indicate that an enlist should be sent. Only enlist to compulsory invites or invites
-                // for which test cases exist.
-                boolean enlist = false;
-
-                if (testName != null)
-                {
-                    log.debug("Got an invite to test: " + testName);
-
-                    // Check if the requested test case is available.
-                    TestClientControlledTest testCase = testCases.get(testName);
-
-                    if (testCase != null)
-                    {
-                        log.debug("Found implementing class for test '" + testName + "', enlisting for it.");
-
-                        // Check if the test case will accept the invitation.
-                        enlist = testCase.acceptInvite(message);
-
-                        log.debug("The test case "
-                            + (enlist ? " accepted the invite, enlisting for it."
-                                      : " did not accept the invite, not enlisting."));
-
-                        // Make the requested test case the current test case.
-                        currentTestCase = testCase;
-                    }
-                    else
-                    {
-                        log.debug("Received an invite to the test '" + testName + "' but this test is not known.");
-                    }
-                }
-                else
-                {
-                    log.debug("Got a compulsory invite, enlisting for it.");
-
-                    enlist = true;
-                }
-
-                if (enlist)
-                {
-                    // Reply with the client name in an Enlist message.
-                    Message enlistMessage = session.createMessage();
-                    enlistMessage.setStringProperty("CONTROL_TYPE", "ENLIST");
-                    enlistMessage.setStringProperty("CLIENT_NAME", clientName);
-                    enlistMessage.setStringProperty("CLIENT_PRIVATE_CONTROL_KEY", "iop.control." + clientName);
-                    enlistMessage.setJMSCorrelationID(message.getJMSCorrelationID());
-
-                    log.debug("Sending enlist message '" + enlistMessage + "' to " + message.getJMSReplyTo());
-
-                    producer.send(message.getJMSReplyTo(), enlistMessage);
-                }
-                else
-                {
-                    // Reply with the client name in an Decline message.
-                    Message enlistMessage = session.createMessage();
-                    enlistMessage.setStringProperty("CONTROL_TYPE", "DECLINE");
-                    enlistMessage.setStringProperty("CLIENT_NAME", clientName);
-                    enlistMessage.setStringProperty("CLIENT_PRIVATE_CONTROL_KEY", "iop.control." + clientName);
-                    enlistMessage.setJMSCorrelationID(message.getJMSCorrelationID());
-
-                    log.debug("Sending decline message '" + enlistMessage + "' to " + message.getJMSReplyTo());
-
-                    producer.send(message.getJMSReplyTo(), enlistMessage);
-                }
-            }
-            else if ("ASSIGN_ROLE".equals(controlType))
-            {
-                // Assign the role to the current test case.
-                String roleName = message.getStringProperty("ROLE");
-
-                log.debug("Got a role assignment to role: " + roleName);
-
-                TestClientControlledTest.Roles role = Enum.valueOf(TestClientControlledTest.Roles.class, roleName);
-
-                currentTestCase.assignRole(role, message);
-
-                // Reply by accepting the role in an Accept Role message.
-                Message acceptRoleMessage = session.createMessage();
-                acceptRoleMessage.setStringProperty("CLIENT_NAME", clientName);
-                acceptRoleMessage.setStringProperty("CONTROL_TYPE", "ACCEPT_ROLE");
-                acceptRoleMessage.setJMSCorrelationID(message.getJMSCorrelationID());
-
-                log.debug("Sending accept role message '" + acceptRoleMessage + "' to " + message.getJMSReplyTo());
-
-                producer.send(message.getJMSReplyTo(), acceptRoleMessage);
-            }
-            else if ("START".equals(controlType) || "STATUS_REQUEST".equals(controlType))
-            {
-                if ("START".equals(controlType))
-                {
-                    log.debug("Got a start notification.");
-
-                    // Extract the number of test messages to send from the start notification.
-                    int numMessages;
-
-                    try
-                    {
-                        numMessages = message.getIntProperty("MESSAGE_COUNT");
-                    }
-                    catch (NumberFormatException e)
-                    {
-                        // If the number of messages is not specified, use the default of one.
-                        numMessages = 1;
-                    }
-
-                    // Start the current test case.
-                    currentTestCase.start(numMessages);
-                }
-                else
-                {
-                    log.debug("Got a status request.");
-                }
-
-                // Generate the report from the test case and reply with it as a Report message.
-                Message reportMessage = currentTestCase.getReport(session);
-                reportMessage.setStringProperty("CLIENT_NAME", clientName);
-                reportMessage.setStringProperty("CONTROL_TYPE", "REPORT");
-                reportMessage.setJMSCorrelationID(message.getJMSCorrelationID());
-
-                log.debug("Sending report message '" + reportMessage + "' to " + message.getJMSReplyTo());
-
-                producer.send(message.getJMSReplyTo(), reportMessage);
-            }
-            else if ("TERMINATE".equals(controlType))
-            {
-                console.info("Received termination instruction from coordinator.");
-
-                // Is a cleaner shutdown needed?
-                connection.close();
-                System.exit(0);
-            }
-            else if ("CLOCK_SYNCH".equals(controlType))
-            {
-                log.debug("Received clock synch command.");
-                String address = message.getStringProperty("ADDRESS");
-
-                log.debug("address = " + address);
-
-                // Re-create (if necessary) and start the clock synch thread to synch the clock every ten seconds.
-                if (clockSynchThread != null)
-                {
-                    clockSynchThread.terminate();
-                }
-
-                SleepThrottle throttle = new SleepThrottle();
-                throttle.setRate(0.1f);
-
-                clockSynchThread = new ClockSynchThread(new UDPClockSynchronizer(address), throttle);
-                clockSynchThread.start();
-            }
-            else
-            {
-                // Log a warning about this but otherwise ignore it.
-                log.warn("Got an unknown control message, controlType = " + controlType + ", message = " + message);
-            }
-        }
-        catch (JMSException e)
-        {
-            // Log a warning about this, but otherwise ignore it.
-            log.warn("Got JMSException whilst handling message: " + message, e);
-        }
-        // Log any runtimes that fall through this message handler. These are fatal errors for the test client.
-        catch (RuntimeException e)
-        {
-            log.error("The test client message handler got an unhandled exception: ", e);
-            console.info("The message handler got an unhandled exception, terminating the test client.");
-            System.exit(1);
-        }
-        finally
-        {
-            NDC.pop();
-        }
-    }
-}
diff --git a/qpid/java/integrationtests/src/main/java/org/apache/qpid/util/ClasspathScanner.java b/qpid/java/integrationtests/src/main/java/org/apache/qpid/util/ClasspathScanner.java
deleted file mode 100644
index bad49060ca..0000000000
--- a/qpid/java/integrationtests/src/main/java/org/apache/qpid/util/ClasspathScanner.java
+++ /dev/null
@@ -1,234 +0,0 @@
-/*

- *

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- *

- *   http://www.apache.org/licenses/LICENSE-2.0

- *

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- *

- */

-package org.apache.qpid.util;

-

-import java.io.File;

-import java.util.*;

-import java.util.regex.Matcher;

-import java.util.regex.Pattern;

-

-import org.apache.log4j.Logger;

-

-/**

- * An ClasspathScanner scans the classpath for classes that implement an interface or extend a base class and have names

- * that match a regular expression.

- *

- * <p/>In order to test whether a class implements an interface or extends a class, the class must be loaded (unless

- * the class files were to be scanned directly). Using this collector can cause problems when it scans the classpath,

- * because loading classes will initialize their statics, which in turn may cause undesired side effects. For this

- * reason, the collector should always be used with a regular expression, through which the class file names are

- * filtered, and only those that pass this filter will be tested. For example, if you define tests in classes that

- * end with the keyword "Test" then use the regular expression "Test$" to match this.

- *

- * <p><table id="crc"><caption>CRC Card</caption>

- * <tr><th> Responsibilities <th> Collaborations

- * <tr><td> Find all classes matching type and name pattern on the classpath.

- * </table>

- *

- * @todo Add logic to scan jars as well as directories.

- */

-public class ClasspathScanner

-{

-    private static final Logger log = Logger.getLogger(ClasspathScanner.class);

-

-    /**

-     * Scans the classpath and returns all classes that extend a specified class and match a specified name.

-     * There is an flag that can be used to indicate that only Java Beans will be matched (that is, only those classes

-     * that have a default constructor).

-     *

-     * @param matchingClass  The class or interface to match.

-     * @param matchingRegexp The regular expression to match against the class name.

-     * @param beanOnly       Flag to indicate that onyl classes with default constructors should be matched.

-     *

-     * @return All the classes that match this collector.

-     */

-    public static <T> Collection<Class<? extends T>> getMatches(Class<T> matchingClass, String matchingRegexp,

-        boolean beanOnly)

-    {

-        log.debug("public static <T> Collection<Class<? extends T>> getMatches(Class<T> matchingClass = " + matchingClass

-            + ", String matchingRegexp = " + matchingRegexp + ", boolean beanOnly = " + beanOnly + "): called");

-

-        // Build a compiled regular expression from the pattern to match.

-        Pattern matchPattern = Pattern.compile(matchingRegexp);

-

-        String classPath = System.getProperty("java.class.path");

-        Map<String, Class<? extends T>> result = new HashMap<String, Class<? extends T>>();

-

-        log.debug("classPath = " + classPath);

-

-        // Find matching classes starting from all roots in the classpath.

-        for (String path : splitClassPath(classPath))

-        {

-            gatherFiles(new File(path), "", result, matchPattern, matchingClass);

-        }

-

-        return result.values();

-    }

-

-    /**

-     * Finds all matching classes rooted at a given location in the file system. If location is a directory it

-     * is recursively examined.

-     *

-     * @param classRoot     The root of the current point in the file system being examined.

-     * @param classFileName The name of the current file or directory to examine.

-     * @param result        The accumulated mapping from class names to classes that match the scan.

-     *

-     * @todo Recursion ok as file system depth is not likely to exhaust the stack. Might be better to replace with

-     *       iteration.

-     */

-    private static <T> void gatherFiles(File classRoot, String classFileName, Map<String, Class<? extends T>> result,

-        Pattern matchPattern, Class<? extends T> matchClass)

-    {

-        log.debug("private static <T> void gatherFiles(File classRoot = " + classRoot + ", String classFileName = "

-            + classFileName + ", Map<String, Class<? extends T>> result, Pattern matchPattern = " + matchPattern

-            + ", Class<? extends T> matchClass = " + matchClass + "): called");

-

-        File thisRoot = new File(classRoot, classFileName);

-

-        // If the current location is a file, check if it is a matching class.

-        if (thisRoot.isFile())

-        {

-            // Check that the file has a matching name.

-            if (matchesName(thisRoot.getName(), matchPattern))

-            {

-                String className = classNameFromFile(thisRoot.getName());

-

-                // Check that the class has matching type.

-                try

-                {

-                    Class<?> candidateClass = Class.forName(className);

-

-                    Class matchedClass = matchesClass(candidateClass, matchClass);

-

-                    if (matchedClass != null)

-                    {

-                        result.put(className, matchedClass);

-                    }

-                }

-                catch (ClassNotFoundException e)

-                {

-                    // Ignore this. The matching class could not be loaded.

-                    log.debug("Got ClassNotFoundException, ignoring.", e);

-                }

-            }

-

-            return;

-        }

-        // Otherwise the current location is a directory, so examine all of its contents.

-        else

-        {

-            String[] contents = thisRoot.list();

-

-            if (contents != null)

-            {

-                for (String content : contents)

-                {

-                    gatherFiles(classRoot, classFileName + File.separatorChar + content, result, matchPattern, matchClass);

-                }

-            }

-        }

-    }

-

-    /**

-     * Checks if the specified class file name corresponds to a class with name matching the specified regular expression.

-     *

-     * @param classFileName The class file name.

-     * @param matchPattern  The regular expression pattern to match.

-     *

-     * @return <tt>true</tt> if the class name matches, <tt>false</tt> otherwise.

-     */

-    private static boolean matchesName(String classFileName, Pattern matchPattern)

-    {

-        String className = classNameFromFile(classFileName);

-        Matcher matcher = matchPattern.matcher(className);

-

-        return matcher.matches();

-    }

-

-    /**

-     * Checks if the specified class to compare extends the base class being scanned for.

-     *

-     * @param matchingClass The base class to match against.

-     * @param toMatch       The class to match against the base class.

-     *

-     * @return The class to check, cast as an instance of the class to match if the class extends the base class, or

-     *         <tt>null</tt> otherwise.

-     */

-    private static <T> Class<? extends T> matchesClass(Class<?> matchingClass, Class<? extends T> toMatch)

-    {

-        try

-        {

-            return matchingClass.asSubclass(toMatch);

-        }

-        catch (ClassCastException e)

-        {

-            return null;

-        }

-    }

-

-    /**

-     * Takes a classpath (which is a series of paths) and splits it into its component paths.

-     *

-     * @param classPath The classpath to split.

-     *

-     * @return A list of the component paths that make up the class path.

-     */

-    private static List<String> splitClassPath(String classPath)

-    {

-        List<String> result = new LinkedList<String>();

-        String separator = System.getProperty("path.separator");

-        StringTokenizer tokenizer = new StringTokenizer(classPath, separator);

-

-        while (tokenizer.hasMoreTokens())

-        {

-            result.add(tokenizer.nextToken());

-        }

-

-        return result;

-    }

-

-    /**

-     * Translates from the filename of a class to its fully qualified classname. Files are named using forward slash

-     * seperators and end in ".class", whereas fully qualified class names use "." sperators and no ".class" ending.

-     *

-     * @param classFileName The filename of the class to translate to a class name.

-     *

-     * @return The fully qualified class name.

-     */

-    private static String classNameFromFile(String classFileName)

-    {

-        log.debug("private static String classNameFromFile(String classFileName = " + classFileName + "): called");

-

-        // Remove the .class ending.

-        String s = classFileName.substring(0, classFileName.length() - ".class".length());

-

-        // Turn / seperators in . seperators.

-        String s2 = s.replace(File.separatorChar, '.');

-

-        // Knock off any leading . caused by a leading /.

-        if (s2.startsWith("."))

-        {

-            return s2.substring(1);

-        }

-

-        return s2;

-    }

-}

diff --git a/qpid/java/integrationtests/src/main/java/org/apache/qpid/util/ConversationFactory.java b/qpid/java/integrationtests/src/main/java/org/apache/qpid/util/ConversationFactory.java
deleted file mode 100644
index 0090bec3d0..0000000000
--- a/qpid/java/integrationtests/src/main/java/org/apache/qpid/util/ConversationFactory.java
+++ /dev/null
@@ -1,479 +0,0 @@
-/*

- *

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- *

- *   http://www.apache.org/licenses/LICENSE-2.0

- *

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- *

- */

-package org.apache.qpid.util;

-

-import org.apache.log4j.Logger;

-

-import javax.jms.*;

-

-import java.util.*;

-import java.util.concurrent.BlockingQueue;

-import java.util.concurrent.LinkedBlockingQueue;

-import java.util.concurrent.TimeUnit;

-import java.util.concurrent.atomic.AtomicLong;

-

-/**

- * A conversation helper, uses a message correlation id pattern to match up sent and received messages as a conversation

- * over JMS messaging. Incoming message traffic is divided up by correlation id. Each id has a queue (behaviour dependant

- * on the queue implementation). Clients of this de-multiplexer can wait on messages, defined by message correlation ids.

- *

- * <p/>One use of this is as a conversation synchronizer where multiple threads are carrying out conversations over a

- * multiplexed messaging route. This can be usefull, as JMS sessions are not multi-threaded. Setting up the conversation

- * with synchronous queues will allow these threads to be written in a synchronous style, but with their execution order

- * governed by the asynchronous message flow. For example, something like the following code could run a multi-threaded

- * conversation (the conversation methods can be called many times in parallel):

- *

- * <p/><pre>

- * class Initiator

- * {

- * ConversationHelper conversation = new ConversationHelper(connection, null,

- *                                                          java.util.concurrent.LinkedBlockingQueue.class);

- *

- * initiateConversation()

- * {

- *  try {

- *   // Exchange greetings.

- *   conversation.send(sendDestination, conversation.getSession().createTextMessage("Hello."));

- *   Message greeting = conversation.receive();

- *

- *   // Exchange goodbyes.

- *   conversation.send(conversation.getSession().createTextMessage("Goodbye."));

- *   Message goodbye = conversation.receive();

- *  } finally {

- *   conversation.end();

- *  }

- * }

- * }

- *

- * class Responder

- * {

- * ConversationHelper conversation = new ConversationHelper(connection, receiveDestination,

- *                                                          java.util.concurrent.LinkedBlockingQueue.class);

- *

- * respondToConversation()

- * {

- *   try {

- *   // Exchange greetings.

- *   Message greeting = conversation.receive();

- *   conversation.send(conversation.getSession().createTextMessage("Hello."));

- *

- *   // Exchange goodbyes.

- *   Message goodbye = conversation.receive();

- *   conversation.send(conversation.getSession().createTextMessage("Goodbye."));

- *  } finally {

- *   conversation.end();

- *  }

- * }

- * }

- * </pre>

- *

- * <p/>Conversation correlation id's are generated on a per thread basis.

- *

- * <p/>The same session is shared amongst all conversations. Calls to send are therefore synchronized because JMS

- * sessions are not multi-threaded.

- *

- * <p/><table id="crc"><caption>CRC Card</caption>

- * <tr><th> Responsibilities <th> Collaborations

- * <tr><th> Associate messages to an ongoing conversation using correlation ids.

- * <tr><td> Auto manage sessions for conversations.

- * <tr><td> Store messages not in a conversation in dead letter box.

- * </table>

- */

-public class ConversationFactory

-{

-    /** Used for debugging. */

-    private static final Logger log = Logger.getLogger(ConversationFactory.class);

-

-    /** Holds a map from correlation id's to queues. */

-    private Map<Long, BlockingQueue<Message>> idsToQueues = new HashMap<Long, BlockingQueue<Message>>();

-

-    /** Holds the connection over which the conversation is conducted. */

-    private Connection connection;

-

-    /** Holds the session over which the conversation is conduxted. */

-    private Session session;

-

-    /** The message consumer for incoming messages. */

-    MessageConsumer consumer;

-

-    /** The message producer for outgoing messages. */

-    MessageProducer producer;

-

-    /** The well-known or temporary destination to receive replies on. */

-    Destination receiveDestination;

-

-    /** Holds the queue implementation class for the reply queue. */

-    Class<? extends BlockingQueue> queueClass;

-

-    /** Used to hold any replies that are received outside of the context of a conversation. */

-    BlockingQueue<Message> deadLetterBox = new LinkedBlockingQueue<Message>();

-

-    /* Used to hold conversation state on a per thread basis. */

-    /*

-    ThreadLocal<Conversation> threadLocals =

-        new ThreadLocal<Conversation>()

-        {

-            protected Conversation initialValue()

-            {

-                Conversation settings = new Conversation();

-                settings.conversationId = conversationIdGenerator.getAndIncrement();

-

-                return settings;

-            }

-        };

-     */

-

-    /** Generates new coversation id's as needed. */

-    AtomicLong conversationIdGenerator = new AtomicLong();

-

-    /**

-     * Creates a conversation helper on the specified connection with the default sending destination, and listening

-     * to the specified receiving destination.

-     *

-     * @param connection         The connection to build the conversation helper on.

-     * @param receiveDestination The destination to listen to for incoming messages. This may be null to use a temporary

-     *                           queue.

-     * @param queueClass         The queue implementation class.

-     *

-     * @throws JMSException All underlying JMSExceptions are allowed to fall through.

-     */

-    public ConversationFactory(Connection connection, Destination receiveDestination,

-        Class<? extends BlockingQueue> queueClass) throws JMSException

-    {

-        log.debug("public ConversationFactory(Connection connection, Destination receiveDestination = " + receiveDestination

-            + ", Class<? extends BlockingQueue> queueClass = " + queueClass + "): called");

-

-        this.connection = connection;

-        this.queueClass = queueClass;

-

-        session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);

-

-        // Check if a well-known receive destination has been provided, or use a temporary queue if not.

-        this.receiveDestination = (receiveDestination != null) ? receiveDestination : session.createTemporaryQueue();

-

-        consumer = session.createConsumer(receiveDestination);

-        producer = session.createProducer(null);

-

-        consumer.setMessageListener(new Receiver());

-    }

-

-    /**

-     * Creates a new conversation context.

-     *

-     * @return A new conversation context.

-     */

-    public Conversation startConversation()

-    {

-        log.debug("public Conversation startConversation(): called");

-

-        Conversation conversation = new Conversation();

-        conversation.conversationId = conversationIdGenerator.getAndIncrement();

-

-        return conversation;

-    }

-

-    /**

-     * Ensures that the reply queue for a conversation exists.

-     *

-     * @param conversationId The conversation correlation id.

-     */

-    private void initQueueForId(long conversationId)

-    {

-        if (!idsToQueues.containsKey(conversationId))

-        {

-            idsToQueues.put(conversationId, ReflectionUtils.<BlockingQueue>newInstance(queueClass));

-        }

-    }

-

-    /**

-     * Clears the dead letter box, returning all messages that were in it.

-     *

-     * @return All messages in the dead letter box.

-     */

-    public Collection<Message> emptyDeadLetterBox()

-    {

-        log.debug("public Collection<Message> emptyDeadLetterBox(): called");

-

-        Collection<Message> result = new ArrayList<Message>();

-        deadLetterBox.drainTo(result);

-

-        return result;

-    }

-

-    /**

-     * Gets the session over which the conversation is conducted.

-     *

-     * @return The session over which the conversation is conducted.

-     */

-    public Session getSession()

-    {

-        // Conversation settings = threadLocals.get();

-

-        return session;

-    }

-

-    /**

-     * Used to hold a conversation context. This consists of a correlating id for the conversation, and a reply

-     * destination automatically updated to the last received reply-to destination.

-     */

-    public class Conversation

-    {

-        /** Holds the correlation id for the context. */

-        long conversationId;

-

-        /**

-         * Holds the send destination for the context. This will automatically be updated to the most recently received

-         * reply-to destination.

-         */

-        Destination sendDestination;

-

-        /**

-         * Sends a message to the default sending location. The correlation id of the message will be assigned by this

-         * method, overriding any previously set value.

-         *

-         * @param sendDestination The destination to send to. This may be null to use the last received reply-to

-         *                        destination.

-         * @param message         The message to send.

-         *

-         * @throws JMSException All undelying JMSExceptions are allowed to fall through. This will also be thrown if no

-         *                      send destination is specified and there is no most recent reply-to destination available

-         *                      to use.

-         */

-        public void send(Destination sendDestination, Message message) throws JMSException

-        {

-            log.debug("public void send(Destination sendDestination = " + sendDestination + ", Message message = " + message

-                + "): called");

-

-            // Conversation settings = threadLocals.get();

-            // long conversationId = conversationId;

-            message.setJMSCorrelationID(Long.toString(conversationId));

-            message.setJMSReplyTo(receiveDestination);

-

-            // Ensure that the reply queue for this conversation exists.

-            initQueueForId(conversationId);

-

-            // Check if an overriding send to destination has been set or use the last reply-to if not.

-            Destination sendTo = null;

-

-            if (sendDestination != null)

-            {

-                sendTo = sendDestination;

-            }

-            else if (sendDestination != null)

-            {

-                sendTo = sendDestination;

-            }

-            else

-            {

-                throw new JMSException("The send destination was specified, and no most recent reply-to available to use.");

-            }

-

-            // Send the message.

-            synchronized (this)

-            {

-                producer.send(sendTo, message);

-            }

-        }

-

-        /**

-         * Gets the next message in an ongoing conversation. This method may block until such a message is received.

-         *

-         * @return The next incoming message in the conversation.

-         *

-         * @throws JMSException All undelying JMSExceptions are allowed to fall through. Thrown if the received message

-         *                      did not have its reply-to destination set up.

-         */

-        public Message receive() throws JMSException

-        {

-            log.debug("public Message receive(): called");

-

-            // Conversation settings = threadLocals.get();

-            // long conversationId = settings.conversationId;

-

-            // Ensure that the reply queue for this conversation exists.

-            initQueueForId(conversationId);

-

-            BlockingQueue<Message> queue = idsToQueues.get(conversationId);

-

-            try

-            {

-                Message result = queue.take();

-

-                // Keep the reply-to destination to send replies to.

-                sendDestination = result.getJMSReplyTo();

-

-                return result;

-            }

-            catch (InterruptedException e)

-            {

-                return null;

-            }

-        }

-

-        /**

-         * Gets many messages in an ongoing conversation. If a limit is specified, then once that many messages are

-         * received they will be returned. If a timeout is specified, then all messages up to the limit, received within

-         * that timespan will be returned. At least one of the message count or timeout should be set to a value of

-         * 1 or greater.

-         *

-         * @param num     The number of messages to receive, or all if this is less than 1.

-         * @param timeout The timeout in milliseconds to receive the messages in, or forever if this is less than 1.

-         *

-         * @return All messages received within the count limit and the timeout.

-         *

-         * @throws JMSException All undelying JMSExceptions are allowed to fall through.

-         */

-        public Collection<Message> receiveAll(int num, long timeout) throws JMSException

-        {

-            log.debug("public Collection<Message> receiveAll(int num = " + num + ", long timeout = " + timeout

-                + "): called");

-

-            // Check that a timeout or message count was set.

-            if ((num < 1) && (timeout < 1))

-            {

-                throw new IllegalArgumentException("At least one of message count (num) or timeout must be set.");

-            }

-

-            // Ensure that the reply queue for this conversation exists.

-            initQueueForId(conversationId);

-            BlockingQueue<Message> queue = idsToQueues.get(conversationId);

-

-            // Used to collect the received messages in.

-            Collection<Message> result = new ArrayList<Message>();

-

-            // Used to indicate when the timeout or message count has expired.

-            boolean receiveMore = true;

-

-            int messageCount = 0;

-

-            // Receive messages until the timeout or message count expires.

-            do

-            {

-                try

-                {

-                    Message next = null;

-

-                    // Try to receive the message with a timeout if one has been set.

-                    if (timeout > 0)

-                    {

-                        next = queue.poll(timeout, TimeUnit.MILLISECONDS);

-

-                        // Check if the timeout expired, and stop receiving if so.

-                        if (next == null)

-                        {

-                            receiveMore = false;

-                        }

-                    }

-                    // Receive the message without a timeout.

-                    else

-                    {

-                        next = queue.take();

-                    }

-

-                    // Increment the message count if a message was received.

-                    messageCount += (next != null) ? 1 : 0;

-

-                    // Check if all the requested messages were received, and stop receiving if so.

-                    if ((num > 0) && (messageCount >= num))

-                    {

-                        receiveMore = false;

-                    }

-

-                    // Keep the reply-to destination to send replies to.

-                    sendDestination = (next != null) ? next.getJMSReplyTo() : sendDestination;

-

-                    if (next != null)

-                    {

-                        result.add(next);

-                    }

-                }

-                catch (InterruptedException e)

-                {

-                    // Restore the threads interrupted status.

-                    Thread.currentThread().interrupt();

-

-                    // Stop receiving but return the messages received so far.

-                    receiveMore = false;

-                }

-            }

-            while (receiveMore);

-

-            return result;

-        }

-

-        /**

-         * Completes the conversation. Any correlation id's pertaining to the conversation are no longer valid, and any

-         * incoming messages using them will go to the dead letter box.

-         */

-        public void end()

-        {

-            log.debug("public void end(): called");

-

-            // Ensure that the thread local for the current thread is cleaned up.

-            // Conversation settings = threadLocals.get();

-            // long conversationId = settings.conversationId;

-            // threadLocals.remove();

-

-            // Ensure that its queue is removed from the queue map.

-            BlockingQueue<Message> queue = idsToQueues.remove(conversationId);

-

-            // Move any outstanding messages on the threads conversation id into the dead letter box.

-            queue.drainTo(deadLetterBox);

-        }

-    }

-

-    /**

-     * Implements the message listener for this conversation handler.

-     */

-    protected class Receiver implements MessageListener

-    {

-        /**

-         * Handles all incoming messages in the ongoing conversations. These messages are split up by correaltion id

-         * and placed into queues.

-         *

-         * @param message The incoming message.

-         */

-        public void onMessage(Message message)

-        {

-            log.debug("public void onMessage(Message message = " + message + "): called");

-

-            try

-            {

-                Long conversationId = Long.parseLong(message.getJMSCorrelationID());

-

-                // Find the converstaion queue to place the message on. If there is no conversation for the message id,

-                // the the dead letter box queue is used.

-                BlockingQueue<Message> queue = idsToQueues.get(conversationId);

-                queue = (queue == null) ? deadLetterBox : queue;

-

-                queue.put(message);

-            }

-            catch (JMSException e)

-            {

-                throw new RuntimeException(e);

-            }

-            catch (InterruptedException e)

-            {

-                throw new RuntimeException(e);

-            }

-        }

-    }

-}

diff --git a/qpid/java/integrationtests/src/resources/org/apache/qpid/interop/connection.properties b/qpid/java/integrationtests/src/resources/org/apache/qpid/interop/connection.properties
deleted file mode 100644
index a5fb611dfa..0000000000
--- a/qpid/java/integrationtests/src/resources/org/apache/qpid/interop/connection.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-#

-# Licensed to the Apache Software Foundation (ASF) under one

-# or more contributor license agreements.  See the NOTICE file

-# distributed with this work for additional information

-# regarding copyright ownership.  The ASF licenses this file

-# to you under the Apache License, Version 2.0 (the

-# "License"); you may not use this file except in compliance

-# with the License.  You may obtain a copy of the License at

-#

-#   http://www.apache.org/licenses/LICENSE-2.0

-#

-# Unless required by applicable law or agreed to in writing,

-# software distributed under the License is distributed on an

-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-# KIND, either express or implied.  See the License for the

-# specific language governing permissions and limitations

-# under the License.

-#

-java.naming.factory.initial = org.apache.qpid.jndi.PropertiesFileInitialContextFactory

-connectionfactory.broker = amqp://guest:guest@clientid/?brokerlist='tcp://localhost:5672'

diff --git a/qpid/java/integrationtests/src/resources/sustained-log4j.xml b/qpid/java/integrationtests/src/resources/sustained-log4j.xml
deleted file mode 100644
index c5ab3137bf..0000000000
--- a/qpid/java/integrationtests/src/resources/sustained-log4j.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0"?>
-<!--
- -
- - Licensed to the Apache Software Foundation (ASF) under one
- - or more contributor license agreements.  See the NOTICE file
- - distributed with this work for additional information
- - regarding copyright ownership.  The ASF licenses this file
- - to you under the Apache License, Version 2.0 (the
- - "License"); you may not use this file except in compliance
- - with the License.  You may obtain a copy of the License at
- -
- -   http://www.apache.org/licenses/LICENSE-2.0
- -
- - Unless required by applicable law or agreed to in writing,
- - software distributed under the License is distributed on an
- - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- - KIND, either express or implied.  See the License for the
- - specific language governing permissions and limitations
- - under the License.
- -
- -->
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
-
-
-    <appender name="FileAppender" class="org.apache.log4j.FileAppender">
-        <param name="File" value="${QPID_WORK}/log/${logprefix}qpid${logsuffix}.log"/>
-        <param name="Append" value="false"/>
-
-        <layout class="org.apache.log4j.PatternLayout">
-            <param name="ConversionPattern" value="%d %-5p [%t] %C{2} (%F:%L) - %m%n"/>
-        </layout>
-    </appender>
-
-    <appender name="STDOUT" class="org.apache.log4j.ConsoleAppender">
-
-        <layout class="org.apache.log4j.PatternLayout">
-            <param name="ConversionPattern" value="%d %-5p (%F:%L) - %m%n"/>
-            <!--param name="ConversionPattern" value="%d %-5p [%t] %C{2} (%F:%L) - %m%n"/-->
-        </layout>
-    </appender>
-
-    <category name="SustainedTest">
-        <priority value="${sustained.level}"/>
-    </category>
-
-    <category name="org.apache">
-        <priority value="warn"/>
-    </category>
-
-    <category name="org.apache.qpid.interop">
-        <priority value="${interop.logging.level}"/>
-    </category>
-
-
-    <category name="org.apache.qpid.sustained">
-        <priority value="${amqj.logging.level}"/>
-    </category>
-
-    <!--category name="org.apache.qpid.server.txn">
-        <priority value="debug"/>
-    </category>-->
-
-    <root>
-        <priority value="all"/>
-        <appender-ref ref="STDOUT"/>
-        <!--appender-ref ref="ArchivingFileAppender"/-->
-    </root>
-</log4j:configuration>
diff --git a/qpid/java/management/eclipse-plugin/META-INF/MANIFEST.MF b/qpid/java/management/eclipse-plugin/META-INF/MANIFEST.MF
deleted file mode 100644
index 658fa2cb4c..0000000000
--- a/qpid/java/management/eclipse-plugin/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,14 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Qpid Management Console Plug-in
-Bundle-SymbolicName: org.apache.qpid.management.ui; singleton:=true
-Bundle-Version: 0.1.0
-Bundle-Activator: org.apache.qpid.management.ui.Activator
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.ui.forms,
- jmxremote.sasl,
- org.apache.commons.codec
-Eclipse-LazyStart: true
-Bundle-Vendor: Apache Software Foundation
diff --git a/qpid/java/management/eclipse-plugin/README.txt b/qpid/java/management/eclipse-plugin/README.txt
deleted file mode 100644
index 5325bf27ec..0000000000
--- a/qpid/java/management/eclipse-plugin/README.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-
-Running the Qpid Management Console (eclipse-plugin)
-----------------------------------------------------
-
-To run the management console, set the QPIDMC_HOME environment variable to
-qpid management console root directory (e.g. C:/qpidmc)and add $QPIDMC_HOME/bin to your PATH.
-Then run the script to launch the management console-
-For Windows:
-------------
-qpidmc.bat
-qpidmc.sh (using cygwin)
-
-Unix:
------
-qpidmc.sh <operating system> <windowing system> <platform achitecture>
-eg. qpidms.sh linux motif x86
-qpidmc_motif.sh
-qpidmc_gtk.sh
-
-Apache confluence page for latest information:
-http://cwiki.apache.org/confluence/display/qpid/Qpid+Management+Console
diff --git a/qpid/java/management/eclipse-plugin/bin/qpidmc.bat b/qpid/java/management/eclipse-plugin/bin/qpidmc.bat
deleted file mode 100644
index 1f3207f043..0000000000
--- a/qpid/java/management/eclipse-plugin/bin/qpidmc.bat
+++ /dev/null
@@ -1,55 +0,0 @@
-@REM

-@REM Licensed to the Apache Software Foundation (ASF) under one

-@REM or more contributor license agreements.  See the NOTICE file

-@REM distributed with this work for additional information

-@REM regarding copyright ownership.  The ASF licenses this file

-@REM to you under the Apache License, Version 2.0 (the

-@REM "License"); you may not use this file except in compliance

-@REM with the License.  You may obtain a copy of the License at

-@REM 

-@REM   http://www.apache.org/licenses/LICENSE-2.0

-@REM 

-@REM Unless required by applicable law or agreed to in writing,

-@REM software distributed under the License is distributed on an

-@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-@REM KIND, either express or implied.  See the License for the

-@REM specific language governing permissions and limitations

-@REM under the License.

-@REM

-

-@echo off

-REM Script to run the Qpid Management Console

-

-rem Guess QPIDMC_HOME if not defined

-set CURRENT_DIR=%cd%

-if not "%QPIDMC_HOME%" == "" goto gotHome

-set QPIDMC_HOME=%CURRENT_DIR%

-echo %QPIDMC_HOME%

-if exist "%QPIDMC_HOME%\bin\qpidmc.bat" goto okHome

-cd ..

-set QPIDMC_HOME=%cd%

-cd %CURRENT_DIR%

-:gotHome

-if exist "%QPIDMC_HOME%\bin\qpidmc.bat" goto okHome

-echo The QPIDMC_HOME environment variable is not defined correctly

-echo This environment variable is needed to run this program

-goto end

-:okHome

-

-if not "%JAVA_HOME%" == "" goto gotJavaHome

-echo The JAVA_HOME environment variable is not defined

-echo This environment variable is needed to run this program

-goto exit

-:gotJavaHome

-if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome

-goto okJavaHome

-:noJavaHome

-echo The JAVA_HOME environment variable is not defined correctly

-echo This environment variable is needed to run this program.

-goto exit

-:okJavaHome

-

-rem Slurp the command line arguments. This loop allows for an unlimited number

-rem of agruments (up to the command line limit, anyway).

-

-"%JAVA_HOME%\bin\java" -Xms40m -Xmx256m -Declipse.consoleLog=false -jar %QPIDMC_HOME%\eclipse\startup.jar org.eclipse.core.launcher.Main -launcher %QPIDMC_HOME%\eclipse\eclipse -name "Qpid Management Console" -showsplash 600 -configuration "file:%QPIDMC_HOME%\configuration" -os win32 -ws win32 -arch x86

diff --git a/qpid/java/management/eclipse-plugin/bin/qpidmc.sh b/qpid/java/management/eclipse-plugin/bin/qpidmc.sh
deleted file mode 100755
index 2472545a14..0000000000
--- a/qpid/java/management/eclipse-plugin/bin/qpidmc.sh
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/bin/bash
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-if [ "$JAVA_HOME" == "" ]; then
-    echo "The JAVA_HOME environment variable is not defined";
-    exit 0;
-fi
-
-if [ "$QPIDMC_HOME" == "" ]; then
-    echo "The QPIDMC_HOME environment variable is not defined correctly";
-    exit 0;
-fi
-
-# Test if we're running on cygwin.
-cygwin=false
-if [[ "$(uname -a | fgrep Cygwin)" != "" ]]; then
-  cygwin=true
-fi
-
-if $cygwin; then
-  QPIDMC_HOME=$(cygpath -w $QPIDMC_HOME)
-fi
-
-os=win32
-ws=win32
-arch=x86
-
-##echo $os
-##echo $ws
-##echo $arch
-
-## If this is to be run on different platform other than windows then following parameters should be passed
-## qpidmc.sh <operating system> <windowing system> <platform achitecture>
-## eg. qpidmc.sh linux motif x86
-if [ $# -eq 3 ]; then
-    os=$1
-    ws=$2
-    arch=$3
-fi
-
-if [ $os = "SunOS" ]; then
-    os="solaris"
-elif [ $os = "Linux" ]; then
-    os="linux"
-fi
-
-"$JAVA_HOME/bin/java" -Xms40m -Xmx256m -Declipse.consoleLog=false -jar $QPIDMC_HOME/eclipse/startup.jar org.eclipse.core.launcher.Main -launcher $QPIDMC_HOME/eclipse/eclipse -name "Qpid Management Console" -showsplash 600 -configuration "file:$QPIDMC_HOME/configuration" -os $os -ws $ws -arch $arch
diff --git a/qpid/java/management/eclipse-plugin/bin/qpidmc_gtk.sh b/qpid/java/management/eclipse-plugin/bin/qpidmc_gtk.sh
deleted file mode 100755
index 10b463d63b..0000000000
--- a/qpid/java/management/eclipse-plugin/bin/qpidmc_gtk.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/bash
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-os=`uname | tr A-Z a-z`
-arch=`uname -p`
-
-$QPIDMC_HOME/bin/qpidmc.sh $os gtk $arch
diff --git a/qpid/java/management/eclipse-plugin/bin/qpidmc_motif.sh b/qpid/java/management/eclipse-plugin/bin/qpidmc_motif.sh
deleted file mode 100755
index f53be75d87..0000000000
--- a/qpid/java/management/eclipse-plugin/bin/qpidmc_motif.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/bash
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-os=`uname | tr A-Z a-z`
-arch=`uname -p`
-
-$QPIDMC_HOME/bin/qpidmc.sh $os motif $arch
diff --git a/qpid/java/management/eclipse-plugin/build.xml b/qpid/java/management/eclipse-plugin/build.xml
deleted file mode 100644
index 492783e574..0000000000
--- a/qpid/java/management/eclipse-plugin/build.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<!--
- -
- - Licensed to the Apache Software Foundation (ASF) under one
- - or more contributor license agreements.  See the NOTICE file
- - distributed with this work for additional information
- - regarding copyright ownership.  The ASF licenses this file
- - to you under the Apache License, Version 2.0 (the
- - "License"); you may not use this file except in compliance
- - with the License.  You may obtain a copy of the License at
- - 
- -   http://www.apache.org/licenses/LICENSE-2.0
- - 
- - Unless required by applicable law or agreed to in writing,
- - software distributed under the License is distributed on an
- - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- - KIND, either express or implied.  See the License for the
- - specific language governing permissions and limitations
- - under the License.
- -
- -->
-<project name="Eclipse Plugin" default="build">
-
-    <property name="module.depends" value="broker common"/>
-
-    <import file="../../module.xml"/>
-
-</project>
diff --git a/qpid/java/management/eclipse-plugin/icons/Thumbs.db b/qpid/java/management/eclipse-plugin/icons/Thumbs.db
deleted file mode 100644
index 306bfb2eda..0000000000
--- a/qpid/java/management/eclipse-plugin/icons/Thumbs.db
+++ /dev/null
diff --git a/qpid/java/management/eclipse-plugin/icons/add.gif b/qpid/java/management/eclipse-plugin/icons/add.gif
deleted file mode 100644
index 252d7ebcb8..0000000000
--- a/qpid/java/management/eclipse-plugin/icons/add.gif
+++ /dev/null
diff --git a/qpid/java/management/eclipse-plugin/icons/delete.gif b/qpid/java/management/eclipse-plugin/icons/delete.gif
deleted file mode 100644
index 6f647666d3..0000000000
--- a/qpid/java/management/eclipse-plugin/icons/delete.gif
+++ /dev/null
diff --git a/qpid/java/management/eclipse-plugin/icons/icon_ClosedFolder.gif b/qpid/java/management/eclipse-plugin/icons/icon_ClosedFolder.gif
deleted file mode 100644
index beb6ed134c..0000000000
--- a/qpid/java/management/eclipse-plugin/icons/icon_ClosedFolder.gif
+++ /dev/null
diff --git a/qpid/java/management/eclipse-plugin/icons/icon_OpenFolder.gif b/qpid/java/management/eclipse-plugin/icons/icon_OpenFolder.gif
deleted file mode 100644
index a9c777343c..0000000000
--- a/qpid/java/management/eclipse-plugin/icons/icon_OpenFolder.gif
+++ /dev/null
diff --git a/qpid/java/management/eclipse-plugin/icons/mbean_view.png b/qpid/java/management/eclipse-plugin/icons/mbean_view.png
deleted file mode 100644
index 9871b72bb8..0000000000
--- a/qpid/java/management/eclipse-plugin/icons/mbean_view.png
+++ /dev/null
diff --git a/qpid/java/management/eclipse-plugin/icons/notifications.gif b/qpid/java/management/eclipse-plugin/icons/notifications.gif
deleted file mode 100644
index f1e585bdf7..0000000000
--- a/qpid/java/management/eclipse-plugin/icons/notifications.gif
+++ /dev/null
diff --git a/qpid/java/management/eclipse-plugin/icons/qpidConnections.gif b/qpid/java/management/eclipse-plugin/icons/qpidConnections.gif
deleted file mode 100644
index 89489f11f2..0000000000
--- a/qpid/java/management/eclipse-plugin/icons/qpidConnections.gif
+++ /dev/null
diff --git a/qpid/java/management/eclipse-plugin/icons/qpidmc.gif b/qpid/java/management/eclipse-plugin/icons/qpidmc.gif
deleted file mode 100644
index baf929fbc5..0000000000
--- a/qpid/java/management/eclipse-plugin/icons/qpidmc.gif
+++ /dev/null
diff --git a/qpid/java/management/eclipse-plugin/icons/qpidmc16.gif b/qpid/java/management/eclipse-plugin/icons/qpidmc16.gif
deleted file mode 100644
index 4df535bb9a..0000000000
--- a/qpid/java/management/eclipse-plugin/icons/qpidmc16.gif
+++ /dev/null
diff --git a/qpid/java/management/eclipse-plugin/icons/qpidmc32.bmp b/qpid/java/management/eclipse-plugin/icons/qpidmc32.bmp
deleted file mode 100644
index e42ce01dff..0000000000
--- a/qpid/java/management/eclipse-plugin/icons/qpidmc32.bmp
+++ /dev/null
diff --git a/qpid/java/management/eclipse-plugin/icons/qpidmc32.gif b/qpid/java/management/eclipse-plugin/icons/qpidmc32.gif
deleted file mode 100644
index e42ce01dff..0000000000
--- a/qpid/java/management/eclipse-plugin/icons/qpidmc32.gif
+++ /dev/null
diff --git a/qpid/java/management/eclipse-plugin/icons/reconnect.gif b/qpid/java/management/eclipse-plugin/icons/reconnect.gif
deleted file mode 100644
index e2f8c3e1fe..0000000000
--- a/qpid/java/management/eclipse-plugin/icons/reconnect.gif
+++ /dev/null
diff --git a/qpid/java/management/eclipse-plugin/icons/refresh.gif b/qpid/java/management/eclipse-plugin/icons/refresh.gif
deleted file mode 100644
index a063c230ac..0000000000
--- a/qpid/java/management/eclipse-plugin/icons/refresh.gif
+++ /dev/null
diff --git a/qpid/java/management/eclipse-plugin/icons/splash.bmp b/qpid/java/management/eclipse-plugin/icons/splash.bmp
deleted file mode 100644
index b528a508c5..0000000000
--- a/qpid/java/management/eclipse-plugin/icons/splash.bmp
+++ /dev/null
diff --git a/qpid/java/management/eclipse-plugin/icons/stop.gif b/qpid/java/management/eclipse-plugin/icons/stop.gif
deleted file mode 100644
index dc47edf069..0000000000
--- a/qpid/java/management/eclipse-plugin/icons/stop.gif
+++ /dev/null
diff --git a/qpid/java/management/eclipse-plugin/plugin.properties b/qpid/java/management/eclipse-plugin/plugin.properties
deleted file mode 100644
index 8507441886..0000000000
--- a/qpid/java/management/eclipse-plugin/plugin.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-###############################################################################
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements. See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership. The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License. You may obtain a copy of the License at
-# 
-#    http://www.apache.org/licenses/LICENSE-2.0
-# 
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied. See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-###############################################################################
-pluginName = Qpid Management Console Plug-in
-providerName = Apache Software Foundation
\ No newline at end of file
diff --git a/qpid/java/management/eclipse-plugin/plugin.xml b/qpid/java/management/eclipse-plugin/plugin.xml
deleted file mode 100644
index 5774859b47..0000000000
--- a/qpid/java/management/eclipse-plugin/plugin.xml
+++ /dev/null
@@ -1,223 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
- 
-    http://www.apache.org/licenses/LICENSE-2.0
- 
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied. See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<plugin>
-
-   <extension
-         id="application"
-         point="org.eclipse.core.runtime.applications">
-      <application>
-         <run
-               class="org.apache.qpid.management.ui.Application">
-         </run>
-      </application>
-   </extension>
-   <extension
-         point="org.eclipse.ui.perspectives">
-      <perspective
-            name="qpid.management.perspective"
-            class="org.apache.qpid.management.ui.Perspective"
-            id="org.apache.qpid.management.ui.perspective">
-      </perspective>
-   </extension>
-   <extension
-         point="org.eclipse.ui.views">
-      <category
-            id="org.apache.qpid.management.ui.viewcategory"
-            name="Qpid Management Console"/>
-      <view
-            allowMultiple="false"
-            category="org.apache.qpid.management.ui.viewcategory"
-            class="org.apache.qpid.management.ui.views.NavigationView"
-            icon="icons/qpidConnections.gif"
-            id="org.apache.qpid.management.ui.navigationView"
-            name="Qpid Connections">
-      </view>
-      <view
-            allowMultiple="false"
-            category="org.apache.qpid.management.ui.viewcategory"
-            class="org.apache.qpid.management.ui.views.MBeanView"
-            icon="icons/mbean_view.png"
-            id="org.apache.qpid.management.ui.mbeanView"
-            name="Qpid Management">
-      </view>
-   </extension>
-   <extension
-         point="org.eclipse.ui.commands">
-      <category
-            name="qpid.manager.commands"
-            id="org.apache.qpid.management.ui.category">
-      </category>
-      <command
-            name="New Connection"
-            description="Created a new Qpid server connection"
-            categoryId="org.apache.qpid.management.ui.category"
-            id="org.apache.qpid.management.ui.actions.cmd_add">
-      </command>
-      <command
-            categoryId="org.apache.qpid.management.ui.category"
-            description="Reconnect the Qpid server connection"
-            id="org.apache.qpid.management.ui.actions.cmd_reconnect"
-            name="Reconnect"/>
-      <command
-            categoryId="org.apache.qpid.management.ui.category"
-            description="Disconnects the Qpid server connection"
-            id="org.apache.qpid.management.ui.actions.cmd_disconnect"
-            name="Disconnect"/>
-      <command
-            categoryId="org.apache.qpid.management.ui.category"
-            description="Removes the server from management console"
-            id="org.apache.qpid.management.ui.actions.cmd_remove"
-            name="Remove Connection"/>
-      <command
-            categoryId="org.apache.qpid.management.ui.category"
-            description="refreshes the views"
-            id="org.apache.qpid.management.ui.actions.cmd_refresh"
-            name="Refresh"/>
-      <command
-            categoryId="org.apache.qpid.management.ui.category"
-            description="pops up the window for editing selected attribute"
-            id="org.apache.qpid.management.ui.actions.cmd_editAttribute"
-            name="Edit Attribute"/>
-      <command
-            categoryId="org.apache.qpid.management.ui.category"
-            description="About Qpid Management Console"
-            id="qpidmc.about"
-            name="About"/>
-   </extension>
-   <extension
-         point="org.eclipse.ui.bindings">
-      <key
-            commandId="org.apache.qpid.management.ui.actions.cmd_add"
-            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
-            sequence="CTRL+Alt+N">
-      </key>
-      <key
-            commandId="org.apache.qpid.management.ui.actions.cmd_reconnect"
-            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
-            sequence="CTRL+Alt+C"/>
-      <key
-            commandId="org.apache.qpid.management.ui.actions.cmd_disconnect"
-            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
-            sequence="CTRL+Alt+D">
-      </key>
-      <key
-            commandId="org.apache.qpid.management.ui.actions.cmd_remove"
-            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
-            sequence="CTRL+Alt+R"/>
-      <key
-            commandId="org.apache.qpid.management.ui.actions.cmd_refresh"
-            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
-            sequence="CTRL+Alt+F5"/>
-      <key
-            commandId="org.apache.qpid.management.ui.actions.cmd_editAttribute"
-            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
-            sequence="CTRL+Alt+E"/>
-      <key
-            commandId="org.eclipse.ui.file.exit"
-            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
-            sequence="CTRL+Alt+X">
-      </key>
-   </extension>
-   
-   <extension
-         id="product"
-         point="org.eclipse.core.runtime.products">
-      <product
-            application="org.apache.qpid.management.ui.application"
-            name="Qpid Management Console">
-         <property
-               name="windowImages"
-               value="icons/qpidmc16.gif,icons/qpidmc32.gif">
-         </property>
-         <property
-               name="aboutText"
-               value="Qpid Management Console"/>
-      </product>
-   </extension>
-   <extension
-         point="org.eclipse.ui.actionSets">
-      <actionSet
-            id="org.apache.qpid.management.ui.actionSet"
-            label="Qpid Action Set"
-            visible="true">
-         <menu
-               id="qpidmanager"
-               label="&amp;Qpid Manager">
-            <separator name="qpidActionsGroup"/>
-         </menu>
-         <action
-               class="org.apache.qpid.management.ui.actions.EditAttribute"
-               definitionId="org.apache.qpid.management.ui.actions.cmd_editAttribute"
-               id="org.apache.qpid.management.ui.actions.editAttribute"
-               label="Edit Attribute"
-               menubarPath="qpidmanager/mbeanactions"
-               style="push"
-               tooltip="Edit Attribute"/>
-         <action
-               class="org.apache.qpid.management.ui.actions.Refresh"
-               definitionId="org.apache.qpid.management.ui.actions.cmd_refresh"
-               icon="icons/refresh.gif"
-               id="org.apache.qpid.management.ui.actions.refresh"
-               label="Refresh"
-               menubarPath="qpidmanager/additions"
-               style="push"
-               toolbarPath="qpidActionsGroup"
-               tooltip="Refresh"/>
-         <action
-               class="org.apache.qpid.management.ui.actions.RemoveServer"
-               definitionId="org.apache.qpid.management.ui.actions.cmd_remove"
-               icon="icons/delete.gif"
-               id="org.apache.qpid.management.ui.actions.remove"
-               label="Remove Connection"
-               menubarPath="qpidmanager/additions"
-               style="push"
-               toolbarPath="qpidActionsGroup"/>
-         <action
-               class="org.apache.qpid.management.ui.actions.CloseConnection"
-               definitionId="org.apache.qpid.management.ui.actions.cmd_disconnect"
-               icon="icons/stop.gif"
-               id="org.apache.qpid.management.ui.disconnect"
-               label="Disconnect"
-               menubarPath="qpidmanager/additions"
-               toolbarPath="qpidActionsGroup"
-               tooltip="Disconnect"/>
-         <action
-               class="org.apache.qpid.management.ui.actions.ReconnectServer"
-               definitionId="org.apache.qpid.management.ui.actions.cmd_reconnect"
-               icon="icons/reconnect.gif"
-               id="org.apache.qpid.management.ui.reconnect"
-               label="Reconnect"
-               menubarPath="qpidmanager/additions"
-               toolbarPath="qpidActionsGroup"
-               tooltip="Reconnect"/>
-         <action
-               class="org.apache.qpid.management.ui.actions.AddServer"
-               definitionId="org.apache.qpid.management.ui.actions.cmd_add"
-               icon="icons/add.gif"
-               id="org.apache.qpid.management.ui.add"
-               label="New Connection"
-               menubarPath="qpidmanager/additions"
-               toolbarPath="qpidActionsGroup"
-               tooltip="New Connection"/>         
-      </actionSet>
-   </extension>
-
-</plugin>
diff --git a/qpid/java/management/eclipse-plugin/pom.xml b/qpid/java/management/eclipse-plugin/pom.xml
deleted file mode 100644
index 0c220104f8..0000000000
--- a/qpid/java/management/eclipse-plugin/pom.xml
+++ /dev/null
@@ -1,257 +0,0 @@
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements. See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership. The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License. You may obtain a copy of the License at
-    
-    http://www.apache.org/licenses/LICENSE-2.0
-    
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied. See the License for the
-    specific language governing permissions and limitations
-    under the License.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.apache.qpid.management</groupId>
-    <artifactId>org.apache.qpid.management.ui</artifactId>
-    <packaging>jar</packaging>
-    <version>1.0-incubating-M3-SNAPSHOT</version>
-    <name>Qpid Management</name>
-
-    <parent>
-        <groupId>org.apache.qpid</groupId>
-        <artifactId>qpid</artifactId>
-        <version>1.0-incubating-M3-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-
-    <properties>
-        <topDirectoryLocation>../..</topDirectoryLocation>
-    </properties>
-    
-    <repositories>
-          <repository>
-            <id>repo1.maven.org</id>
-            <name>Maven eclipse Repository</name>
-            <url>http://repo1.maven.org/eclipse</url>
-          </repository>
-          <repository>
-            <id>apache.snapshots</id>
-            <name>Apache SNAPSHOT Repository</name>
-            <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-            <snapshots>
-              <enabled>true</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
-
-    <dependencies>
-	    <dependency>
-            <groupId>commons-codec</groupId>
-            <artifactId>commons-codec</artifactId>
-            <version>1.3</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.ibm.icu</groupId>
-            <artifactId>com.ibm.icu</artifactId>
-            <version>3.4.4</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.jface</groupId>
-            <artifactId>org.eclipse.jface</artifactId>
-            <version>3.2.0</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.core</groupId>
-            <artifactId>org.eclipse.core.commands</artifactId>
-            <version>3.2.0</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.core</groupId>
-            <artifactId>org.eclipse.core.contenttype</artifactId>
-            <version>3.2.0</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.core</groupId>
-            <artifactId>org.eclipse.core.expressions</artifactId>
-            <version>3.2.0</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.core</groupId>
-            <artifactId>org.eclipse.core.jobs</artifactId>
-            <version>3.2.0</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.core</groupId>
-            <artifactId>org.eclipse.core.runtime</artifactId>
-            <version>3.2.0</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.core</groupId>
-            <artifactId>org.eclipse.core.runtime.compatibility.auth</artifactId>
-            <version>3.2.0</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.core</groupId>
-            <artifactId>org.eclipse.core.runtime.compatibility.registry</artifactId>
-            <version>3.2.0</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.equinox</groupId>
-            <artifactId>org.eclipse.equinox.common</artifactId>
-            <version>3.2.0</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.equinox</groupId>
-            <artifactId>org.eclipse.equinox.preferences</artifactId>
-            <version>3.2.0</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.equinox</groupId>
-            <artifactId>org.eclipse.equinox.registry</artifactId>
-            <version>3.2.0</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.help</groupId>
-            <artifactId>org.eclipse.help</artifactId>
-            <version>3.2.0</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.osgi</groupId>
-            <artifactId>org.eclipse.osgi</artifactId>
-            <version>3.2.0</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.swt</groupId>
-            <artifactId>org.eclipse.swt.win32.win32.x86</artifactId>
-            <version>3.2.0</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.swt</groupId>
-            <artifactId>org.eclipse.swt</artifactId>
-            <version>3.2.0</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.ui</groupId>
-            <artifactId>org.eclipse.ui.forms</artifactId>
-            <version>3.2.0</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.ui</groupId>
-            <artifactId>org.eclipse.ui.workbench</artifactId>
-            <version>3.2.1</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.ui</groupId>
-            <artifactId>org.eclipse.ui</artifactId>
-            <version>3.2.0</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <!-- Test Dependencies -->
-        <dependency>  
-            <groupId>org.slf4j</groupId> 
-            <artifactId>slf4j-log4j12</artifactId>  
-            <version>1.4.0</version>  
-            <scope>test</scope> 
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.qpid</groupId>
-            <artifactId>qpid-broker</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-    <build>        
-        <resources>
-            <resource>                
-                <directory>icons/</directory>
-                <targetPath>icons/</targetPath>
-                <includes>
-                  <include>**</include>
-                </includes>
-            </resource>
-            <resource>                
-                <directory>icons/</directory>
-                <targetPath>/</targetPath>
-                <includes>
-                  <include>splash.bmp</include>
-                </includes>
-            </resource>
-            <resource>
-              <directory>${basedir}</directory>
-              <targetPath>/</targetPath>
-              <includes>
-                <include>plugin.xml</include>
-                <include>plugin.properties</include>
-              </includes>  
-            </resource>
-      </resources>
-        <plugins>
-            <!--
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-            </plugin>
-            -->
-
-            <!-- This is required to identify the JAR to eclipse as a plugin -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                  <archive>
-                    <manifestFile>META-INF/MANIFEST.MF</manifestFile>
-                  </archive>
-                  <finalName>${artifactId}_${version}</finalName>
-                </configuration>
-              </plugin>
-
-            <!--
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <skip>false</skip>
-                </configuration>
-            </plugin>
-            -->
-        </plugins>
-    </build>
-
-</project>
diff --git a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Activator.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Activator.java
deleted file mode 100644
index 5eab267c28..0000000000
--- a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Activator.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.management.ui;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- * @author Bhupendra Bhardwaj
- */
-public class Activator extends AbstractUIPlugin
-{
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.apache.qpid.management.ui";
-
-	// The shared instance
-	private static Activator plugin;
-	
-	/**
-	 * The constructor
-	 */
-	public Activator()
-    {
-		plugin = this;
-	}
-
-	/*
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception
-    {
-		super.start(context);
-	}
-
-	/*
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception
-    {
-		plugin = null;
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance
-	 *
-	 * @return the shared instance
-	 */
-	public static Activator getDefault()
-    {
-		return plugin;
-	}
-
-	/**
-	 * Returns an image descriptor for the image file at the given plug-in relative path
-	 *
-	 * @param path the path
-	 * @return the image descriptor
-	 */
-	public static ImageDescriptor getImageDescriptor(String path)
-    {
-		return imageDescriptorFromPlugin(PLUGIN_ID, path);
-	}
-}
diff --git a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Application.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Application.java
deleted file mode 100644
index a1c4b7ddb0..0000000000
--- a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Application.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.management.ui;
-
-import org.eclipse.core.runtime.IPlatformRunnable;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * This class controls all aspects of the application's execution
- * @author Bhupendra Bhardwaj
- */
-public class Application implements IPlatformRunnable
-{
-    static Shell shell = null;
-
-    /*
-     * The call to createAndRunWorkbench will not return until the workbench is closed.
-     * The SWT event loop and other low-level logistics are handled inside this method.
-     * @see org.eclipse.core.runtime.IPlatformRunnable#run(java.lang.Object)
-     */
-    public Object run(Object args) throws Exception
-    {
-        Display display = PlatformUI.createDisplay();
-        try
-        {
-            int returnCode = PlatformUI.createAndRunWorkbench(display,
-                    new ApplicationWorkbenchAdvisor());
-            if (returnCode == PlatformUI.RETURN_RESTART)
-            {
-                return IPlatformRunnable.EXIT_RESTART;
-            }
-            return IPlatformRunnable.EXIT_OK;
-        } finally
-        {
-            display.dispose();
-        }
-    }
-
-    static Shell getActiveShell()
-    {
-        return shell;
-    }
-}
diff --git a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationActionBarAdvisor.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationActionBarAdvisor.java
deleted file mode 100644
index b5c1b5074a..0000000000
--- a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationActionBarAdvisor.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.management.ui;
-
-import org.apache.qpid.management.ui.actions.VersionAction;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.GroupMarker;
-import org.eclipse.jface.action.ICoolBarManager;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.ui.IWorkbenchActionConstants;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.actions.ActionFactory;
-import org.eclipse.ui.actions.ActionFactory.IWorkbenchAction;
-import org.eclipse.ui.application.ActionBarAdvisor;
-import org.eclipse.ui.application.IActionBarConfigurer;
-
-/**
- * An action bar advisor is responsible for creating, adding, and disposing of the
- * actions added to a workbench window. Each window will be populated with
- * new actions.
- */
-public class ApplicationActionBarAdvisor extends ActionBarAdvisor
-{
-
-    // Actions - important to allocate these only in makeActions, and then use them
-    // in the fill methods.  This ensures that the actions aren't recreated
-    // when fillActionBars is called with FILL_PROXY.
-    private IWorkbenchAction exitAction;
-    private Action _aboutAction;
-
-    public ApplicationActionBarAdvisor(IActionBarConfigurer configurer)
-    {
-        super(configurer);
-    }
-    
-    protected void makeActions(final IWorkbenchWindow window)
-    {        
-        // Creates the actions and registers them.
-        // Registering is needed to ensure that key bindings work.
-        // The corresponding commands keybindings are defined in the plugin.xml file.
-        // Registering also provides automatic disposal of the actions when
-        // the window is closed.
-
-        exitAction = ActionFactory.QUIT.create(window);
-        register(exitAction);
-        
-        _aboutAction = new VersionAction(window);
-        register(_aboutAction);
-    }
-    
-    
-    protected void fillMenuBar(IMenuManager menuBar)
-    {
-        MenuManager fileMenu = new MenuManager("&Qpid Manager", "qpidmanager");
-        MenuManager helpMenu = new MenuManager("&Help", IWorkbenchActionConstants.M_HELP);
-        
-        menuBar.add(fileMenu);
-        // Add a group marker indicating where action set menus will appear.
-        menuBar.add(new GroupMarker(IWorkbenchActionConstants.MB_ADDITIONS));
-        menuBar.add(helpMenu);
-        
-        fileMenu.add(new GroupMarker(IWorkbenchActionConstants.MB_ADDITIONS));
-        fileMenu.add(new Separator());
-        fileMenu.add(new GroupMarker("mbeanactions"));
-        fileMenu.add(new Separator());
-        fileMenu.add(exitAction);
-        
-        // Help
-        helpMenu.add(_aboutAction);
-    }
-    
-    protected void fillCoolBar(ICoolBarManager coolBar)
-    {
-        
-    }
-}
diff --git a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationRegistry.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationRegistry.java
deleted file mode 100644
index 0ad85dbf33..0000000000
--- a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationRegistry.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.management.ui;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.concurrent.CopyOnWriteArrayList;
-
-import org.eclipse.jface.resource.FontRegistry;
-import org.eclipse.jface.resource.ImageRegistry;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.ISharedImages;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * Main Application Registry, which contains shared resources and map to all connected servers.
- * @author Bhupendra Bhardwaj
- */
-public abstract class ApplicationRegistry
-{
-    private static ImageRegistry imageRegistry = new ImageRegistry();
-    private static FontRegistry fontRegistry = new FontRegistry();
-    public static final boolean debug = Boolean.getBoolean("eclipse.consoleLog");
-    public static final String securityMechanism = System.getProperty("security", null);
-    public static final String connectorClass =  System.getProperty("jmxconnector");
-    public static final long timeout = Long.parseLong(System.getProperty("timeout", "5000"));
-    
-    static
-    {
-        imageRegistry.put(Constants.CONSOLE_IMAGE, 
-                org.apache.qpid.management.ui.Activator.getImageDescriptor("/icons/qpidmc.gif"));
-        imageRegistry.put(Constants.CLOSED_FOLDER_IMAGE, 
-                org.apache.qpid.management.ui.Activator.getImageDescriptor("/icons/icon_ClosedFolder.gif"));
-        imageRegistry.put(Constants.OPEN_FOLDER_IMAGE,
-                PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJ_FOLDER));
-        imageRegistry.put(Constants.MBEAN_IMAGE,
-                PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJ_ELEMENT));
-        imageRegistry.put(Constants.NOTIFICATION_IMAGE,
-                org.apache.qpid.management.ui.Activator.getImageDescriptor("/icons/notifications.gif"));
-    }
-    
-    static
-    {
-        fontRegistry.put(Constants.FONT_BUTTON, new FontData[]{new FontData("Arial", 8, SWT.BOLD)} );
-        fontRegistry.put(Constants.FONT_BOLD, new FontData[]{new FontData("Bold", 9, SWT.BOLD)} );
-        fontRegistry.put(Constants.FONT_ITALIC, new FontData[]{new FontData("Italic", 9, SWT.ITALIC)} );
-        fontRegistry.put(Constants.FONT_TABLE_CELL, new FontData[]{new FontData("Tablecell", 8, SWT.NORMAL)} );
-        fontRegistry.put(Constants.FONT_NORMAL, new FontData[]{new FontData("Normal", 9, SWT.NORMAL)} );
-    }
-    
-    /*
-     * This maps all the managed servers to the respective server registry.
-     * Server can be JMX MBeanServer or a C++ server
-     */
-    private static HashMap<ManagedServer, ServerRegistry> _serverRegistryMap = new HashMap<ManagedServer, ServerRegistry>();
-    
-    // This map gets updated when a server connection closes.
-    private static List<ManagedServer> _closedServerList = new CopyOnWriteArrayList<ManagedServer>();    
-    
-    public static Image getImage(String key)
-    {
-        return imageRegistry.get(key);
-    }
-    
-    public static Font getFont(String key)
-    {
-        return fontRegistry.get(key);
-    }
-    
-    public static void addServer(ManagedServer server, ServerRegistry registry)
-    {
-        _serverRegistryMap.put(server, registry);
-    }
-    
-    public static void removeServer(ManagedServer server)
-    {
-        _serverRegistryMap.remove(server);
-    }
-    
-    public static ServerRegistry getServerRegistry(ManagedServer server)
-    {
-        return _serverRegistryMap.get(server);
-    }
-    
-    public static ServerRegistry getServerRegistry(ManagedBean mbean)
-    {
-        ManagedServer server = mbean.getServer();
-        return getServerRegistry(server);
-    }
-    
-    public static boolean isServerConnected(ManagedServer server)
-    {
-        return _serverRegistryMap.containsKey(server);
-    }
-    
-    // remove the server from the registry
-    public static void serverConnectionClosed(ManagedServer server)
-    {
-        _closedServerList.add(server);
-        removeServer(server);
-    }
-    
-    /*
-     * Returns the lis of closed servers. The Thread in GUI, which keeps checking for closed connection
-     * will check this and will remove the server links from the GUI.
-     */
-    public static List<ManagedServer> getClosedServers()
-    {
-        if (_closedServerList.isEmpty())
-            return null;
-        
-        List<ManagedServer> list = new CopyOnWriteArrayList<ManagedServer>(_closedServerList);
-        _closedServerList.clear();
-        return list;
-    }
-    
-    public static String getSecurityMechanism()
-    {
-        return securityMechanism;
-    }
-    
-    public static String getJMXConnectorClass()
-    {
-        return connectorClass;
-    }
-}
diff --git a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationWorkbenchAdvisor.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationWorkbenchAdvisor.java
deleted file mode 100644
index a46fa870e4..0000000000
--- a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationWorkbenchAdvisor.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.management.ui;
-
-import org.eclipse.ui.application.IWorkbenchWindowConfigurer;
-import org.eclipse.ui.application.WorkbenchAdvisor;
-import org.eclipse.ui.application.WorkbenchWindowAdvisor;
-
-/**
- * This workbench advisor creates the window advisor, and specifies
- * the perspective id for the initial window.
- */
-public class ApplicationWorkbenchAdvisor extends WorkbenchAdvisor
-{	
-	public static final String PERSPECTIVE_ID = "org.apache.qpid.management.ui.perspective";
-	
-    public WorkbenchWindowAdvisor createWorkbenchWindowAdvisor(IWorkbenchWindowConfigurer configurer)
-    {
-        return new ApplicationWorkbenchWindowAdvisor(configurer);
-    }
-
-	
-	public String getInitialWindowPerspectiveId()
-    {
-		return PERSPECTIVE_ID;
-	} 
-	
-}
diff --git a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationWorkbenchWindowAdvisor.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationWorkbenchWindowAdvisor.java
deleted file mode 100644
index e3aedef28e..0000000000
--- a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationWorkbenchWindowAdvisor.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.management.ui;
-
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.application.ActionBarAdvisor;
-import org.eclipse.ui.application.IActionBarConfigurer;
-import org.eclipse.ui.application.IWorkbenchWindowConfigurer;
-import org.eclipse.ui.application.WorkbenchWindowAdvisor;
-
-/**
- * 
- * @author Bhupendra Bhardwaj
- */
-public class ApplicationWorkbenchWindowAdvisor extends WorkbenchWindowAdvisor
-{
-    public ApplicationWorkbenchWindowAdvisor(IWorkbenchWindowConfigurer configurer)
-    {
-        super(configurer);
-    }
-    
-    public ActionBarAdvisor createActionBarAdvisor(IActionBarConfigurer configurer)
-    {
-        return new ApplicationActionBarAdvisor(configurer);
-    }
-    
-    public void preWindowOpen()
-    {
-        IWorkbenchWindowConfigurer configurer = getWindowConfigurer();
-        int x = Display.getDefault().getBounds().width;
-        int y = Display.getDefault().getBounds().height;
-        configurer.setInitialSize(new Point(9*x/10, 8*y/10));
-        configurer.setShowCoolBar(true);
-        configurer.setShowStatusLine(false);
-        
-        configurer.setTitle(Constants.APPLICATION_NAME);
-    }  
-    
-    public void postWindowCreate()
-    {
-        IWorkbenchWindowConfigurer configurer = getWindowConfigurer();
-        Shell shell = configurer.getWindow().getShell();
-        shell.setImage(ApplicationRegistry.getImage(Constants.CONSOLE_IMAGE));
-    }
-}
\ No newline at end of file
diff --git a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Constants.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Constants.java
deleted file mode 100644
index d6f895b64a..0000000000
--- a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Constants.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.management.ui;
-
-/**
- * Contains constants for the application
- * @author Bhupendra Bhardwaj
- *
- */
-public class Constants
-{
-    public final static String APPLICATION_NAME = "Qpid Management Console";
-    
-    public final static String ACTION_REMOVE_MBEANNODE = "Remove from list";
-    public final static String VALUE = "value";
-    public final static String TYPE  = "type";
-    public final static String NODE_TYPE_SERVER    = "server";
-    public final static String NODE_TYPE_DOMAIN    = "domain";
-    public final static String NODE_TYPE_MBEANTYPE = "mbeantype";
-    // currently used only for virtual host instances, but will work as general also
-    public final static String NODE_TYPE_TYPEINSTANCE = "mbeantype_instance";
-    public final static String MBEAN      = "mbean";
-    public final static String ATTRIBUTE = "Attribute";
-    public final static String ATTRIBUTES = "Attributes";
-    public final static String NOTIFICATIONS = "Notifications";
-    public final static String RESULT = "Result";
-    public final static String VIRTUAL_HOST = "VirtualHost";
-    public final static String DEFAULT_VH = "Default";
-    public final static String DEFAULT_USERNAME = "guest";
-    public final static String DEFAULT_PASSWORD = "guest";
-    
-    public final static String USERNAME = "Username";
-    public final static String PASSWORD = "Password";
-    
-    // Attributes and operations are used to customize the GUI for Qpid. If these are changes in the
-    // Qpid server, then these should be updated accordingly
-    public final static String ATTRIBUTE_QUEUE_OWNER = "owner";
-    public final static String ATTRIBUTE_QUEUE_DEPTH = "QueueDepth";
-    public final static String ATTRIBUTE_QUEUE_CONSUMERCOUNT = "ActiveConsumerCount";    
-    public final static String OPERATION_CREATE_QUEUE = "createNewQueue";
-    public final static String OPERATION_CREATE_BINDING = "createNewBinding";
-    public final static String OPERATION_MOVE_MESSAGES = "moveMessages";
-    
-    public final static String OPERATION_CREATEUSER = "createUser";
-    public final static String OPERATION_DELETEUSER = "deleteUser";
-    public final static String OPERATION_VIEWUSERS = "viewUsers";
-    public final static String OPERATION_PARAM_USERNAME = "username";
-    
-    public final static String OPERATION_SUCCESSFUL = "Operation successful";
-    public final static String OPERATION_UNSUCCESSFUL = "Operation unsuccessful";
-    
-    public final static String ALL = "All";
-    
-    public final static String NAVIGATION_ROOT = "Qpid Connections";
-    public final static String DESCRIPTION = " Description";
-    
-    public final static String ADMIN_MBEAN_TYPE = "UserManagement";
-    public final static String QUEUE  = "Queue";
-    public final static String CONNECTION ="Connection";
-    public final static String EXCHANGE = "Exchange";
-    public final static String EXCHANGE_TYPE = "ExchangeType";
-    public final static String[] EXCHANGE_TYPE_VALUES = {"direct", "fanout", "headers", "topic"};
-    public final static String[] BOOLEAN_TYPE_VALUES = {"false", "true"};
-    public final static String[] ATTRIBUTE_TABLE_TITLES = {"Attribute Name", "Value"};  
-    public static final String[] CONNECTION_PROTOCOLS ={"RMI"};
-    public static final String DEFAULT_PROTOCOL = CONNECTION_PROTOCOLS[0];
-    
-    public final static String ACTION_ADDSERVER = "New Connection";
-    public final static String ACTION_RECONNECT = "Reconnect";
-    public final static String ACTION_CLOSE = "Close Connection";
-    public final static String ACTION_EDITATTRIBUTE = "Edit Attribute";
-    public final static String ACTION_LOGIN = "Login";
-    
-    public final static String QUEUE_SORT_BY_NAME = "Queue Name";
-    public final static String QUEUE_SORT_BY_DEPTH = "Queue Depth";
-    public final static String QUEUE_SORT_BY_CONSUMERCOUNT = "Consumer Count";
-    public final static String QUEUE_SHOW_TEMP_QUEUES= "show temporary queues";
-    
-    public final static String SUBSCRIBE_BUTTON   = "Subscribe";
-    public final static String UNSUBSCRIBE_BUTTON = "Unsubscribe";
-    
-    public final static String CONSOLE_IMAGE = "ConsoelImage";
-    public final static String CLOSED_FOLDER_IMAGE = "ClosedFolderImage";
-    public final static String OPEN_FOLDER_IMAGE = "OpenFolderImage";
-    public final static String MBEAN_IMAGE = "MBeanImage";
-    public final static String NOTIFICATION_IMAGE = "NotificationImage";
-    
-    public final static String FONT_BUTTON = "ButtonFont";
-    public final static String FONT_BOLD = "BoldFont";
-    public final static String FONT_ITALIC = "ItalicFont";
-    public final static String FONT_TABLE_CELL = "TableCellFont";
-    public final static String FONT_NORMAL = "Normal";
-    
-    public final static String BUTTON_DETAILS = "Details";
-    public final static String BUTTON_EDIT_ATTRIBUTE = "Edit Attribute";
-    public final static String BUTTON_REFRESH = "Refresh";
-    public final static String BUTTON_GRAPH = "Graph";
-    public final static int TIMER_INTERVAL = 5000;
-    public final static String BUTTON_EXECUTE = "Execute";
-    public final static String BUTTON_CLEAR = "Clear";
-    public final static String BUTTON_CONNECT = "Connect";
-    public final static String BUTTON_CANCEL = "Cancel";
-    public final static String BUTTON_UPDATE = "Update";
-    
-    
-    public final static int OPERATION_IMPACT_INFO    = 0;
-    public final static int OPERATION_IMPACT_ACTION  = 1;
-    public final static int OPERATION_IMPACT_ACTIONINFO  = 2;
-    public final static int OPERATION_IMPACT_UNKNOWN = 3;
-    
-    public final static String ERROR_SERVER_CONNECTION = "Server Connection Failed";
-    public final static String INFO_PROTOCOL = "Please select the protocol";
-    public final static String INFO_HOST_ADDRESS = "Please enter the host address";
-    public final static String INFO_HOST_PORT = "Please enter the port number";
-    public final static String INFO_USERNAME = "Please enter the " + USERNAME;
-    public final static String INFO_PASSWORD = "Please enter the " + PASSWORD;
-    
-    public final static String MECH_CRAMMD5 = "CRAM-MD5";
-    public final static String MECH_PLAIN = "PLAIN";
-    public final static String SASL_CRAMMD5 = "SASL/CRAM-MD5";
-    public final static String SASL_PLAIN = "SASL/PLAIN";
-}
diff --git a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ManagedBean.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ManagedBean.java
deleted file mode 100644
index 31825e925d..0000000000
--- a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ManagedBean.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.management.ui;
-
-import static org.apache.qpid.management.ui.Constants.*;
-import java.util.HashMap;
-
-/**
- * Class representing a managed bean on the managed server
- * @author Bhupendra Bhardwaj
- *
- */
-public abstract class ManagedBean extends ManagedObject
-{
-    private String _uniqueName = "";
-    private String _domain = "";
-    private String _type = "";
-    private String _virtualHostName = null;
-    private ManagedServer _server = null;
-    private HashMap _properties = null;
-    
-    public String getProperty(String key)
-    {
-        return (String)_properties.get(key);
-    }
-    
-    public HashMap getProperties()
-    {
-        return _properties;
-    }
-    public void setProperties(HashMap properties)
-    {
-        this._properties = properties;
-        setName(getProperty("name"));
-        setType(getProperty("type"));
-        _virtualHostName = getProperty(VIRTUAL_HOST);
-    }
-    public String getDomain()
-    {
-        return _domain;
-    }
-    public void setDomain(String domain)
-    {
-        this._domain = domain;
-    }
-
-    public ManagedServer getServer()
-    {
-        return _server;
-    }
-    public void setServer(ManagedServer server)
-    {
-        this._server = server;
-    }
-    public String getType()
-    {
-        return _type;
-    }
-    public void setType(String type)
-    {
-        this._type = type;
-    }
-    public String getUniqueName()
-    {
-        return _uniqueName;
-    }
-    public void setUniqueName(String uniqueName)
-    {
-        this._uniqueName = uniqueName;
-    }
-    
-    public String getVirtualHostName()
-    {
-        // To make it work with the broker with no virtual host implementation
-        return _virtualHostName == null ? DEFAULT_VH : _virtualHostName;
-    }
-    
-    /**
-     * Returns mbean instance name. MBeans which have only one instance, the type attribute will be returned
-     * @return
-     */
-    public String getInstanceName()
-    {
-        if (getName() != null)
-            return getName();
-        else
-            return getType();
-    }
-    
-    public boolean isQueue()
-    {
-        return _type.endsWith(QUEUE);
-    }
-    
-    public boolean isConnection()
-    {
-        return _type.endsWith(CONNECTION);
-    }
-    
-    public boolean isExchange()
-    {
-        return _type.endsWith(EXCHANGE);
-    }
-    
-    public boolean isTempQueue()
-    {
-        return (isQueue() && getName().startsWith("tmp_"));
-    }
-    
-    public boolean isAdmin()
-    {
-        return _type.endsWith(ADMIN_MBEAN_TYPE);
-    }
-}
diff --git a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ManagedObject.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ManagedObject.java
deleted file mode 100644
index 96e0fa46c6..0000000000
--- a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ManagedObject.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.management.ui;
-
-/**
- * Abstract class representing a managed object
- * @author Bhupendra Bhardwaj
- */
-public abstract class ManagedObject
-{
-    private String _name;
-
-    public String getName()
-    {
-        return _name;
-    }
-
-    public void setName(String name)
-    {
-        this._name = name;
-    }
-}
diff --git a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ManagedServer.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ManagedServer.java
deleted file mode 100644
index 480fdb429a..0000000000
--- a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ManagedServer.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.management.ui;
-
-import static org.apache.qpid.management.ui.Constants.DEFAULT_PROTOCOL;
-/**
- * Class representing a server being managed eg. MBeanServer
- * @author Bhupendra Bhardwaj
- */
-public class ManagedServer extends ManagedObject
-{
-    private String _host;
-    private int _port;
-    private String _url;
-    private String _domain;
-    private String _user;
-    private String _password;
-    private String _protocol = DEFAULT_PROTOCOL;
-
-    public ManagedServer(String host, int port, String domain)
-    {
-        this(host, port, domain, null, null);
-    }
-    
-    public ManagedServer(String host, int port, String domain, String user, String password)
-    {
-        setName(host + ":" + port);
-        _host = host;
-        _port = port;
-        _domain = domain;
-        _url = getRMIURL(host, port);
-        _user = user;
-        _password = password;
-    }
-    
-    public String getDomain()
-    {
-        return _domain;
-    }
-
-    public String getHost()
-    {
-        return _host;
-    }
-
-    public int getPort()
-    {
-        return _port;
-    }
-
-    public String getUrl()
-    {
-        return _url;
-    }
-    
-    public String getProtocol()
-    {
-        return _protocol;
-    }
-
-    public String getPassword()
-    {
-        return _password;
-    }
-    
-    public void setPassword(String password)
-    {
-        _password = password;
-    }
-
-    public String getUser()
-    {
-        return _user;
-    }
-    
-    public void setUser(String user)
-    {
-        _user = user;
-    }
-    
-    private String getRMIURL(String host, int port)
-    {
-        return "service:jmx:rmi:///jndi/rmi://" + host + ":" + port + "/jmxrmi";
-    }
-}
diff --git a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Perspective.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Perspective.java
deleted file mode 100644
index f93200cadf..0000000000
--- a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Perspective.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.management.ui;
-
-import org.apache.qpid.management.ui.views.MBeanView;
-import org.apache.qpid.management.ui.views.NavigationView;
-import org.eclipse.ui.IPageLayout;
-import org.eclipse.ui.IPerspectiveFactory;
-
-/**
- * 
- * @author Bhupendra Bhardwaj
- */
-public class Perspective implements IPerspectiveFactory
-{
-	public void createInitialLayout(IPageLayout layout)
-    {
-		String editorArea = layout.getEditorArea();
-		layout.setEditorAreaVisible(false);
-        
-		// standalone view meaning it can't be docked or stacked with other views, and it doesn't have a title bar.        
-		layout.addStandaloneView(NavigationView.ID, true, IPageLayout.LEFT, 0.30f, editorArea);
-        layout.addStandaloneView(MBeanView.ID, true, IPageLayout.RIGHT, 0.70f, editorArea);
-		
-		layout.getViewLayout(NavigationView.ID).setCloseable(false);
-        layout.getViewLayout(MBeanView.ID).setCloseable(false);       
-	}
-}
diff --git a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ServerRegistry.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ServerRegistry.java
deleted file mode 100644
index 313e143df5..0000000000
--- a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ServerRegistry.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.management.ui;
-
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-
-import org.apache.qpid.management.ui.jmx.ClientListener;
-import org.apache.qpid.management.ui.model.ManagedAttributeModel;
-import org.apache.qpid.management.ui.model.NotificationObject;
-import org.apache.qpid.management.ui.model.OperationDataModel;
-
-public abstract class ServerRegistry
-{
-    private ManagedServer _managedServer = null;
-    
-    // list of virtual hosts for this server
-    private List<String> _virtualHosts = new ArrayList<String>();
-    // map of all Connection mbeans
-    private ConcurrentMap<String,List<ManagedBean>> _connections = new ConcurrentHashMap<String,List<ManagedBean>>();
-    // map of all exchange mbeans
-    private ConcurrentMap<String,List<ManagedBean>> _exchanges = new ConcurrentHashMap<String,List<ManagedBean>>();
-    // map of all queue mbenas
-    private ConcurrentMap<String,List<ManagedBean>> _queues = new ConcurrentHashMap<String,List<ManagedBean>>();
-    
-    public ServerRegistry()
-    {
-        
-    }
-    
-    public ServerRegistry(ManagedServer server)
-    {
-        _managedServer = server;
-    }
-    
-    public ManagedServer getManagedServer()
-    {
-        return _managedServer;
-    }
-
-    public void setManagedServer(ManagedServer server)
-    {
-        _managedServer = server;
-    }
-    
-    protected void addConnectionMBean(ManagedBean mbean)
-    {
-        String vHost = mbean.getVirtualHostName();
-        _connections.putIfAbsent(vHost, new ArrayList<ManagedBean>());
-        _connections.get(vHost).add(mbean);
-    }
-    
-    protected void addExchangeMBean(ManagedBean mbean)
-    {
-        String vHost = mbean.getVirtualHostName();
-        _exchanges.putIfAbsent(vHost, new ArrayList<ManagedBean>());
-        _exchanges.get(vHost).add(mbean);
-    }
-    
-    protected void addQueueMBean(ManagedBean mbean)
-    {
-        String vHost = mbean.getVirtualHostName();
-        _queues.putIfAbsent(vHost, new ArrayList<ManagedBean>());
-        _queues.get(vHost).add(mbean);
-    }
-    
-    protected void removeConnectionMBean(ManagedBean mbean)
-    {
-        _connections.get(mbean.getVirtualHostName()).remove(mbean);
-    }
-    
-    protected void removeExchangeMBean(ManagedBean mbean)
-    {
-        _exchanges.get(mbean.getVirtualHostName()).remove(mbean);
-    }
-    
-    protected void removeQueueMBean(ManagedBean mbean)
-    {
-        _queues.get(mbean.getVirtualHostName()).remove(mbean);
-    }
-    
-    public List<ManagedBean> getConnections(String virtualHost)
-    {
-        return _connections.get(virtualHost);
-    }
-    
-    public List<ManagedBean> getExchanges(String virtualHost)
-    {
-        return _exchanges.get(virtualHost);
-    }
-    
-    public List<ManagedBean> getQueues(String virtualHost)
-    {
-        return _queues.get(virtualHost);
-    }
-    
-    public void addVirtualHost(String name)
-    {
-        if (!_virtualHosts.contains(name))
-        {
-            _virtualHosts.add(name);
-        }
-    }
-    
-    public List<String> getVirtualHosts()
-    {
-        return _virtualHosts;
-    }
-    
-    public abstract void setUserList(List<String> list);
-    
-    public abstract List<String> getUsernames();
-    
-    public abstract void addManagedObject(ManagedBean key);
-    
-    public abstract List<ManagedBean> getMBeans();
-    
-    public abstract void removeManagedObject(ManagedBean mbean);
-   
-    public abstract List<ManagedBean> getObjectsToBeRemoved();
-    
-    public abstract ManagedAttributeModel getAttributeModel(ManagedBean mbean);
-    
-    public abstract Object getServerConnection();
-    
-    public abstract void closeServerConnection() throws Exception;
-    
-    public abstract OperationDataModel getOperationModel(ManagedBean mbean);
-    
-    public abstract List<String> getQueueNames(String vistualHostName);
-    
-    public abstract String[] getExchangeNames(String vistualHostName);
-    
-    public abstract String[] getConnectionNames(String vistualHostName);
-    
-    public abstract List<NotificationObject> getNotifications(ManagedBean mbean);
-    
-    public abstract boolean hasSubscribedForNotifications(ManagedBean mbean, String name, String type);
-    
-    public abstract void clearNotifications(ManagedBean mbean, List<NotificationObject> list);
-    
-    public ClientListener getNotificationListener()
-    {
-        return null;
-    }
-
-    public ClientListener getClientListener()
-    {
-        return null;
-    }
-}
diff --git a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/AbstractAction.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/AbstractAction.java
deleted file mode 100644
index 53aa927299..0000000000
--- a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/AbstractAction.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.management.ui.actions;
-
-import static org.apache.qpid.management.ui.Constants.ERROR_SERVER_CONNECTION;
-
-import java.io.IOException;
-
-import org.apache.qpid.management.ui.ApplicationRegistry;
-import org.apache.qpid.management.ui.ApplicationWorkbenchAdvisor;
-import org.apache.qpid.management.ui.Constants;
-import org.apache.qpid.management.ui.jmx.MBeanUtility;
-import org.apache.qpid.management.ui.views.NavigationView;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-
-public class AbstractAction
-{
-    private NavigationView _navigationView;
-    
-    protected IWorkbenchWindow _window;
-    
-    public static final String RMI_SASL_ERROR = "non-JRMP server";
-    public static final String SECURITY_FAILURE = "User authentication has failed";   
-    public static final String SERVER_UNAVAILABLE = "Qpid server is not running";
-   
-    /**
-     * We will cache window object in order to
-     * be able to provide parent shell for the message dialog.
-     * @see IWorkbenchWindowActionDelegate#init
-     */
-    public void init(IWorkbenchWindow window)
-    {
-        this._window = window;
-        if (_window.getShell() != null)
-        {
-            _window.getShell().setImage(ApplicationRegistry.getImage(Constants.CONSOLE_IMAGE));
-        }
-    }   
-
-    protected NavigationView getNavigationView()
-    {
-        if (_navigationView == null)
-        {
-            _navigationView = (NavigationView)_window.getActivePage().findView(NavigationView.ID);
-        }
-        
-        return _navigationView;
-    }
-    
-    
-    protected void handleException(Throwable ex, String title, String msg)
-    {
-        MBeanUtility.printStackTrace(ex);
-        if (msg == null)
-        {
-            if (ex instanceof IOException)
-            {
-                if ((ex.getMessage() != null) && (ex.getMessage().indexOf(RMI_SASL_ERROR) != -1))
-                {
-                    msg = SECURITY_FAILURE;
-                }
-                else
-                {
-                    msg = SERVER_UNAVAILABLE;
-                }
-            }
-            else if (ex instanceof SecurityException)
-            {
-                msg = SECURITY_FAILURE;
-            }
-            else
-            {
-                msg = ex.getMessage();
-            }
-        }
-        
-        if ((msg == null) && (ex.getCause() != null))
-        {
-            msg = ex.getCause().getMessage();
-        }
-        
-        if (msg == null)
-        {
-            msg = ERROR_SERVER_CONNECTION;
-        }
-        
-        if (title == null)
-        {
-            title = ERROR_SERVER_CONNECTION;
-        }
-        IStatus status = new Status(IStatus.ERROR, ApplicationWorkbenchAdvisor.PERSPECTIVE_ID,
-                                    IStatus.OK, msg, null); 
-        ErrorDialog.openError(_window.getShell(), "Error", title, status);
-    }
-    
-
-    /**
-     * Selection in the workbench has been changed. We can change the state of the 'real' action here
-     * if we want, but this can only happen after  the delegate has been created.
-     * @see IWorkbenchWindowActionDelegate#selectionChanged
-     */
-    public void selectionChanged(IAction action, ISelection selection) {
-    }
-
-    /**
-     * We can use this method to dispose of any system resources we previously allocated.
-     * @see IWorkbenchWindowActionDelegate#dispose
-     */
-    public void dispose() {
-        
-    }
-}
diff --git a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/AddServer.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/AddServer.java
deleted file mode 100644
index 7a36ca6160..0000000000
--- a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/AddServer.java
+++ /dev/null
@@ -1,274 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.management.ui.actions;
-
-import static org.apache.qpid.management.ui.Constants.*;
-
-import org.apache.qpid.management.ui.ApplicationRegistry;
-import org.apache.qpid.management.ui.exceptions.InfoRequiredException;
-import org.apache.qpid.management.ui.views.NumberVerifyListener;
-import org.apache.qpid.management.ui.views.ViewUtility;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-
-public class AddServer extends AbstractAction implements IWorkbenchWindowActionDelegate 
-{
-    private static final String[] _domains ={"org.apache.qpid"};
-    
-    private String _transport = DEFAULT_PROTOCOL;
-    private String _host;
-    private String _port;
-    private String _domain;
-    private String _user;
-    private String _password;
-    
-    private boolean _addServer;
-	
-    public AddServer()
-    {
-        
-    }
-    
-    public void run(IAction action)
-    {
-        if(_window == null)
-            return;
-        
-        reset();
-        createAddServerPopup();
-        try
-        {
-            if (_addServer)
-            {
-                getNavigationView().addNewServer(_transport, _host, Integer.parseInt(_port), _domain, _user, _password);
-            }
-        }
-        catch(InfoRequiredException ex)
-        {
-            ViewUtility.popupInfoMessage(ACTION_ADDSERVER, ex.getMessage());
-        }
-        catch (Exception ex)
-        {
-            handleException(ex, null, null);
-        }
-    }
-    
-    private void reset()
-    {
-        _addServer = false;
-        _host = null;
-        _port = null;
-        _domain = null;
-        _user = null;
-        _password = null;
-    }
-    
-    /**
-     * Creates the shell and then opens the popup where user can enter new connection details.
-     * Connects to the new server and adds the server in the navigation page.
-     * Pops up any error occured in connecting to the new server
-     */
-    private void createAddServerPopup()
-    {
-        Display display = Display.getCurrent();
-        final Shell shell = new Shell(display, SWT.BORDER | SWT.CLOSE);
-        shell.setText(ACTION_ADDSERVER);
-        shell.setImage(ApplicationRegistry.getImage(CONSOLE_IMAGE));
-        shell.setLayout(new GridLayout());
-        
-        int x = display.getBounds().width;
-        int y = display.getBounds().height;
-        shell.setBounds(x/3, y/3, 425, 275);
-        
-        createWidgets(shell);
-        
-        shell.open();
-        _window.getShell().setEnabled(false);
-        
-        while (!shell.isDisposed())
-        {   
-            if (!display.readAndDispatch())
-            {
-                display.sleep();
-            }
-        }
-        
-        // enable the main shell
-        _window.getShell().setEnabled(true);
-        _window.getShell().open();
-    }
-    
-    // Creates SWT widgets for the user to add server connection details.
-    // Adds listeners to the widgets to take appropriate action
-    private void createWidgets(final Shell shell)
-    {
-        Composite composite = new Composite(shell, SWT.NONE);
-        composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
-        GridLayout layout = new GridLayout(2, false);
-        layout.horizontalSpacing = 10;
-        layout.verticalSpacing = 10;
-        layout.marginHeight = 20;
-        layout.marginWidth = 20;
-        composite.setLayout(layout);
-        
-        /* Commenting this, as there is only one protocol at the moment.
-         * This can be uncommented and enhanced, if more protocols are added in future
-        Label name = new Label(composite, SWT.NONE);
-        name.setText("Connection Type");
-        GridData layoutData = new GridData(SWT.TRAIL, SWT.TOP, false, false);
-        name.setLayoutData(layoutData);
-        
-        final Combo comboTransport = new Combo(composite, SWT.READ_ONLY);
-        comboTransport.setItems(CONNECTION_PROTOCOLS);
-        comboTransport.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false));
-        comboTransport.select(0);
-        */
-        
-        Label host = new Label(composite, SWT.NONE);
-        host.setText("Host");
-        host.setLayoutData(new GridData(SWT.TRAIL, SWT.TOP, false, false));
-        
-        final Text textHost = new Text(composite, SWT.BORDER);
-        textHost.setText("");
-        textHost.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false));
-        textHost.setFocus();
-        
-        Label port = new Label(composite, SWT.NONE);
-        port.setText("Port");
-        port.setLayoutData(new GridData(SWT.TRAIL, SWT.TOP, false, false));
-        
-        final Text textPort = new Text(composite, SWT.BORDER);
-        textPort.setText("");
-        textPort.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false));
-        // Verify if the value entered is numeric
-        textPort.addVerifyListener(new NumberVerifyListener());
-        
-        
-        Label domain = new Label(composite, SWT.NONE);
-        domain.setText("Domain");
-        domain.setLayoutData(new GridData(SWT.TRAIL, SWT.TOP, false, false));
-        
-        final Combo comboDomain = new Combo(composite, SWT.DROP_DOWN | SWT.READ_ONLY);
-        comboDomain.setItems(_domains);
-        comboDomain.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false));
-        comboDomain.select(0);
-        
-        
-        Label user = new Label(composite, SWT.NONE);
-        user.setText(USERNAME);
-        user.setLayoutData(new GridData(SWT.TRAIL, SWT.TOP, false, false));
-        
-        final Text textUser = new Text(composite, SWT.BORDER);
-        textUser.setText("");
-        textUser.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false));
-        
-        Label password = new Label(composite, SWT.NONE);
-        password.setText(PASSWORD);
-        password.setLayoutData(new GridData(SWT.TRAIL, SWT.TOP, false, false));
-        
-        final Text textPwd = new Text(composite, SWT.BORDER | SWT.SINGLE | SWT.PASSWORD);
-        textPwd.setText("");
-        //textPwd.setEchoChar('*');
-        textPwd.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false));
-        
-        Composite buttonsComposite  = new Composite(composite, SWT.NONE);
-        buttonsComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 2, 1));
-        buttonsComposite.setLayout(new GridLayout(2, true));
-        
-        
-        final Button connectButton = new Button(buttonsComposite, SWT.PUSH | SWT.CENTER);       
-        connectButton.setText(BUTTON_CONNECT);
-        GridData gridData = new GridData (SWT.TRAIL, SWT.BOTTOM, true, true);
-        gridData.widthHint = 100;
-        connectButton.setLayoutData(gridData);
-        connectButton.setFont(ApplicationRegistry.getFont(FONT_BUTTON));
-        connectButton.addSelectionListener(new SelectionAdapter(){
-            public void widgetSelected(SelectionEvent event)
-            {                
-                _host = textHost.getText();               
-                if ((_host == null) || (_host.trim().length() == 0))
-                {
-                    ViewUtility.popupInfoMessage(ACTION_ADDSERVER, INFO_HOST_ADDRESS);
-                    textHost.setText("");
-                    textHost.setFocus();
-                    return;
-                }
-                
-                _port = textPort.getText();
-                if ((_port == null) || (_port.trim().length() == 0))
-                {
-                    ViewUtility.popupInfoMessage(ACTION_ADDSERVER, INFO_HOST_PORT);
-                    textPort.setText("");
-                    textPort.setFocus();
-                    return;
-                }
-                
-                _user = textUser.getText();
-                if ((_user == null) || (_user.trim().length() == 0))
-                {
-                    ViewUtility.popupInfoMessage(ACTION_ADDSERVER, INFO_USERNAME);
-                    textUser.setText("");
-                    textUser.setFocus();
-                    return;
-                }
-                
-                _password = textPwd.getText();
-                if (_password == null)
-                {
-                    ViewUtility.popupInfoMessage(ACTION_ADDSERVER, INFO_PASSWORD);
-                    textPwd.setText("");
-                    textPwd.setFocus();
-                    return;
-                }
-                
-                _domain = comboDomain.getText();
-                _addServer = true;
-                shell.dispose();                                     
-            }
-        });
-        
-        final Button cancelButton = new Button(buttonsComposite, SWT.PUSH);
-        cancelButton.setText(BUTTON_CANCEL);
-        gridData = new GridData (SWT.LEAD, SWT.BOTTOM, true, true);
-        gridData.widthHint = 100;
-        cancelButton.setLayoutData(gridData);
-        cancelButton.setFont(ApplicationRegistry.getFont(FONT_BUTTON));
-        cancelButton.addSelectionListener(new SelectionAdapter(){
-            public void widgetSelected(SelectionEvent event)
-            {
-                shell.dispose();
-            }
-        });
-    }
-
-}
diff --git a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/CloseConnection.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/CloseConnection.java
deleted file mode 100644
index a3e52149df..0000000000
--- a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/CloseConnection.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.management.ui.actions;
-
-import static org.apache.qpid.management.ui.Constants.ACTION_CLOSE;
-import org.apache.qpid.management.ui.exceptions.InfoRequiredException;
-import org.apache.qpid.management.ui.views.NavigationView;
-import org.apache.qpid.management.ui.views.ViewUtility;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-
-public class CloseConnection extends AbstractAction implements IWorkbenchWindowActionDelegate
-{	
-	public CloseConnection()
-	{
-        
-	}
-	
-    public void run(IAction action)
-    {
-        if(_window != null)
-        {   
-            NavigationView view = (NavigationView)_window.getActivePage().findView(NavigationView.ID);
-            try
-            {
-                view.disconnect();
-            }
-            catch(InfoRequiredException ex)
-            {
-                ViewUtility.popupInfoMessage(ACTION_CLOSE, ex.getMessage());
-            }
-            catch(Exception ex)
-            {
-                handleException(ex, null, null);
-            }
-        }
-    }   
-}
diff --git a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/EditAttribute.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/EditAttribute.java
deleted file mode 100644
index d3af3661b0..0000000000
--- a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/EditAttribute.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.management.ui.actions;
-
-import static org.apache.qpid.management.ui.Constants.ACTION_EDITATTRIBUTE;
-import org.apache.qpid.management.ui.exceptions.InfoRequiredException;
-import org.apache.qpid.management.ui.views.MBeanView;
-import org.apache.qpid.management.ui.views.ViewUtility;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-
-public class EditAttribute extends AbstractAction implements IWorkbenchWindowActionDelegate
-{    
-    public void run(IAction action)
-    {
-        if(_window != null)
-        {   
-            MBeanView view = (MBeanView)_window.getActivePage().findView(MBeanView.ID);
-            try
-            {
-                view.editAttribute();
-            }
-            catch(InfoRequiredException ex)
-            {
-                ViewUtility.popupInfoMessage(ACTION_EDITATTRIBUTE, ex.getMessage());
-            }
-            catch(Exception ex)
-            {
-                handleException(ex, "Attribute could not be edited", null);
-            }
-        }
-    }
-}
diff --git a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/ReconnectServer.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/ReconnectServer.java
deleted file mode 100644
index dd9e792912..0000000000
--- a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/ReconnectServer.java
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.management.ui.actions;
-
-import static org.apache.qpid.management.ui.Constants.ACTION_LOGIN;
-import static org.apache.qpid.management.ui.Constants.CONSOLE_IMAGE;
-import static org.apache.qpid.management.ui.Constants.INFO_PASSWORD;
-import static org.apache.qpid.management.ui.Constants.INFO_USERNAME;
-import static org.apache.qpid.management.ui.Constants.PASSWORD;
-import static org.apache.qpid.management.ui.Constants.USERNAME;
-
-import org.apache.qpid.management.ui.ApplicationRegistry;
-import org.apache.qpid.management.ui.Constants;
-import org.apache.qpid.management.ui.exceptions.InfoRequiredException;
-import org.apache.qpid.management.ui.views.TreeObject;
-import org.apache.qpid.management.ui.views.ViewUtility;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-
-public class ReconnectServer extends AbstractAction implements IWorkbenchWindowActionDelegate
-{
-    private String _title;
-    private String _serverName;
-    private String _user;
-    private String _password;
-    private boolean _connect;
-    
-    public void run(IAction action)
-    {
-        if(_window == null)
-            return;
-  
-        try
-        {
-            reset();
-            // Check if a server node is selected to be reconnected.
-            TreeObject serverNode = getNavigationView().getSelectedServerNode();
-            _serverName = serverNode.getName();
-            _title = ACTION_LOGIN + " (" + _serverName + ")";
-
-            // Get the login details(username/password)
-            createLoginPopup();
-
-            if (_connect)
-            {
-                // Connect the server
-                getNavigationView().reconnect(_user, _password);
-            }
-        }
-        catch(InfoRequiredException ex)
-        {
-            ViewUtility.popupInfoMessage("Reconnect Qpid server", ex.getMessage());
-        }
-        catch (Exception ex)
-        {
-            handleException(ex, null, null);
-        }
-    }
-    
-    private void reset()
-    {
-        _connect = false;
-        _user = null;
-        _password = null;
-    }
-    
-    // Create the login popup fot th user to enter usernaem and password
-    private void createLoginPopup()
-    {
-        Display display = Display.getCurrent();
-        final Shell shell = new Shell(display, SWT.BORDER | SWT.CLOSE);
-        shell.setText(_title);
-        shell.setImage(ApplicationRegistry.getImage(CONSOLE_IMAGE));
-        shell.setLayout(new GridLayout());
-        
-        int x = display.getBounds().width;
-        int y = display.getBounds().height;
-        shell.setBounds(x/3, y/3, 350, 200);
-
-        createWidgets(shell);
-        
-        shell.open();
-        _window.getShell().setEnabled(false);
-        
-        while (!shell.isDisposed())
-        {   
-            if (!display.readAndDispatch())
-            {
-                display.sleep();
-            }
-        }
-        
-        // enable the main shell
-        _window.getShell().setEnabled(true);
-        _window.getShell().open();
-    }
-    
-    // Creates the SWT widgets in the popup shell, to enter username and password.
-    // Adds listeners to the widgets to take appropriate action
-    private void createWidgets(final Shell shell)
-    {
-        Composite composite = new Composite(shell, SWT.NONE);
-        composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
-        GridLayout layout = new GridLayout(2, false);
-        layout.horizontalSpacing = 10;
-        layout.verticalSpacing = 10;
-        layout.marginHeight = 20;
-        layout.marginWidth = 20;
-        composite.setLayout(layout);
-        
-        Label user = new Label(composite, SWT.NONE);
-        user.setText(USERNAME);
-        user.setLayoutData(new GridData(SWT.TRAIL, SWT.TOP, false, false));
-        
-        final Text textUser = new Text(composite, SWT.BORDER);
-        textUser.setText("");
-        textUser.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false));
-        // Put cursor on this field
-        textUser.setFocus();
-        
-        Label password = new Label(composite, SWT.NONE);
-        password.setText(PASSWORD);
-        password.setLayoutData(new GridData(SWT.TRAIL, SWT.TOP, false, false));
-        
-        final Text textPwd = new Text(composite, SWT.BORDER | SWT.SINGLE | SWT.PASSWORD);
-        textPwd.setText("");
-        textPwd.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false));
-        
-        Composite buttonsComposite  = new Composite(composite, SWT.NONE);
-        buttonsComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 2, 1));
-        buttonsComposite.setLayout(new GridLayout(2, true));
-        
-        
-        final Button connectButton = new Button(buttonsComposite, SWT.PUSH | SWT.CENTER);       
-        connectButton.setText(Constants.BUTTON_CONNECT);
-        GridData gridData = new GridData (SWT.TRAIL, SWT.BOTTOM, true, true);
-        gridData.widthHint = 100;
-        connectButton.setLayoutData(gridData);
-        connectButton.setFont(ApplicationRegistry.getFont(Constants.FONT_BUTTON));
-        connectButton.addSelectionListener(new SelectionAdapter(){
-            public void widgetSelected(SelectionEvent event)
-            {
-                _user = textUser.getText();
-                if ((_user == null) || (_user.trim().length() == 0))
-                {
-                    ViewUtility.popupInfoMessage(_title, INFO_USERNAME);
-                    textUser.setText("");
-                    textUser.setFocus();
-                    return;
-                }
-                
-                _password = textPwd.getText();
-                if (_password == null)
-                {
-                    ViewUtility.popupInfoMessage(_title, INFO_PASSWORD);
-                    textPwd.setText("");
-                    textPwd.setFocus();
-                    return;
-                }
-                
-                _connect = true;
-                shell.dispose();
-            }
-        });
-
-        final Button cancelButton = new Button(buttonsComposite, SWT.PUSH);
-        cancelButton.setText(Constants.BUTTON_CANCEL);
-        gridData = new GridData (SWT.LEAD, SWT.BOTTOM, true, true);
-        gridData.widthHint = 100;
-        cancelButton.setLayoutData(gridData);
-        cancelButton.setFont(ApplicationRegistry.getFont(Constants.FONT_BUTTON));
-        cancelButton.addSelectionListener(new SelectionAdapter(){
-            public void widgetSelected(SelectionEvent event)
-            {
-                shell.dispose();
-            }
-        });  
-    }
-    
-}
diff --git a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/Refresh.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/Refresh.java
deleted file mode 100644
index 34251c12d7..0000000000
--- a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/Refresh.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.management.ui.actions;
-
-import org.apache.qpid.management.ui.jmx.MBeanUtility;
-import org.apache.qpid.management.ui.views.MBeanView;
-import org.apache.qpid.management.ui.views.NavigationView;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-
-/**
- * This action refreshes both the views -Navigation and MBeanView
- * @author Bhupendra Bhardwaj
- */
-public class Refresh extends AbstractAction implements IWorkbenchWindowActionDelegate
-{    
-    public void run(IAction action)
-    {
-        if(_window != null)
-        {   
-            NavigationView view = (NavigationView)_window.getActivePage().findView(NavigationView.ID);
-            view.refresh();
-            
-            MBeanView mbeanview = (MBeanView)_window.getActivePage().findView(MBeanView.ID);
-            try
-            {
-                mbeanview.refreshMBeanView();
-            }
-            catch (Exception ex)
-            {
-                MBeanUtility.handleException(ex);
-            }
-        }
-    }
-}
diff --git a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/RemoveServer.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/RemoveServer.java
deleted file mode 100644
index e329255414..0000000000
--- a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/RemoveServer.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.management.ui.actions;
-
-import org.apache.qpid.management.ui.exceptions.InfoRequiredException;
-import org.apache.qpid.management.ui.views.NavigationView;
-import org.apache.qpid.management.ui.views.ViewUtility;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-
-public class RemoveServer extends AbstractAction implements IWorkbenchWindowActionDelegate
-{       
-    public void run(IAction action)
-    {
-        if(_window != null)
-        {   
-            NavigationView view = (NavigationView)_window.getActivePage().findView(NavigationView.ID);
-            try
-            {
-                view.removeServer();
-            }
-            catch(InfoRequiredException ex)
-            {
-                ViewUtility.popupInfoMessage("Remove Qpid server", ex.getMessage());
-            }
-            catch(Exception ex)
-            {
-                handleException(ex, "Server could not be removed", null);
-            }
-        }
-    }
-}
diff --git a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/VersionAction.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/VersionAction.java
deleted file mode 100644
index 11db02f5a2..0000000000
--- a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/VersionAction.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.management.ui.actions;
-
-import java.io.InputStream;
-import java.util.Properties;
-
-import org.apache.qpid.management.ui.Constants;
-import org.apache.qpid.management.ui.jmx.MBeanUtility;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.ui.IWorkbenchWindow;
-
-public class VersionAction extends Action
-{        
-    private IWorkbenchWindow _window;
-    public static final String VERSION_RESOURCE = "qpidversion.properties";
-
-    public static final String PRODUCT_NAME_PROPERTY = "qpid.name";
-    public static final String RELEASE_VERSION_PROPERTY = "qpid.version";
-    public static final String BUILD_VERSION_PROPERTY = "qpid.svnversion";
-    
-    private static final String DEFAULT = "unknown";
-    private static String _releaseVersion;
-    private static String _buildVersion;
-    private static String _text;
-    
-    static
-    {
-        Properties props = new Properties();
-        try
-        {
-            InputStream propertyStream = VersionAction.class.getClassLoader().getResourceAsStream(VERSION_RESOURCE);
-            if (propertyStream != null)           
-            {
-                props.load(propertyStream);
-                _releaseVersion = readPropertyValue(props, RELEASE_VERSION_PROPERTY);
-                _buildVersion = readPropertyValue(props, BUILD_VERSION_PROPERTY); 
-                _text = "Build Version : " + _buildVersion + "\n" +
-                        "Release Version : " + _releaseVersion;
-            }
-        }
-        catch (Exception ex)
-        {
-            MBeanUtility.printStackTrace(ex);
-        }
-    }
-    
-    public VersionAction(IWorkbenchWindow window)
-    {
-        _window = window;
-        setText("About " + Constants.APPLICATION_NAME);
-        setId("qpidmc.about");
-        setActionDefinitionId("qpidmc.about");
-    }
-    
-    private static String readPropertyValue(Properties props, String propertyName)
-    {
-        String retVal = (String) props.get(propertyName);
-        if (retVal == null)
-        {
-            retVal = DEFAULT;
-        }
-        return retVal;
-    }
-    
-    public void run()
-    {
-        MessageDialog.openInformation(_window.getShell(), Constants.APPLICATION_NAME, _text);
-    }
-}
diff --git a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/exceptions/InfoRequiredException.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/exceptions/InfoRequiredException.java
deleted file mode 100644
index 672426a59d..0000000000
--- a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/exceptions/InfoRequiredException.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.management.ui.exceptions;
-
-public class InfoRequiredException extends Exception
-{
-    private static final long serialVersionUID = 1L;
-
-    public InfoRequiredException(String message)
-    {
-        super(message);
-    }
-
-    public InfoRequiredException(String msg, Throwable t)
-    {
-        super(msg, t);
-    }
-}
diff --git a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/exceptions/ManagementConsoleException.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/exceptions/ManagementConsoleException.java
deleted file mode 100644
index 17c127c01a..0000000000
--- a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/exceptions/ManagementConsoleException.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-package org.apache.qpid.management.ui.exceptions;
-
-@SuppressWarnings("serial")
-public class ManagementConsoleException extends Exception
-{
-    public ManagementConsoleException(String message)
-    {
-        super(message);
-    }
-}
diff --git a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/ClientListener.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/ClientListener.java
deleted file mode 100644
index 2be0ddbebf..0000000000
--- a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/ClientListener.java
+++ /dev/null
@@ -1,77 +0,0 @@
-
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */package org.apache.qpid.management.ui.jmx;
-
-import javax.management.MBeanServerNotification;
-import javax.management.Notification;
-import javax.management.NotificationListener;
-import javax.management.ObjectName;
-import javax.management.remote.JMXConnectionNotification;
-
-import org.apache.qpid.management.ui.ApplicationRegistry;
-import org.apache.qpid.management.ui.ManagedServer;
-
-
-public class ClientListener implements NotificationListener
-{
-    protected ManagedServer server = null;
-    protected JMXServerRegistry serverRegistry = null;
-    
-    public ClientListener(ManagedServer server)
-    {
-        this.server = server;
-        serverRegistry = (JMXServerRegistry)ApplicationRegistry.getServerRegistry(server);
-    }
-    
-    public void handleNotification(Notification notification, Object handback)
-    {
-        ObjectName objName = null;
-        String     type = notification.getType();
-        MBeanUtility.printOutput(type + ":" + objName);
-        
-        if (MBeanServerNotification.REGISTRATION_NOTIFICATION.equals(type))
-        {
-            objName = ((MBeanServerNotification)notification).getMBeanName();
-            getServerRegistry().registerManagedObject(objName);
-        }
-        else if (MBeanServerNotification.UNREGISTRATION_NOTIFICATION.equals(type))
-        {
-            objName = ((MBeanServerNotification)notification).getMBeanName();
-            getServerRegistry().unregisterManagedObject(objName);
-        }
-        else if (JMXConnectionNotification.FAILED.equals(type))
-        {
-            ApplicationRegistry.serverConnectionClosed(server);
-        }
-    }
-
-    protected JMXServerRegistry getServerRegistry()
-    {
-        if (serverRegistry == null)
-            serverRegistry = (JMXServerRegistry)ApplicationRegistry.getServerRegistry(server);
-        
-        return serverRegistry;
-    }
-    public ManagedServer getServer()
-    {
-        return server;
-    }
-}
diff --git a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/ClientNotificationListener.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/ClientNotificationListener.java
deleted file mode 100644
index c6ecda4b4c..0000000000
--- a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/ClientNotificationListener.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.management.ui.jmx;
-
-import javax.management.Notification;
-import javax.management.ObjectName;
-
-import org.apache.qpid.management.ui.ManagedServer;
-
-public class ClientNotificationListener extends ClientListener
-{   
-    public ClientNotificationListener(ManagedServer server)
-    {
-        super(server);
-    }
-    
-    public void handleNotification(Notification notification, Object handback)
-    {
-        ObjectName objName = (ObjectName)notification.getSource();
-        //String     type = notification.getType();
-        getServerRegistry().addNotification(objName, notification);
-    }
-}
diff --git a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/JMXManagedObject.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/JMXManagedObject.java
deleted file mode 100644
index 3561e16098..0000000000
--- a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/JMXManagedObject.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.management.ui.jmx;
-
-import java.util.HashMap;
-
-import javax.management.ObjectName;
-
-import org.apache.qpid.management.ui.ManagedBean;
-
-
-public class JMXManagedObject extends ManagedBean
-{
-    private ObjectName _objName;
-    
-    @SuppressWarnings("unchecked")
-    public JMXManagedObject(ObjectName objName)
-    {
-        super();
-        this._objName = objName;
-        setUniqueName(_objName.toString());
-        setDomain(_objName.getDomain());       
-        super.setProperties(new HashMap(_objName.getKeyPropertyList()));
-    }
-    
-    public ObjectName getObjectName()
-    {
-        return _objName;
-    }
-}
diff --git a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/JMXServerRegistry.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/JMXServerRegistry.java
deleted file mode 100644
index f671a1dc9a..0000000000
--- a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/JMXServerRegistry.java
+++ /dev/null
@@ -1,628 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.management.ui.jmx;
-
-import static org.apache.qpid.management.ui.Constants.*;
-
-import java.lang.reflect.Constructor;
-import java.security.Security;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.CopyOnWriteArrayList;
-
-import javax.management.ListenerNotFoundException;
-import javax.management.MBeanInfo;
-import javax.management.MBeanServerConnection;
-import javax.management.Notification;
-import javax.management.ObjectName;
-import javax.management.remote.JMXConnector;
-import javax.management.remote.JMXConnectorFactory;
-import javax.management.remote.JMXServiceURL;
-import javax.security.auth.callback.CallbackHandler;
-import javax.security.sasl.SaslClientFactory;
-
-import org.apache.qpid.management.ui.ApplicationRegistry;
-import org.apache.qpid.management.ui.ManagedBean;
-import org.apache.qpid.management.ui.ManagedServer;
-import org.apache.qpid.management.ui.ServerRegistry;
-import org.apache.qpid.management.ui.model.ManagedAttributeModel;
-import org.apache.qpid.management.ui.model.NotificationInfoModel;
-import org.apache.qpid.management.ui.model.NotificationObject;
-import org.apache.qpid.management.ui.model.OperationDataModel;
-import org.apache.qpid.management.ui.sasl.JCAProvider;
-import org.apache.qpid.management.ui.sasl.SaslProvider;
-import org.apache.qpid.management.ui.sasl.UserPasswordCallbackHandler;
-import org.apache.qpid.management.ui.sasl.UsernameHashedPasswordCallbackHandler;
-
-
-public class JMXServerRegistry extends ServerRegistry
-{
-    private boolean _connected = false;
-    private ObjectName _serverObjectName = null;
-    private Map<String, Object> _env = null;
-    private JMXServiceURL _jmxUrl = null;
-    private JMXConnector _jmxc = null;
-    private MBeanServerConnection _mbsc = null;
-    private Exception _connectionException = null;
-    
-    private List<String> _usersList;
-    // When an mbean gets removed from mbean server, then the notification listener
-    // will add that mbean in this list.
-    private List<ManagedBean> _mbeansToBeRemoved = new ArrayList<ManagedBean>();
-    
-    // Map containing all managed beans and mapped with unique mbean name
-    private HashMap<String, ManagedBean>   _mbeansMap    = new HashMap<String, ManagedBean>();
-    // Map containing MBeanInfo for all mbeans and mapped with unique mbean name 
-    private HashMap<String, MBeanInfo>     _mbeanInfoMap = new HashMap<String, MBeanInfo>();
-    // Map containing attribute model for all mbeans and mapped with unique mbean name
-    private HashMap<String, ManagedAttributeModel>    _attributeModelMap = new HashMap<String, ManagedAttributeModel>();
-    // Map containing operation model for all mbeans and mapped with unique mbean name
-    private HashMap<String, OperationDataModel>       _operationModelMap = new HashMap<String, OperationDataModel>();
-    // Map containing NotificationInfo for all mbeans and mapped with unique mbean name
-    private HashMap<String, List<NotificationInfoModel>> _notificationInfoMap = new HashMap<String, List<NotificationInfoModel>>();
-    // Map containing all notifications sent for all mbeans, which are registered for notification
-    private HashMap<String, List<NotificationObject>> _notificationsMap  = new HashMap<String, List<NotificationObject>>();
-    // For mbeans which have subscribed for a notification type
-    // mbean unique name mapped with notification map. Notification map contains list of notification type
-    // mapped with notification name. Notification type list contains those notification types,
-    // which are subscribed for notification.
-    private HashMap<String, HashMap<String, List<String>>> _subscribedNotificationMap = new HashMap<String, HashMap<String, List<String>>>();
-    
-    // listener for registration or unregistratioj of mbeans on mbean server
-    private ClientNotificationListener _notificationListener = null;
-    // listener for server connection. Receives notification if server connection goes down
-    private ClientListener _clientListener = null;
-    
-    public JMXServerRegistry(ManagedServer server) throws Exception
-    {
-        super(server);
-        String securityMechanism = ApplicationRegistry.getSecurityMechanism();
-        String connectorClassName = ApplicationRegistry.getJMXConnectorClass();
-       
-        if ((securityMechanism != null) && (connectorClassName != null))
-        { 
-            createSASLConnector(securityMechanism, connectorClassName);
-        }
-        else
-        {
-            _jmxUrl = new JMXServiceURL(server.getUrl());
-            _jmxc = JMXConnectorFactory.connect(_jmxUrl, null);
-        }
-        
-        _mbsc = _jmxc.getMBeanServerConnection();
-        
-        _clientListener = new ClientListener(server);
-        _notificationListener = new ClientNotificationListener(server);
-        
-        _jmxc.addConnectionNotificationListener(_clientListener, null, null);       
-        _serverObjectName = new ObjectName("JMImplementation:type=MBeanServerDelegate");
-        _mbsc.addNotificationListener(_serverObjectName, _clientListener, null, null);
-    }
-    
-    public MBeanServerConnection getServerConnection()
-    {
-        return _mbsc;
-    }
-    
-    private void createSASLConnector(String mech, String className) throws Exception
-    {
-        String text = "Security mechanism " + mech + " is not supported.";
-        // Check if the given connector, which supports SASL is available
-        Class connectorClass = Class.forName(className);
-
-        _jmxUrl = new JMXServiceURL("jmxmp", getManagedServer().getHost(), getManagedServer().getPort());
-        _env = new HashMap<String, Object>();
-        CallbackHandler handler;
-        if (MECH_CRAMMD5.equals(mech))
-        {
-            // For SASL/CRAM-MD5
-            Map<String, Class<? extends SaslClientFactory>> map = new HashMap<String, Class<? extends SaslClientFactory>>();
-            Class<?> clazz = Class.forName("org.apache.qpid.management.ui.sasl.CRAMMD5HashedSaslClientFactory");
-            map.put("CRAM-MD5-HASHED", (Class<? extends SaslClientFactory>) clazz);
-
-            Security.addProvider(new JCAProvider(map));
-            handler = new UsernameHashedPasswordCallbackHandler(getManagedServer().getUser(),
-                                                                getManagedServer().getPassword());
-            _env.put("jmx.remote.profiles", SASL_CRAMMD5); 
-            _env.put("jmx.remote.sasl.callback.handler", handler);
-                    
-        }
-        else if (MECH_PLAIN.equals(mech))
-        {
-            // For SASL/PLAIN
-            Security.addProvider(new SaslProvider());
-            handler = new UserPasswordCallbackHandler(getManagedServer().getUser(), getManagedServer().getPassword());
-            _env.put("jmx.remote.profiles", SASL_PLAIN);
-            _env.put("jmx.remote.sasl.callback.handler", handler); 
-        }
-        else
-        {
-            MBeanUtility.printOutput(text);
-            throw new Exception(text);
-        }
-        // Now create the instance of JMXMPConnector                                               
-        Class[] paramTypes = {JMXServiceURL.class, Map.class};                           
-        Constructor cons = connectorClass.getConstructor(paramTypes);
-
-        Object[] args = {_jmxUrl, _env};           
-        Object theObject = cons.newInstance(args);
-
-        _jmxc = (JMXConnector)theObject;
-        
-        Thread connectorThread = new Thread(new ConnectorThread());
-        connectorThread.start();
-        long timeNow = System.currentTimeMillis();
-        connectorThread.join(ApplicationRegistry.timeout);
-        
-        if (_connectionException != null)
-        {
-            throw _connectionException;
-        }
-        if (!_connected)
-        {
-            if (System.currentTimeMillis() - timeNow >= ApplicationRegistry.timeout)
-                throw new Exception("Qpid server connection timed out");
-            else
-                throw new Exception("Qpid server connection failed");
-        }
-    }
-    
-    private class ConnectorThread implements Runnable
-    {
-        public void run()
-        {
-            try
-            {
-                _connected = false;
-                _connectionException = null;
-                
-                _jmxc.connect();
-                _connected = true;
-            }
-            catch (Exception ex)
-            {
-                _connectionException = ex;
-                MBeanUtility.printStackTrace(ex);
-            }
-        }
-    }
-    /**
-     * removes all listeners from the mbean server. This is required when user
-     * disconnects the Qpid server connection
-     */
-    public void closeServerConnection() throws Exception
-    {
-        try
-        {
-            if (_jmxc != null && _clientListener != null)
-                _jmxc.removeConnectionNotificationListener(_clientListener);
-
-            if (_mbsc != null && _clientListener != null)
-                _mbsc.removeNotificationListener(_serverObjectName, _clientListener);
-
-            // remove mbean notification listeners
-            for (String mbeanName : _subscribedNotificationMap.keySet())
-            {
-                _mbsc.removeNotificationListener(new ObjectName(mbeanName), _notificationListener);
-            }
-        }
-        catch (ListenerNotFoundException ex)
-        {
-            MBeanUtility.printOutput(ex.toString());
-        }
-    }
-    
-    public ManagedBean getManagedObject(String uniqueName)
-    {
-        return _mbeansMap.get(uniqueName);
-    }
-    
-    public void addManagedObject(ManagedBean mbean)
-    {
-        if (mbean.isQueue())
-        {
-            addQueueMBean(mbean);
-        }
-        else if (mbean.isExchange())
-        {
-            addExchangeMBean(mbean);
-        }
-        else if (mbean.isConnection())
-        {
-            addConnectionMBean(mbean);
-        }
-        
-        addVirtualHost(mbean.getVirtualHostName());
-        _mbeansMap.put(mbean.getUniqueName(), mbean);
-    }
-
-    public void removeManagedObject(ManagedBean mbean)
-    {
-        MBeanUtility.printOutput("Removing MBean:" + mbean.getUniqueName());
-        
-        if (mbean.isQueue())
-        {
-            removeQueueMBean(mbean);
-        }
-        else if (mbean.isExchange())
-        {
-            removeExchangeMBean(mbean);
-        }
-        else if (mbean.isConnection())
-        {
-            removeConnectionMBean(mbean);
-        }
-        
-        _mbeansMap.remove(mbean.getUniqueName());
-    }
-    
-    public void putMBeanInfo(ManagedBean mbean, MBeanInfo mbeanInfo)
-    {
-        _mbeanInfoMap.put(mbean.getUniqueName(), mbeanInfo);
-    }    
-    public MBeanInfo getMBeanInfo(ManagedBean mbean)
-    {
-        return _mbeanInfoMap.get(mbean.getUniqueName());
-    }
-    
-    public List<ManagedBean> getMBeans()
-    {
-        return new ArrayList<ManagedBean>(_mbeansMap.values());
-    }
-    
-    public void setNotificationInfo(ManagedBean mbean, List<NotificationInfoModel>value)
-    {
-        _notificationInfoMap.put(mbean.getUniqueName(), value);
-    }
-    
-    public List<NotificationInfoModel> getNotificationInfo(ManagedBean mbean)
-    {
-        return _notificationInfoMap.get(mbean.getUniqueName());
-    }
-    
-    public void addNotification(ObjectName objName, Notification notification)
-    {
-        List<NotificationObject> list = _notificationsMap.get(objName.toString());
-        NotificationObject obj = new NotificationObject(notification.getSequenceNumber(),
-                                                        new Date(notification.getTimeStamp()),
-                                                        notification.getMessage(),
-                                                        notification.getSource(),
-                                                        notification.getType());
-        
-        if (list == null)
-        {
-            list = new ArrayList<NotificationObject>();
-            _notificationsMap.put(objName.toString(), list);
-        }
-        
-        list.add(obj);
-    }
-    
-    /**
-     * Returns all the notification objects for a given mbean. If mbean is null, it returns
-     * notification objects for all the mbeans.
-     */
-    public List<NotificationObject> getNotifications(ManagedBean mbean)
-    {
-        if (mbean == null)
-        {
-            List<NotificationObject> totalList = new ArrayList<NotificationObject>();
-            for (List<NotificationObject> list : _notificationsMap.values())
-            {
-                totalList.addAll(list);
-            }
-            return totalList;
-        }
-        else
-        {
-            return _notificationsMap.get(mbean.getUniqueName());
-        }
-    }
-    
-    public void clearNotifications(ManagedBean mbean, List<NotificationObject> list)
-    {
-        if (mbean == null)
-        {
-            if (list == null || list.isEmpty())
-            {
-                // All notifications of all mbeans to be cleared
-                _notificationsMap.clear();
-            }
-            else
-            {
-                // Clear the selected notifications
-                for (NotificationObject obj : list)
-                {
-                    mbean = _mbeansMap.get(obj.getSource().toString());
-                    List<NotificationObject> nList = _notificationsMap.get(mbean.getUniqueName());
-                    if (nList != null && !nList.isEmpty())
-                    {
-                        nList.remove(obj);
-                    }
-                }
-            }
-        }
-        else 
-        {
-            if (list == null || list.isEmpty())
-            {
-                // All notifications of this mbean to be cleared
-                List<NotificationObject> nList = _notificationsMap.get(mbean.getUniqueName());
-                if (nList != null && !nList.isEmpty())
-                {
-                    nList.clear();
-                }
-            }
-            else
-            {
-                // Clear the selected notifications
-                for (NotificationObject obj : list)
-                {
-                    List<NotificationObject> nList = _notificationsMap.get(mbean.getUniqueName());
-                    if (nList != null && !nList.isEmpty())
-                    {
-                        nList.remove(obj);
-                    }
-                }
-            }
-        }
-    }
-    
-    
-    
-    /**
-     * Adds notification name and type to the map. The map contains all the notification names,
-     * subscribed for an mbean.
-     * @param mbean
-     * @param name
-     * @param type
-     */
-    public void addNotificationListener(ManagedBean mbean, String name, String type)
-    {
-        // Get the subscribed notifications map for given mbean. If map is null then create a new one. 
-        HashMap<String, List<String>> map = _subscribedNotificationMap.get(mbean.getUniqueName());
-        if (map == null)
-        {
-            map = new HashMap<String, List<String>>();
-            _subscribedNotificationMap.put(mbean.getUniqueName(),map);
-        }
-        
-        // Get the list of notification types for given notification name. If null, then create a new list.
-        List<String> list = map.get(name);
-        if (list == null)
-        {
-            list = new ArrayList<String>();
-            map.put(name, list);
-        }
-        // Now add the notification type to the list
-        if (ALL.equals(type))
-        {
-            List<NotificationInfoModel> infoList = _notificationInfoMap.get(mbean.getUniqueName());
-            for (NotificationInfoModel model : infoList)
-            {                
-                if (model.getName().equals(name))
-                {
-                    String[] types = model.getTypes();
-                    for (int i = 0; i < types.length; i++)
-                    {
-                        list.add(types[i]);
-                    }
-                }
-            }
-        }
-        else
-        {
-            list.add(type);
-        }
-
-        //System.out.println("Subscribed for notification :" + mbean.getUniqueName());
-    }
-    
-    /**
-     * Checks if the given notification name and type are subscribed for the mbean.
-     */
-    public boolean hasSubscribedForNotifications(ManagedBean mbean, String name, String type)
-    {
-        if (_subscribedNotificationMap.containsKey(mbean.getUniqueName()))
-        {
-            HashMap<String, List<String>> map = _subscribedNotificationMap.get(mbean.getUniqueName());
-            if (map.containsKey(name))
-            {
-                if (map.get(name).contains(type))
-                {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-    
-    /**
-     * Clears the notification name and type information from the subscribed notifications map
-     * and removes the listener from mbeanserver connection
-     * @param mbean
-     * @param name
-     * @param type
-     * @throws Exception
-     */
-    public void removeNotificationListener(ManagedBean mbean, String name, String type) throws Exception
-    {
-        //System.out.println("Removed notification listener :" + mbean.getUniqueName() + name +type);
-        if (_subscribedNotificationMap.containsKey(mbean.getUniqueName()))
-        {            
-            // get the notifications map. This map contains the notification name mapped with the notification types
-            HashMap<String, List<String>> map = _subscribedNotificationMap.get(mbean.getUniqueName());
-            if (map.containsKey(name))
-            {
-                if (ALL.equals(type))
-                {
-                    map.remove(name);
-                }
-                else if (type != null)
-                {
-                    map.get(name).remove(type);
-                    if (map.get(name).isEmpty())
-                    {
-                        map.remove(name);
-                    }
-                }
-            }
-            if (map.size() == 0)
-            {
-                _subscribedNotificationMap.remove(mbean.getUniqueName());
-            }
-            
-            JMXManagedObject jmxbean = (JMXManagedObject)mbean;
-            _mbsc.removeNotificationListener(jmxbean.getObjectName(), _notificationListener);
-        }
-    }
-    
-    /**
-     * When the mbean registration request is received from the mbean server, then the client listener
-     * can use this method.  It will add the mbean to a list, which will be used to add the mbean to
-     * the registry and gui
-     * @param objName
-     */
-    public void registerManagedObject(ObjectName objName)
-    {
-        JMXManagedObject managedObject = new JMXManagedObject(objName);       
-        managedObject.setServer(getManagedServer());
-        addManagedObject(managedObject);
-    }
-    
-    /**
-     * When mbean unregistration notification is received from the mbean server, then client listener
-     * can invoke this method. It will add the mbean to the list of mbeans to be removed from registry
-     * @param objName
-     */
-    public void unregisterManagedObject(ObjectName objName)
-    {
-        ManagedBean mbean = _mbeansMap.get(objName.toString());
-        removeManagedObject(mbean);
-        // Check if mbean was not available in the map. It can happen if mbean unregistration
-        // notification is received and the mbean is not added in the map.
-        if (mbean != null)
-        {
-            _mbeansToBeRemoved.add(mbean);
-        }
-    }
-
-    public List<ManagedBean> getObjectsToBeRemoved()
-    {
-        if (_mbeansToBeRemoved.isEmpty())
-            return null;
-        else
-        {
-            List<ManagedBean> list = new CopyOnWriteArrayList<ManagedBean>(_mbeansToBeRemoved);
-            _mbeansToBeRemoved.clear();
-            return list;
-        }
-    }   
-    
-    public void setAttributeModel(ManagedBean mbean, ManagedAttributeModel value)
-    {
-        _attributeModelMap.put(mbean.getUniqueName(), value);
-    }
-    
-    public ManagedAttributeModel getAttributeModel(ManagedBean mbean)
-    {
-        return _attributeModelMap.get(mbean.getUniqueName());
-    }
-    
-    public void setOperationModel(ManagedBean mbean, OperationDataModel value)
-    {
-        _operationModelMap.put(mbean.getUniqueName(), value);
-    }
-    
-    public OperationDataModel getOperationModel(ManagedBean mbean)
-    {
-        return _operationModelMap.get(mbean.getUniqueName());
-    }
-    
-    public List<String> getQueueNames(String virtualHostName)
-    {
-        List<ManagedBean> list = getQueues(virtualHostName);
-        if (list == null)
-            return null;
-        
-        List<String> queueNames = new ArrayList<String>();
-        for (ManagedBean mbean : list)
-        {
-            queueNames.add(mbean.getName());
-        }
-        return queueNames;
-    }
-    
-    public String[] getExchangeNames(String virtualHostName)
-    {
-        List<ManagedBean> list = getExchanges(virtualHostName);
-        if (list == null)
-            return null;
-        
-        String[] exchanges = new String[list.size()];
-        int i = 0;
-        for (ManagedBean mbean : list)
-        {
-            exchanges[i++] = mbean.getName();
-        }
-        return exchanges;
-    }
-    
-    public String[] getConnectionNames(String virtualHostName)
-    {
-        List<ManagedBean> list = getExchanges(virtualHostName);
-        if (list == null)
-            return null;
-        
-        String[] connections = new String[list.size()];
-        int i = 0;
-        for (ManagedBean mbean : list)
-        {
-            connections[i++] = mbean.getName();
-        }
-        return connections;
-    }
-    
-    public void setUserList(List<String> list)
-    {
-        _usersList = list;
-        Collections.sort(_usersList);
-    }
-    
-    public List<String> getUsernames()
-    {
-        return _usersList;
-    }
-
-    public ClientNotificationListener getNotificationListener()
-    {
-        return _notificationListener;
-    }
-
-    public ClientListener getClientListener()
-    {
-        return _clientListener;
-    }
-}
diff --git a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/MBeanUtility.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/MBeanUtility.java
deleted file mode 100644
index 2d1883533b..0000000000
--- a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/MBeanUtility.java
+++ /dev/null
@@ -1,466 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.management.ui.jmx;
-
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import javax.management.Attribute;
-import javax.management.AttributeList;
-import javax.management.InstanceNotFoundException;
-import javax.management.JMException;
-import javax.management.MBeanAttributeInfo;
-import javax.management.MBeanException;
-import javax.management.MBeanInfo;
-import javax.management.MBeanNotificationInfo;
-import javax.management.MBeanOperationInfo;
-import javax.management.MBeanServerConnection;
-import javax.management.ObjectInstance;
-import javax.management.ObjectName;
-import javax.management.ReflectionException;
-
-import org.apache.qpid.management.ui.ApplicationRegistry;
-import org.apache.qpid.management.ui.ManagedBean;
-import org.apache.qpid.management.ui.ManagedServer;
-import org.apache.qpid.management.ui.exceptions.ManagementConsoleException;
-import org.apache.qpid.management.ui.model.AttributeData;
-import org.apache.qpid.management.ui.model.ManagedAttributeModel;
-import org.apache.qpid.management.ui.model.NotificationInfoModel;
-import org.apache.qpid.management.ui.model.OperationData;
-import org.apache.qpid.management.ui.model.OperationDataModel;
-import org.apache.qpid.management.ui.model.ParameterData;
-import org.apache.qpid.management.ui.views.ViewUtility;
-
-/**
- * Utility class for all mbeanserver related operations. Keeps all JMX code out from view and model classes
- * @author Bhupendra Bhardwaj
- */
-public class MBeanUtility
-{
-    public static final BigInteger MAX_LONG = BigInteger.valueOf(Long.MAX_VALUE);
-    public static final BigInteger MAX_INT = BigInteger.valueOf(Integer.MAX_VALUE);
-    /**
-     * Retrieves the MBeanInfo from MBeanServer and stores in the application registry
-     * @param mbean  managed bean
-     * @return MBeanInfo
-     * @throws Exception, if server connection is null or if server throws Exception
-     */
-    public static MBeanInfo getMBeanInfo(ManagedBean mbean) throws Exception
-    {
-        ManagedServer server = mbean.getServer();
-        JMXServerRegistry serverRegistry = (JMXServerRegistry)ApplicationRegistry.getServerRegistry(server);
-
-        MBeanServerConnection mbsc = serverRegistry.getServerConnection();
-        if (mbsc == null)
-        {
-            throw new ManagementConsoleException("Server connection is broken");
-        }
-        
-        JMXManagedObject jmxbean = (JMXManagedObject)mbean;
-        MBeanInfo mbeanInfo = mbsc.getMBeanInfo(jmxbean.getObjectName());
-        serverRegistry.putMBeanInfo(mbean, mbeanInfo);
-        
-        // populate the server registry with attribute and operation info
-        getAttributes(mbean);
-        getOperations(mbean);
-        
-        return mbeanInfo;
-    }
-    
-    /**
-     * executes the MBean operation
-     * @param mbean
-     * @param opData
-     * @return MBean operation return value
-     * @throws Exception if server connection is broken or if operation execution fails on the mbean server
-     */
-    public static Object execute(ManagedBean mbean, OperationData opData) throws Exception
-    {
-        String opName = opData.getName();
-        Object[] values = null;
-        String[] signature = null;
-        
-        List<ParameterData> params = opData.getParameters();
-        if (params != null && !params.isEmpty())
-        {
-            signature = new String[params.size()];;
-            values = new Object[params.size()];
-            for (int i = 0; i < params.size(); i++)
-            {
-                signature[i] = params.get(i).getType();
-                values[i] = params.get(i).getValue();
-            }
-        }
-        
-        ManagedServer server = mbean.getServer();
-        JMXServerRegistry serverRegistry = (JMXServerRegistry)ApplicationRegistry.getServerRegistry(server);
-
-        MBeanServerConnection mbsc = serverRegistry.getServerConnection();
-        if (mbsc == null)
-        {
-            throw new ManagementConsoleException("Server connection is broken");
-            // TODO
-            // try and get the connection again if it was disconnected
-        }
-        JMXManagedObject jmxbean = (JMXManagedObject)mbean;
-        return mbsc.invoke(jmxbean.getObjectName(), opName, values, signature);
-    }
-    
-    /**
-     * @see MBeanUtility#handleException(ManagedBean, Exception)
-     */
-    public static void handleException(Exception ex)
-    {
-        handleException(null, ex);
-    }
-    
-    /**
-     * handels the exception received. Shows the exception to the user in best suitable way
-     * @param mbean managed bean
-     * @param ex   Exception
-     */
-    public static void handleException(ManagedBean mbean, Throwable ex)
-    {
-        if (mbean == null)
-        {
-            ViewUtility.popupErrorMessage("Error", "Managed Object is null \n" + ex.toString());
-            printStackTrace(ex);
-        }
-        else if (ex instanceof ReflectionException)
-        {
-            ViewUtility.popupErrorMessage(mbean.getInstanceName(), "Server has thrown error \n" + ex.toString());
-            printStackTrace(ex);
-        }
-        else if (ex instanceof InstanceNotFoundException)
-        {
-            ViewUtility.popupErrorMessage(mbean.getInstanceName(), "Managed Object Not Found \n" + ex.toString());
-            printStackTrace(ex);
-        }
-        else if (ex instanceof MBeanException)
-        {
-            String cause = ((MBeanException)ex).getTargetException().getMessage();
-            if (cause == null)
-                cause = ex.toString();
-            ViewUtility.popupInfoMessage(mbean.getInstanceName(), cause);
-        }
-        else if (ex instanceof JMException)
-        {
-            ViewUtility.popupErrorMessage(mbean.getInstanceName(), "Management Exception occured \n" + ex.toString());
-        }
-        else if (ex instanceof ManagementConsoleException)
-        {
-            ViewUtility.popupErrorMessage(mbean.getInstanceName(), ex.getMessage());
-        }
-        else 
-        {
-            if (ex.getCause() != null)
-            {
-                handleException(mbean, ex.getCause());
-            }
-            else
-            {
-                String msg = ex.getMessage();
-                if (msg == null)
-                {
-                    msg = ex.toString();
-                }
-                ViewUtility.popupErrorMessage(mbean.getInstanceName(), msg);
-                printStackTrace(ex);
-            }
-        }
-        
-    }
-    
-    /**
-     * Registers the notification listener with the MBeanServer
-     * @param mbean   managed bean
-     * @param name    notification name
-     * @param type    notification type
-     * @throws Exception  if server connection is broken or if listener could not be created 
-     */
-    public static void createNotificationlistener(ManagedBean mbean, String name, String type)
-        throws Exception
-    {
-        JMXManagedObject jmxbean = (JMXManagedObject)mbean;
-        JMXServerRegistry serverRegistry = (JMXServerRegistry)ApplicationRegistry.getServerRegistry(mbean);
-        serverRegistry.addNotificationListener(mbean, name, type);
-        MBeanServerConnection mbsc = serverRegistry.getServerConnection();
-        
-        if (mbsc == null)
-        {
-            throw new ManagementConsoleException("Server connection is broken");
-        }
-        mbsc.addNotificationListener(jmxbean.getObjectName(), serverRegistry.getNotificationListener(), null, null);
-    }
-    
-    public static void removeNotificationListener(ManagedBean mbean, String name, String type) throws Exception
-    {
-        JMXServerRegistry serverRegistry = (JMXServerRegistry)ApplicationRegistry.getServerRegistry(mbean);
-        serverRegistry.removeNotificationListener(mbean, name, type);
-    }
-    
-    /**
-     * Checks if the server registry contains attribute information for this mbean. If not then it queries the
-     * mbean server for complete mbean information, else it gets the latest value of the given attribute
-     * from mbean server.
-     * @return attribute data for the given mbean attribute
-     */
-    public static AttributeData getAttributeData(ManagedBean mbean, String attribute) throws Exception
-    {
-        JMXServerRegistry serverRegistry = (JMXServerRegistry)ApplicationRegistry.getServerRegistry(mbean);
-        ManagedAttributeModel attributeModel = serverRegistry.getAttributeModel(mbean);
-        if (attributeModel == null)
-        {
-            // If process is here, it means the mbeanInfo is not retrieved from mbean server even once for this mbean
-            getMBeanInfo(mbean);
-        }
-        else
-        {
-            // refresh attribute value from mbean server
-            refreshAttribute(mbean, attribute);
-        }
-        attributeModel = serverRegistry.getAttributeModel(mbean);
-        return attributeModel.getAttribute(attribute);
-    }
-    
-    /**
-     * Retrieves the latest attribute value from mbean server for the given mbean attribute
-     * and also sets that value in the attribute model in the server registry
-     * @return latest attribute value for the given mbean attribute
-     */
-    public static Object refreshAttribute(ManagedBean mbean, String attribute) throws Exception
-    {
-        JMXServerRegistry serverRegistry = (JMXServerRegistry)ApplicationRegistry.getServerRegistry(mbean);
-        MBeanServerConnection mbsc = serverRegistry.getServerConnection();
-        
-        if (mbsc == null)
-        {
-            throw new ManagementConsoleException("Server connection is broken");
-        }
-        
-        Object value = mbsc.getAttribute(((JMXManagedObject)mbean).getObjectName(), attribute);
-        // update the attribute data in server registry for this attribute
-        ManagedAttributeModel attributeModel = serverRegistry.getAttributeModel(mbean);
-        attributeModel.setAttributeValue(attribute, value);
-        return value;
-    }
-    
-    /**
-     * Retrieves the attribute values from MBeanSever and stores in the server registry.
-     * @param mbean
-     * @return the attribute model
-     * @throws Exception if attributes can not be retrieved from MBeanServer
-     */
-    public static ManagedAttributeModel getAttributes(ManagedBean mbean) throws Exception
-    {
-        ObjectName objName = ((JMXManagedObject)mbean).getObjectName();
-        String[] attributes = null;
-        AttributeList list = null;
-        
-        JMXServerRegistry serverRegistry = (JMXServerRegistry)ApplicationRegistry.getServerRegistry(mbean);
-        MBeanServerConnection mbsc = serverRegistry.getServerConnection();
-        MBeanAttributeInfo[] attributesInfo = null;
-        ManagedAttributeModel attributeModel = serverRegistry.getAttributeModel(mbean);
-        
-        if (attributeModel == null)
-        {
-            // If the process is here, then it means the attribute values are not retrieved from mbean server
-            // even once for this mbean. Create attribute model, retrieve values from mbean server and 
-            // set the attribute model in server registry for this mbean
-            attributeModel = new ManagedAttributeModel();
-            attributesInfo = serverRegistry.getMBeanInfo(mbean).getAttributes();
-            attributes = new String[attributesInfo.length];
-            for (int i = 0; i< attributesInfo.length ; i++)
-            {
-                attributes[i] = attributesInfo[i].getName();
-                attributeModel.setAttributeDescription(attributes[i], attributesInfo[i].getDescription());
-                attributeModel.setAttributeWritable(attributes[i], attributesInfo[i].isWritable());
-                attributeModel.setAttributeReadable(attributes[i], attributesInfo[i].isReadable());
-            }
-        }  
-        else
-        {
-            attributes = attributeModel.getAttributeNames().toArray(new String[0]);
-        }
-        
-        if (attributes.length != 0)
-        {
-            list = mbsc.getAttributes(objName, attributes);
-            for (Iterator itr = list.iterator(); itr.hasNext();)
-            {
-                Attribute attrib = (Attribute)itr.next();
-                attributeModel.setAttributeValue(attrib.getName(), attrib.getValue());
-            }
-        }               
-        
-        serverRegistry.setAttributeModel(mbean, attributeModel);       
-        return attributeModel;
-    }
-    
-    /**
-     * Updates the attribute value of an MBean
-     * @param mbean
-     * @param attribute
-     * @param value
-     * @throws Exception if MBeanServer throws exception in updating the attribute value
-     */
-    public static void updateAttribute(ManagedBean mbean, AttributeData attribute, String value) throws Exception
-    {
-        JMXManagedObject jmxbean = (JMXManagedObject)mbean;
-        JMXServerRegistry serverRegistry = (JMXServerRegistry)ApplicationRegistry.getServerRegistry(mbean);
-
-        MBeanServerConnection mbsc = serverRegistry.getServerConnection();
-        
-        Object newValue = value;
-        if (attribute.getDataType().equals(Long.class.getName()))
-        {
-            if (MAX_LONG.compareTo(new BigInteger(value)) == -1)
-            {
-                throw new ManagementConsoleException("Entered value is too big for \"" +
-                                                     ViewUtility.getDisplayText(attribute.getName()) + "\"");
-            }
-            newValue = new Long(Long.parseLong(value));
-        }
-        else if (attribute.getDataType().equals(Integer.class.getName()))
-        {
-            if (MAX_INT.compareTo(new BigInteger(value)) == -1)
-            {
-                throw new ManagementConsoleException("Entered value is too big for " + attribute.getName());
-            }
-            newValue = new Integer(Integer.parseInt(value));
-        }
-        
-        mbsc.setAttribute(jmxbean.getObjectName(), new Attribute(attribute.getName(), newValue));           
-        // Update the value in the registry, to avoid refreshing from mbsc
-        ManagedAttributeModel attributeModel = serverRegistry.getAttributeModel(mbean);
-        attributeModel.setAttributeValue(attribute.getName(), newValue);
-    }
-    
-    /**
-     * populates the operation data model in server registry for given mbean
-     * @param mbean
-     * @return operation data model
-     */
-    public static OperationDataModel getOperations(ManagedBean mbean)
-    {
-        JMXServerRegistry serverRegistry = (JMXServerRegistry)ApplicationRegistry.getServerRegistry(mbean);
-        OperationDataModel dataModel = serverRegistry.getOperationModel(mbean);
-        if (dataModel == null)
-        {
-            // Create operation model and set it in server registry for this mbean
-            MBeanOperationInfo[] operationsInfo = serverRegistry.getMBeanInfo(mbean).getOperations();
-            dataModel = new OperationDataModel();
-            
-            for (int i = 0; i < operationsInfo.length; i++)
-            {
-                dataModel.addOperation(operationsInfo[i]);
-            }
-            
-            serverRegistry.setOperationModel(mbean, dataModel);
-        }
-        return dataModel;
-    }
-    
-    /**
-     * populates the notification in the server registry for given mbean
-     * @param mbean
-     * @return notification info model
-     */
-    public static NotificationInfoModel[] getNotificationInfo(ManagedBean mbean)
-    {
-        JMXServerRegistry serverRegistry = (JMXServerRegistry)ApplicationRegistry.getServerRegistry(mbean);
-        MBeanNotificationInfo[] info = serverRegistry.getMBeanInfo(mbean).getNotifications();
-        
-        // Check if this mbean sends any notification
-        if (info == null || info.length == 0)
-            return null;
-        
-        // Create notification model if not already set in the server registry for this mbean
-        List<NotificationInfoModel> list = serverRegistry.getNotificationInfo(mbean);
-        if (list != null) 
-            return list.toArray(new NotificationInfoModel[0]);
-        else
-            list = new ArrayList<NotificationInfoModel>();
-        
-        for (int i = 0; i < info.length; i++)
-        {
-            list.add(new NotificationInfoModel(info[i].getName(), info[i].getDescription(), info[i].getNotifTypes()));
-        }
-        
-        // Set the notification model in the server registry for this mbean
-        serverRegistry.setNotificationInfo(mbean, list);
-        return list.toArray(new NotificationInfoModel[0]);
-    }
-    
-    /**
-     * Retrieves all the MBeans from mbean server for a given domain
-     * @return list of ManagedBeans
-     */
-    public static List<ManagedBean> getManagedObjectsForDomain(ManagedServer server, String domain) throws Exception
-    {
-        List<ManagedBean> mbeans = new ArrayList<ManagedBean>();
-        JMXServerRegistry serverRegistry = (JMXServerRegistry)ApplicationRegistry.getServerRegistry(server);
-        MBeanServerConnection mbsc = serverRegistry.getServerConnection();
-        ObjectName objName = new ObjectName(domain + ":*"); 
-        Set objectInstances = mbsc.queryMBeans(objName, null);
-
-        for (Iterator itr = objectInstances.iterator(); itr.hasNext();)
-        {
-            ObjectInstance instance = (ObjectInstance)itr.next();
-            ManagedBean obj = new JMXManagedObject(instance.getObjectName());
-            mbeans.add(obj);
-        }
-        
-        return mbeans;
-    }
-    
-    /**
-     * Returns all the domains for the given server. This method can be removed as now this RCP is specific to 
-     * Qpid and domain is also fixed
-     */
-    public static List<String> getAllDomains(ManagedServer server) throws Exception
-    {
-        JMXServerRegistry serverRegistry = (JMXServerRegistry)ApplicationRegistry.getServerRegistry(server);
-        MBeanServerConnection mbsc = serverRegistry.getServerConnection();
-        String[] domains = mbsc.getDomains();
-        return Arrays.asList(domains);
-    }
-    
-    public static void printOutput(String statement)
-    {
-        if (ApplicationRegistry.debug)
-        {
-            System.out.println(statement);
-        }
-    }
-    
-    public static void printStackTrace(Throwable ex)
-    {
-        if (ApplicationRegistry.debug)
-        {
-            ex.printStackTrace();
-        }
-    }
-}
diff --git a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/AttributeData.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/AttributeData.java
deleted file mode 100644
index ccd4cf8df8..0000000000
--- a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/AttributeData.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.management.ui.model;
-
-public class AttributeData
-{
-    String name = "";
-    String description = "";
-    String dataType = "";
-    Object value = "";
-    boolean readable = true;
-    boolean writable = false;
-    
-    
-    public String getDataType()
-    {
-        return dataType;
-    }
-    public void setDataType(String dataType)
-    {
-        this.dataType = dataType;
-    }
-    
-    public String getDescription()
-    {
-        return description;
-    }
-    public void setDescription(String description)
-    {
-        this.description = description;
-    }
-    
-    public String getName()
-    {
-        return name;
-    }
-    public void setName(String name)
-    {
-        this.name = name;
-    } 
-    
-    public Object getValue()
-    {
-        return value;
-    }
-    public void setValue(Object value)
-    {
-        if (value != null)
-            this.value = value;
-    }
-    public boolean isReadable()
-    {
-        return readable;
-    }
-    public void setReadable(boolean readable)
-    {
-        this.readable = readable;
-    }
-    public boolean isWritable()
-    {
-        return writable;
-    }
-    public void setWritable(boolean writable)
-    {
-        this.writable = writable;
-    }
-    
-    public boolean isNumber()
-    {
-        if ("int".equals(dataType) || "java.lang.Integer".equals(dataType) ||
-            "long".equals(dataType) || "java.lang.Long".equals(dataType) )
-        {
-            return true;
-        }
-        else
-            return false;
-    }
-}
diff --git a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/ManagedAttributeModel.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/ManagedAttributeModel.java
deleted file mode 100644
index b3219f15ea..0000000000
--- a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/ManagedAttributeModel.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.management.ui.model;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
-public class ManagedAttributeModel
-{
-    HashMap<String, AttributeData> _attributeMap = new HashMap<String, AttributeData>();
-    
-    public void setAttributeValue(String name, Object value)
-    {
-        if (value == null)
-            return;
-        
-        AttributeData data = null;
-        String dataType = value.getClass().getName();
-        if (_attributeMap.containsKey(name))
-        {
-            data = _attributeMap.get(name);
-            data.setValue(value);
-        }
-        else
-        {
-            data = new AttributeData();
-            data.setName(name);
-            data.setValue(value);
-            _attributeMap.put(name, data);
-        }
-        data.setDataType(dataType);
-    }
-    
-    
-    public void setAttributeDescription(String name, String value)
-    {
-        if (_attributeMap.containsKey(name))
-        {
-            _attributeMap.get(name).setDescription(value);
-        }
-        else
-        {
-            AttributeData data = new AttributeData();
-            data.setName(name);
-            data.setDescription(value);
-            _attributeMap.put(name, data);
-        }
-    }
-    
-    public void setAttributeReadable(String name, boolean readable)
-    {
-        if (_attributeMap.containsKey(name))
-        {
-            _attributeMap.get(name).setReadable(readable);
-        }
-        else
-        {
-            AttributeData data = new AttributeData();
-            data.setName(name);
-            data.setReadable(readable);
-            _attributeMap.put(name, data);
-        }
-    }
-    
-    public void setAttributeWritable(String name, boolean writable)
-    {
-        if (_attributeMap.containsKey(name))
-        {
-            _attributeMap.get(name).setWritable(writable);
-        }
-        else
-        {
-            AttributeData data = new AttributeData();
-            data.setName(name);
-            data.setWritable(writable);
-            _attributeMap.put(name, data);
-        }
-    }
-    
-    public List<String> getAttributeNames()
-    {
-        return new ArrayList<String>(_attributeMap.keySet());
-    }
-    
-    public AttributeData[] getAttributes()
-    {
-        return _attributeMap.values().toArray(new AttributeData[0]);
-    }
-    
-    public AttributeData getAttribute(String name)
-    {
-        return _attributeMap.get(name);
-    }
-    
-    public int getCount()
-    {
-        return _attributeMap.size();
-    }
-}
diff --git a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/NotificationInfoModel.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/NotificationInfoModel.java
deleted file mode 100644
index 6d4160889e..0000000000
--- a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/NotificationInfoModel.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.management.ui.model;
-
-public class NotificationInfoModel
-{
-    String name;
-    String description;
-    String[] types;
-    
-    public NotificationInfoModel(String name, String desc, String[] types)
-    {
-        this.name = name;
-        this.description = desc;
-        this.types = types;
-    }
-    
-    public String getDescription()
-    {
-        return description;
-    }
-    
-    public String getName()
-    {
-        return name;
-    }
-
-    public String[] getTypes()
-    {
-        return types;
-    }    
-    
-}
diff --git a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/NotificationObject.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/NotificationObject.java
deleted file mode 100644
index 926e5f0a24..0000000000
--- a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/NotificationObject.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.management.ui.model;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.TimeZone;
-
-import javax.management.ObjectName;
-
-public class NotificationObject
-{
-
-    private long    _sequenceNo;
-    private Date    _timeStamp;
-    private String  _message;
-    private Object  _source;       
-    private String  _type;         // INFO, WARN, etc
-    private static final SimpleDateFormat dateFormat = new SimpleDateFormat("hh:mm:ss dd/MM/yy z");
-    
-    public NotificationObject(long seqNo, Date timeStamp, String message, Object source, String type)
-    {
-        this._sequenceNo = seqNo;
-        this._message = message;
-        this._source  = source;
-        this._type    = type;
-        this._timeStamp = timeStamp;
-        dateFormat.setTimeZone(TimeZone.getTimeZone("GMT"));
-    }
-    
-    public Object getSource()
-    {
-        return _source;
-    }
-    public void setSource(Object _source)
-    {
-        this._source = _source;
-    }
-    
-    public String getSourceName()
-    {
-        if (_source instanceof ObjectName)
-        {
-            return ((ObjectName)_source).getKeyProperty("name");
-        }
-        
-        return null;
-    }
-    
-    public String getMessage()
-    {
-        return _message;
-    }
-    public void setMessage(String _message)
-    {
-        this._message = _message;
-    }
-    public long getSequenceNo()
-    {
-        return _sequenceNo;
-    }
-    public void setSequenceNo(long no)
-    {
-        _sequenceNo = no;
-    }
-    public String getTimeStamp()
-    {
-        return dateFormat.format(_timeStamp);
-    }
-    public void setTimeStamp(Date stamp)
-    {
-        _timeStamp = stamp;
-    }
-    public String getType()
-    {
-        return _type;
-    }
-    public void setType(String _type)
-    {
-        this._type = _type;
-    }
-       
-}
diff --git a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/OperationData.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/OperationData.java
deleted file mode 100644
index bf3b730b3e..0000000000
--- a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/OperationData.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.management.ui.model;
-
-import java.util.List;
-
-public class OperationData
-{
-    private String _name;
-    private String _description;
-    private String _returnType;
-    private int    _impact;
-    private List<ParameterData> _parameters;
- 
-    public OperationData(String value)
-    {
-        this._name = value;
-    }
-    
-    public String getName()
-    {
-        return _name;
-    }
-    
-    public String getDescription()
-    {
-        return _description;
-    }
-    
-    public void setDescription(String description)
-    {
-        this._description = description;
-    }
-
-    public List<ParameterData> getParameters()
-    {
-        return _parameters;
-    }
-
-    public void setParameters(List<ParameterData> parameters)
-    {
-        this._parameters = parameters;
-    }
-
-    public int getImpact()
-    {
-        return _impact;
-    }
-
-    public void setImpact(int impact)
-    {
-        this._impact = impact;
-    }
-
-    public String getReturnType()
-    {
-        return _returnType;
-    }
-
-    public void setReturnType(String returnType)
-    {
-        this._returnType = returnType;
-    }
-    
-    public boolean isReturnTypeBoolean()
-    {
-        return (_returnType.equals("boolean") || _returnType.equals("java.lang.Boolean"));
-    }
-    
-    public boolean isReturnTypeVoid()
-    {
-        return (_returnType.equals("void") || _returnType.equals("java.lang.Void"));
-    }
-    
-    public Object getParameterValue(String paramName)
-    {
-        if (_parameters == null)
-        {
-            return null;
-        }
-        
-        for (int i = 0; i < _parameters.size(); i++)
-        {
-            if (paramName.equalsIgnoreCase(_parameters.get(i).getName()))
-            {
-                return _parameters.get(i).getValue();
-            }
-        }
-        
-        return null;
-    }
-}
\ No newline at end of file
diff --git a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/OperationDataModel.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/OperationDataModel.java
deleted file mode 100644
index 96964a81ef..0000000000
--- a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/OperationDataModel.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.management.ui.model;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
-import javax.management.MBeanOperationInfo;
-import javax.management.MBeanParameterInfo;
-
-public class OperationDataModel
-{
-    HashMap<String, OperationData> _operationMap = new HashMap<String, OperationData>();
-    
-    public void addOperation(MBeanOperationInfo opInfo)
-    {
-        OperationData opData = new OperationData(opInfo.getName());
-        opData.setDescription(opInfo.getDescription());
-        opData.setImpact(opInfo.getImpact());
-        opData.setReturnType(opInfo.getReturnType());
-        
-        int parametersCount = opInfo.getSignature().length;
-        if (parametersCount != 0)
-        {
-            List<ParameterData> paramList = new ArrayList<ParameterData>();
-            for (int i = 0; i < parametersCount; i++)
-            {
-                MBeanParameterInfo paramInfo = opInfo.getSignature()[i];
-                ParameterData param = new ParameterData(paramInfo.getName(), paramInfo.getDescription(),
-                                                        paramInfo.getType());
-                paramList.add(param);
-            } 
-            opData.setParameters(paramList);
-        }
-        
-        _operationMap.put(opInfo.getName(), opData);
-    }
-    
-    public OperationData getOperation(String name)
-    {
-        return _operationMap.get(name);
-    }
-    
-    public List<OperationData> getOperations()
-    {
-        return new ArrayList<OperationData>(_operationMap.values());
-    }
-    
-    public int getCount()
-    {
-        return _operationMap.size();
-    }
-}
diff --git a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/ParameterData.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/ParameterData.java
deleted file mode 100644
index d12217c6eb..0000000000
--- a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/ParameterData.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.management.ui.model;
-
-/**
- * Class representing an mbean operation parameter
- * @author Bhupendra Bhardwaj
- */
-public class ParameterData
-{
-    private String _name;
-    private String _description;
-    private String _type;
-    private Object _value;
-    
-    ParameterData(String name, String desc, String type)
-    {
-        this._name = name;
-        this._description = desc;
-        this._type = type;
-        setDefaultValue();
-    }
-    
-    public String getDescription()
-    {
-        return _description;
-    }
-    
-    public String getName()
-    {
-        return _name;
-    }
-
-    public String getType()
-    {
-        return _type;
-    }
-
-    public Object getValue()
-    {
-        return _value;
-    }
-    
-    public void setValueFromString(String strValue)
-    {
-        if ("int".equals(_type))
-            _value = Integer.parseInt(strValue);
-        else if (isBoolean())
-            _value = Boolean.valueOf(strValue);
-        else if ("long".equals(_type))
-            _value = Long.parseLong(strValue);
-        else
-            _value = strValue; 
-    }
-    
-    public void setValue(Object value)
-    {
-        this._value = value;
-    }
-    
-    public boolean isBoolean()
-    {
-        return (_type.equals("boolean") || _type.equals("java.lang.Boolean"));
-    }
-    
-    public void setDefaultValue()
-    {
-        if (isBoolean())
-        {
-            _value = Boolean.valueOf("false");
-        }
-        else
-        {
-            _value = null;
-        }
-    }
-}
diff --git a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/sasl/CRAMMD5HashedSaslClientFactory.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/sasl/CRAMMD5HashedSaslClientFactory.java
deleted file mode 100644
index 32a0c12344..0000000000
--- a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/sasl/CRAMMD5HashedSaslClientFactory.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.management.ui.sasl;
-
-import java.util.Map;
-
-import javax.security.auth.callback.CallbackHandler;
-import javax.security.sasl.Sasl;
-import javax.security.sasl.SaslClient;
-import javax.security.sasl.SaslClientFactory;
-import javax.security.sasl.SaslException;
-
-public class CRAMMD5HashedSaslClientFactory implements SaslClientFactory
-{
-    /** The name of this mechanism */
-    public static final String MECHANISM = "CRAM-MD5-HASHED";
-
-    public SaslClient createSaslClient(String[] mechanisms, String authorizationId, String protocol,
-                                       String serverName, Map<String, ?> props, CallbackHandler cbh)
-    throws SaslException
-    {
-        for (int i = 0; i < mechanisms.length; i++)
-        {
-            if (mechanisms[i].equals(MECHANISM))
-            {
-                if (cbh == null)
-                {
-                    throw new SaslException("CallbackHandler must not be null");
-                }
-
-                String[] mechs = {"CRAM-MD5"};
-                return Sasl.createSaslClient(mechs, authorizationId, protocol, serverName, props, cbh);
-            }
-        }
-        return null;
-    }
-
-    public String[] getMechanismNames(Map props)
-    { 
-        return new String[]{MECHANISM};
-    }
-}
diff --git a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/sasl/ClientSaslFactory.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/sasl/ClientSaslFactory.java
deleted file mode 100644
index ce9a273eaa..0000000000
--- a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/sasl/ClientSaslFactory.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.management.ui.sasl;
-
-import java.util.Map;
-
-import javax.security.auth.callback.CallbackHandler;
-import javax.security.sasl.SaslClient;
-import javax.security.sasl.SaslClientFactory;
-import javax.security.sasl.SaslException;
-
-public class ClientSaslFactory implements SaslClientFactory
-{
-    public SaslClient createSaslClient(String[] mechs, String authorizationId, String protocol,
-                                       String serverName, Map props, CallbackHandler cbh)
-    throws SaslException 
-    {
-        for (int i = 0; i < mechs.length; i++)
-        {
-            if (mechs[i].equals("PLAIN"))
-            {
-                return new PlainSaslClient(authorizationId, cbh);
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Simple-minded implementation that ignores props
-     */
-    public String[] getMechanismNames(Map props)
-    {
-        return new String[]{"PLAIN"};
-    }
-
-}
diff --git a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/sasl/JCAProvider.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/sasl/JCAProvider.java
deleted file mode 100644
index d8189f3ac3..0000000000
--- a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/sasl/JCAProvider.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.management.ui.sasl;
-
-import java.security.Provider;
-import java.util.Map;
-
-import javax.security.sasl.SaslClientFactory;
-
-public class JCAProvider extends Provider
-{
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * Creates the security provider with a map from SASL mechanisms to implementing factories.
-     *
-     * @param providerMap The map from SASL mechanims to implementing factory classes.
-     */
-    public JCAProvider(Map<String, Class<? extends SaslClientFactory>> providerMap)
-    {
-        super("AMQSASLProvider", 1.0, "A JCA provider that registers all "
-              + "AMQ SASL providers that want to be registered");
-        register(providerMap);
-    }
-
-    /**
-     * Registers client factory classes for a map of mechanism names to client factory classes.
-     *
-     * @param providerMap The map from SASL mechanims to implementing factory classes.
-     */
-    private void register(Map<String, Class<? extends SaslClientFactory>> providerMap)
-    {
-        for (Map.Entry<String, Class<? extends SaslClientFactory>> me : providerMap.entrySet())
-        {
-            put("SaslClientFactory." + me.getKey(), me.getValue().getName());
-        }
-    }
-}
diff --git a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/sasl/PlainSaslClient.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/sasl/PlainSaslClient.java
deleted file mode 100644
index 22190f29eb..0000000000
--- a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/sasl/PlainSaslClient.java
+++ /dev/null
@@ -1,203 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.management.ui.sasl;
-
-import java.io.*;
-import javax.security.auth.callback.*;
-import javax.security.sasl.*;
-
-public class PlainSaslClient implements SaslClient
-{
-
-    private boolean completed;
-    private CallbackHandler cbh;
-    private String authorizationID;
-    private String authenticationID;
-    private byte password[];
-    private static byte SEPARATOR = 0;
-    
-    public PlainSaslClient(String authorizationID, CallbackHandler cbh) throws SaslException
-    {
-        completed = false;
-        this.cbh = cbh;
-        Object[] userInfo = getUserInfo();
-        this.authorizationID = authorizationID;
-        this.authenticationID = (String) userInfo[0];
-        this.password = (byte[]) userInfo[1];
-        if (authenticationID == null || password == null)
-        {
-            throw new SaslException("PLAIN: authenticationID and password must be specified");
-        }
-    }
-
-    public byte[] evaluateChallenge(byte[] challenge) throws SaslException
-    {
-        if (completed)
-        {
-            throw new IllegalStateException("PLAIN: authentication already " +
-            "completed");
-        }
-        completed = true;
-        try 
-        {
-            byte authzid[] =
-                authorizationID == null ? null : authorizationID.getBytes("UTF8");
-            byte authnid[] = authenticationID.getBytes("UTF8");
-            byte response[] =
-                new byte[
-                         password.length +
-                         authnid.length +
-                         2 + // SEPARATOR
-                         (authzid != null ? authzid.length : 0)
-                         ];
-            int size = 0;
-            if (authzid != null) {
-                System.arraycopy(authzid, 0, response, 0, authzid.length);
-                size = authzid.length;
-            }
-            response[size++] = SEPARATOR;
-            System.arraycopy(authnid, 0, response, size, authnid.length);
-            size += authnid.length;
-            response[size++] = SEPARATOR;
-            System.arraycopy(password, 0, response, size, password.length);
-            clearPassword();
-            return response;
-        } catch (UnsupportedEncodingException e) {
-            throw new SaslException("PLAIN: Cannot get UTF-8 encoding of ids",
-                    e);
-        }
-    }
-
-    public String getMechanismName()
-    {
-        return "PLAIN";
-    }
-
-    public boolean hasInitialResponse()
-    {
-        return true;
-    }
-
-    public boolean isComplete()
-    {
-        return completed;
-    }
-
-    public byte[] unwrap(byte[] incoming, int offset, int len) throws SaslException
-    {
-        if (completed) {
-            throw new IllegalStateException("PLAIN: this mechanism supports " +
-            "neither integrity nor privacy");
-        } else {
-            throw new IllegalStateException("PLAIN: authentication not " +
-            "completed");
-        }
-    }
-
-    public byte[] wrap(byte[] outgoing, int offset, int len) throws SaslException
-    {
-        if (completed)
-        {
-            throw new IllegalStateException("PLAIN: this mechanism supports " +
-            "neither integrity nor privacy");
-        }
-        else
-        {
-            throw new IllegalStateException("PLAIN: authentication not " +
-            "completed");
-        }
-    }
-
-    public Object getNegotiatedProperty(String propName)
-    {
-        if (completed)
-        {
-            if (propName.equals(Sasl.QOP))
-            {
-                return "auth";
-            }
-            else
-            {
-                return null;
-            }
-        }
-        else 
-        {
-            throw new IllegalStateException("PLAIN: authentication not " +
-            "completed");
-        }
-    }
-
-    private void clearPassword()
-    {
-        if (password != null)
-        {
-            for (int i = 0 ; i < password.length ; i++)
-            {
-                password[i] = 0;
-            }
-            password = null;
-        }
-    }
-
-    public void dispose() throws SaslException
-    {
-        clearPassword();
-    }
-
-    protected void finalize()
-    {
-        clearPassword();
-    }
-
-    private Object[] getUserInfo() throws SaslException
-    {
-        try
-        {
-            final String userPrompt = "PLAIN authentication id: ";
-            final String pwPrompt = "PLAIN password: ";
-            NameCallback nameCb = new NameCallback(userPrompt);
-            PasswordCallback passwordCb = new PasswordCallback(pwPrompt, false);
-            cbh.handle(new Callback[] { nameCb, passwordCb });
-            String userid = nameCb.getName();
-            char pwchars[] = passwordCb.getPassword();
-            byte pwbytes[];
-            if (pwchars != null)
-            {
-                pwbytes = (new String(pwchars)).getBytes("UTF8");
-                passwordCb.clearPassword();
-            }
-            else 
-            {
-                pwbytes = null;
-            }
-            return (new Object[] { userid, pwbytes });
-        } 
-        catch (IOException e)
-        {
-            throw new SaslException("Cannot get password", e);
-        } 
-        catch (UnsupportedCallbackException e)
-        {
-            throw new SaslException("Cannot get userid/password", e);
-        }
-    }
-}
diff --git a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/sasl/SaslProvider.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/sasl/SaslProvider.java
deleted file mode 100644
index 2917de8740..0000000000
--- a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/sasl/SaslProvider.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.management.ui.sasl;
-
-import java.security.Provider;
-
-public class SaslProvider extends Provider
-{
-    private static final long serialVersionUID = -6978096016899676466L;
-
-    public SaslProvider()
-    {
-        super("SaslClientFactory", 1.0, "SASL PLAIN CLIENT MECHANISM");
-        put("SaslClientFactory.PLAIN", "ClientSaslFactory");
-    }
-
-}
diff --git a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/sasl/UserPasswordCallbackHandler.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/sasl/UserPasswordCallbackHandler.java
deleted file mode 100644
index 1602229c85..0000000000
--- a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/sasl/UserPasswordCallbackHandler.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.management.ui.sasl;
-
-import java.io.*;
-import javax.security.auth.callback.*;
-
-public class UserPasswordCallbackHandler implements CallbackHandler
-{
-    private String user;
-    private char[] pwchars;
-    
-    public UserPasswordCallbackHandler(String user, String password)
-    {
-        this.user = user;
-        this.pwchars = password.toCharArray();
-    }
-
-    public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException
-    {
-        for (int i = 0; i < callbacks.length; i++)
-        {
-            if (callbacks[i] instanceof NameCallback)
-            {
-                NameCallback ncb = (NameCallback) callbacks[i];
-                ncb.setName(user);
-            } 
-            else if (callbacks[i] instanceof PasswordCallback)
-            {
-                PasswordCallback pcb = (PasswordCallback) callbacks[i];
-                pcb.setPassword(pwchars);
-            } 
-            else
-            {
-                throw new UnsupportedCallbackException(callbacks[i]);
-            }
-        }
-    }
-
-    private void clearPassword()
-    {
-        if (pwchars != null) 
-        {
-            for (int i = 0 ; i < pwchars.length ; i++)
-            {
-                pwchars[i] = 0;
-            }
-            pwchars = null;
-        }
-    }
-
-    protected void finalize()
-    {
-        clearPassword();
-    }
-}
diff --git a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/sasl/UsernameHashedPasswordCallbackHandler.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/sasl/UsernameHashedPasswordCallbackHandler.java
deleted file mode 100644
index f4e3d2661e..0000000000
--- a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/sasl/UsernameHashedPasswordCallbackHandler.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.management.ui.sasl;
-
-import java.io.IOException;
-
-import javax.security.auth.callback.Callback;
-import javax.security.auth.callback.CallbackHandler;
-import javax.security.auth.callback.NameCallback;
-import javax.security.auth.callback.PasswordCallback;
-import javax.security.auth.callback.UnsupportedCallbackException;
-
-import org.apache.qpid.management.ui.views.ViewUtility;
-
-public class UsernameHashedPasswordCallbackHandler implements CallbackHandler
-{
-    private String user;
-    private char[] pwchars;
-    
-    public UsernameHashedPasswordCallbackHandler(String user, String password) throws Exception
-    {
-        this.user = user;
-        this.pwchars = ViewUtility.getHash(password);
-    }
-
-    public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException
-    {
-        for (int i = 0; i < callbacks.length; i++)
-        {
-            if (callbacks[i] instanceof NameCallback)
-            {
-                NameCallback ncb = (NameCallback) callbacks[i];
-                ncb.setName(user);
-            } 
-            else if (callbacks[i] instanceof PasswordCallback)
-            {
-                PasswordCallback pcb = (PasswordCallback) callbacks[i];
-                pcb.setPassword(pwchars);
-            } 
-            else
-            {
-                throw new UnsupportedCallbackException(callbacks[i]);
-            }
-        }
-    }
-
-    
-    private void clearPassword()
-    {
-        if (pwchars != null) 
-        {
-            for (int i = 0 ; i < pwchars.length ; i++)
-            {
-                pwchars[i] = 0;
-            }
-            pwchars = null;
-        }
-    }
-
-    protected void finalize()
-    {
-        clearPassword();
-    }
-}
diff --git a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/AttributesTabControl.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/AttributesTabControl.java
deleted file mode 100644
index 3234503fb5..0000000000
--- a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/AttributesTabControl.java
+++ /dev/null
@@ -1,936 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.management.ui.views;
-
-import static org.apache.qpid.management.ui.Constants.*;
-
-import org.apache.qpid.management.ui.ApplicationRegistry;
-import org.apache.qpid.management.ui.ManagedBean;
-import org.apache.qpid.management.ui.jmx.JMXServerRegistry;
-import org.apache.qpid.management.ui.jmx.MBeanUtility;
-import org.apache.qpid.management.ui.model.AttributeData;
-import org.apache.qpid.management.ui.model.ManagedAttributeModel;
-import org.eclipse.jface.viewers.IColorProvider;
-import org.eclipse.jface.viewers.IFontProvider;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerSorter;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.events.KeyListener;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.MouseListener;
-import org.eclipse.swt.events.MouseMoveListener;
-import org.eclipse.swt.events.MouseTrackListener;
-import org.eclipse.swt.events.PaintEvent;
-import org.eclipse.swt.events.PaintListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.layout.FillLayout;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Canvas;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.TabFolder;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.forms.widgets.Form;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-
-/**
- * Creates controller composite for the attribute's tab. 
- * @author Bhupendra Bhardwaj
- */
-public class AttributesTabControl extends TabControl
-{    
-    private FormToolkit  _toolkit;
-    private Form _form;    
-    private Table _table = null;
-    private TableViewer _tableViewer = null;
-    private static final int[] tableWidths = new int[] {300, 300};
-    
-    private Composite _tableComposite = null;
-    private Composite _buttonsComposite = null;
-    
-    private DisposeListener tableDisposeListener = new DisposeListenerImpl();
-    final Image image;
-    private Button _detailsButton  = null;
-    private Button _editButton  = null;
-    private Button _graphButton = null;
-    private Button _refreshButton = null;
-    private boolean disableEditing = false;
-    
-    private static final String MAX_VALUE = "MaxValue";
-    private static final String GRAPH_VALUES = "GraphValues";
-    private int GRAPH_WIDTH = 700;
-    private int GRAPH_HEIGHT = 450;
-    private int GRAPH_ITEM_GAP = 100;
-    private int startX = 80;
-    private int startY = 60;
-    
-    public AttributesTabControl(TabFolder tabFolder)
-    {
-        super(tabFolder);
-        _toolkit = new FormToolkit(_tabFolder.getDisplay());
-        _form = _toolkit.createForm(_tabFolder);
-        GridLayout gridLayout = new GridLayout(2, false);      
-        gridLayout.marginWidth = 0;
-        gridLayout.marginHeight = 0;       
-        _form.getBody().setLayout(gridLayout);
-        _tableComposite = _toolkit.createComposite(_form.getBody());
-        _tableComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
-        _tableComposite.setLayout(new GridLayout());
-        _buttonsComposite = _toolkit.createComposite(_form.getBody());
-        _buttonsComposite.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, true));
-        _buttonsComposite.setLayout(new GridLayout());
-        
-        image = Display.getCurrent().getSystemImage(SWT.ICON_INFORMATION);
-        createWidgets();         
-    }
-    
-    /**
-     * @see TabControl#getControl()
-     */
-    public Control getControl()
-    {
-        return _form;
-    }
-    
-    /**
-     * Creates required widgets for Attribute's tab
-     */
-    protected void createWidgets()
-    {
-        createTable();
-        createTableViewer();                
-        createButtons();        
-        addTableListeners();        
-    }
-    
-    /**
-     * Creates table for listing the MBean attributes
-     */
-    private void createTable()
-    {  
-        _table = _toolkit.createTable(_tableComposite,  SWT.FULL_SELECTION); 
-        GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
-        _table.setLayoutData(gridData);
-        
-        for (int i = 0; i < ATTRIBUTE_TABLE_TITLES.length; ++i)
-        {
-            final TableColumn column = new TableColumn(_table, SWT.NONE);
-            column.setText(ATTRIBUTE_TABLE_TITLES[i]);
-            column.setWidth(tableWidths[i]);
-            column.setResizable(false);
-        }
-        
-        _table.setLinesVisible (true);
-        _table.setHeaderVisible (true);
-    }
-    
-    /**
-     * Creates tableviewer for the attribute's table
-     */
-    private void createTableViewer()
-    {
-        _tableViewer = new TableViewer(_table);
-        _tableViewer.setUseHashlookup(true);
-        _tableViewer.setColumnProperties(ATTRIBUTE_TABLE_TITLES);
-        _tableViewer.setContentProvider(new ContentProviderImpl());
-        _tableViewer.setLabelProvider(new LabelProviderImpl());
-        _tableViewer.setSorter(new ViewerSorterImpl());
-    }
-    
-    private void createButtons()
-    {
-        addDetailsButton();
-        addEditButton();
-        addGraphButton();
-        addRefreshButton();
-    }
-      
-    private void addDetailsButton()
-    {
-        // Create and configure the button for attribute details
-        _detailsButton = _toolkit.createButton(_buttonsComposite, BUTTON_DETAILS, SWT.PUSH | SWT.CENTER);
-        _detailsButton.setFont(ApplicationRegistry.getFont(FONT_BUTTON));
-        GridData gridData = new GridData(SWT.CENTER, SWT.TOP, false, false);
-        gridData.widthHint = 80;
-        _detailsButton.setLayoutData(gridData);
-        _detailsButton.addSelectionListener(new SelectionAdapter()
-            {
-                public void widgetSelected(SelectionEvent e)
-                {
-                    disableEditing = true;
-                    int index = _table.getSelectionIndex();
-                    TableItem item = _table.getItem(index);                   
-                    createDetailsPopup((AttributeData)item.getData());
-                    disableEditing = false;
-                    setFocus();
-                }
-            });
-    }
-    
-    /**
-     * Creates the button for editing attributes.
-     */
-    private void addEditButton()
-    {
-        // Create and configure the button for editing attribute
-        _editButton = _toolkit.createButton(_buttonsComposite, BUTTON_EDIT_ATTRIBUTE, SWT.PUSH | SWT.CENTER);
-        _editButton.setFont(ApplicationRegistry.getFont(FONT_BUTTON));
-        GridData gridData = new GridData(SWT.CENTER, SWT.TOP, false, false);
-        gridData.widthHint = 80;
-        _editButton.setLayoutData(gridData);
-        _editButton.addSelectionListener(new SelectionAdapter()
-            {
-                public void widgetSelected(SelectionEvent e)
-                {
-                    int index = _table.getSelectionIndex();
-                    TableItem item = _table.getItem(index);
-                    createDetailsPopup((AttributeData)item.getData());
-                    setFocus();
-                }
-            });
-    }
-    
-    /**
-     * Creates the button for viewing Graphs
-     */ 
-    private void addGraphButton()
-    {
-        _graphButton = _toolkit.createButton(_buttonsComposite, BUTTON_GRAPH, SWT.PUSH | SWT.CENTER);
-        _graphButton.setFont(ApplicationRegistry.getFont(FONT_BUTTON));
-        GridData gridData = new GridData(SWT.CENTER, SWT.TOP, false, false);
-        gridData.widthHint = 80;
-        _graphButton.setLayoutData(gridData);
-        _graphButton.addSelectionListener(new SelectionAdapter()
-            {
-                public void widgetSelected(SelectionEvent event)
-                {
-                    int selectionIndex = _table.getSelectionIndex();
-                    AttributeData data = (AttributeData)_table.getItem(selectionIndex).getData();
-                    createGraph(data);
-                    setFocus();
-                }
-            });
-    }
-    
-    /**
-     * Creates the "Refresh" button
-     */
-    private void addRefreshButton()
-    {    
-        _refreshButton = _toolkit.createButton(_buttonsComposite, BUTTON_REFRESH, SWT.PUSH | SWT.CENTER);
-
-        _refreshButton.setFont(ApplicationRegistry.getFont(FONT_BUTTON));
-        GridData gridData = new GridData(SWT.CENTER, SWT.TOP, false, false);
-        gridData.widthHint = 80;
-        _refreshButton.setLayoutData(gridData);
-        _refreshButton.addSelectionListener(new SelectionAdapter()
-            {
-                public void widgetSelected(SelectionEvent e)
-                {
-                    try
-                    {
-                        // refresh the attributes list                
-                        refresh(_mbean);
-                    }
-                    catch (Exception ex)
-                    {
-                        MBeanUtility.handleException(_mbean, ex);
-                    }
-                    
-                }
-            });
-    }
-
-    private void addTableListeners()
-    {
-        _tableViewer.addSelectionChangedListener(new ISelectionChangedListener(){
-            public void selectionChanged(SelectionChangedEvent evt)
-            {
-                IStructuredSelection ss = (IStructuredSelection)evt.getSelection();
-                checkForEnablingButtons((AttributeData)ss.getFirstElement());
-            }
-        });
-        
-        MouseListenerImpl listener = new MouseListenerImpl();
-        _tableViewer.getTable().addMouseTrackListener(listener);
-        _tableViewer.getTable().addMouseMoveListener(listener);
-        _tableViewer.getTable().addMouseListener(listener);
-        
-        _table.addDisposeListener(tableDisposeListener);
-        
-        // _table is equal to _tableViewer.getControl()
-        _table.addListener(SWT.MeasureItem, new Listener() {  
-            public void handleEvent(Event event)
-            {    
-                event.height = event.gc.getFontMetrics().getHeight()  * 3/2;
-            }  
-        }); 
-    }
-    
-    /**
-     * Listeners implementation class for showing table tooltip
-     * @author Bhupendra Bhardwaj
-     */
-    private class MouseListenerImpl implements MouseTrackListener, MouseMoveListener, KeyListener, MouseListener                                              
-    {
-        Shell tooltipShell = null;
-        Label tooltipLabel = null;
-        public void mouseHover(MouseEvent event)
-        {
-            TableItem item = _table.getItem (new Point (event.x, event.y));
-            
-            if (item != null)
-            {
-                AttributeData data = (AttributeData)item.getData();
-                if (tooltipShell != null  && !tooltipShell.isDisposed ()) tooltipShell.dispose ();
-                tooltipShell = new Shell(_table.getShell(), SWT.ON_TOP | SWT.NO_FOCUS | SWT.TOOL);
-                tooltipShell.setBackground(event.display.getSystemColor(SWT.COLOR_INFO_BACKGROUND));
-                FillLayout layout = new FillLayout();
-                layout.marginWidth = 2;
-                tooltipShell.setLayout(layout);
-                tooltipLabel = new Label(tooltipShell, SWT.NONE);
-                tooltipLabel.setForeground(event.display.getSystemColor(SWT.COLOR_INFO_FOREGROUND));
-                tooltipLabel.setBackground(event.display.getSystemColor(SWT.COLOR_INFO_BACKGROUND));
-                tooltipLabel.setText(data.getDescription());
-                tooltipLabel.setData("_TABLEITEM", item);
-                tooltipLabel.addListener(SWT.MouseExit, tooltipLabelListener);
-                tooltipLabel.addListener(SWT.MouseDown, tooltipLabelListener);
-                Point size = tooltipShell.computeSize(SWT.DEFAULT, SWT.DEFAULT);
-                Rectangle rect = item.getBounds(0);
-                Point pt = _table.toDisplay(rect.x, rect.y);
-                tooltipShell.setBounds(pt.x, pt.y, size.x, size.y);
-                tooltipShell.setVisible(true);
-            }
-        }
-        public void mouseEnter(MouseEvent e)
-        {
-        }
-        public void mouseExit(MouseEvent e)
-        {
-        }
-        
-        // MouseMoveListener implementation
-        public void mouseMove(MouseEvent event)
-        {
-            if (tooltipShell == null)
-                return;
-            
-            tooltipShell.dispose();
-            tooltipShell = null;
-            tooltipLabel = null;
-        }
-        
-        // KeyListener implementation
-        public void keyPressed(KeyEvent e)
-        {
-            if (tooltipShell == null)
-                return;
-            
-            tooltipShell.dispose();
-            tooltipShell = null;
-            tooltipLabel = null;
-        }     
-        public void keyReleased(KeyEvent e)
-        {
-            
-        }
-        
-        // MouseListener implementation
-        public void mouseDoubleClick(MouseEvent event)
-        {
-            if (tooltipShell != null)
-            {
-                tooltipShell.dispose();
-                tooltipShell = null;
-                tooltipLabel = null;
-            }
-            Table table = (Table)event.getSource();
-            int selectionIndex = table.getSelectionIndex();
-            AttributeData data = (AttributeData)table.getItem(selectionIndex).getData();
-            createDetailsPopup(data);
-        }
-        public void mouseDown(MouseEvent e)
-        {
-            if (tooltipShell != null)
-            {
-                tooltipShell.dispose();
-                tooltipShell = null;
-                tooltipLabel = null;
-            }
-        }
-        public void mouseUp(MouseEvent e)
-        {
-            
-        }
-    } // end of MouseListenerImpl
-    
-    /**
-     * Creates pop-up window for showing attribute details
-     * @param data - Selectes attribute
-     */
-    public void createDetailsPopup(AttributeData data)
-    {
-        int width = 500;
-        int height = 250;
-        if (!isSimpleType(data.getValue()))
-        {
-            width = 650;
-            height = 450;
-        }
-        
-        Display display = Display.getCurrent();
-        Shell shell = ViewUtility.createPopupShell(ATTRIBUTE, width, height);
-        createDetailsPopupContents(shell, data);
-
-        shell.open();
-        while (!shell.isDisposed())
-        {
-            if (!display.readAndDispatch())
-            {
-                display.sleep();
-            }
-        }
-        shell.dispose();
-    }
-    
-    /**
-     * Listener class for table tooltip label
-     */
-    final Listener tooltipLabelListener = new Listener ()
-    {
-        public void handleEvent (Event event)
-        {
-            Label label = (Label)event.widget;
-            Shell shell = label.getShell();
-            switch (event.type)
-            {
-                case SWT.MouseDown:
-                    Event e = new Event();
-                    e.item = (TableItem)label.getData ("_TABLEITEM");
-                    _table.setSelection(new TableItem[] {(TableItem)e.item});
-                    shell.dispose();
-                    _table.setFocus();
-                    break;
-                case SWT.MouseExit:
-                    shell.dispose();
-                    break;
-            }
-        }
-    };
-    
-    
-    /**
-     * Create the contents for the attribute details window pop-up
-     * @param shell - The shell that will be filled with details.
-     * @param attribute - Selected attribute
-     */
-    private void createDetailsPopupContents(Composite shell, AttributeData attribute)
-    {
-        GridLayout layout = new GridLayout(2, false);
-        layout.horizontalSpacing = 10;
-        layout.verticalSpacing = 10;
-        layout.marginHeight = 20;
-        layout.marginWidth = 20;
-        
-        Composite parent = _toolkit.createComposite(shell, SWT.NONE);
-        parent.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
-        parent.setLayout(layout);
-
-        // Name
-        Label label = _toolkit.createLabel(parent, ATTRIBUTE_TABLE_TITLES[0], SWT.NONE);       
-        GridData layoutData = new GridData(SWT.TRAIL, SWT.TOP, false, false);
-        label.setLayoutData(layoutData);
-        int textStyle = SWT.BEGINNING | SWT.BORDER |SWT.READ_ONLY;
-        Text  value = _toolkit.createText(parent, ViewUtility.getDisplayText(attribute.getName()), textStyle);
-        value.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false));
-
-        
-        // Description
-        label = _toolkit.createLabel(parent, DESCRIPTION, SWT.NONE);
-        label.setLayoutData(new GridData(SWT.TRAIL, SWT.TOP, false, false));
-        value = _toolkit.createText(parent, attribute.getDescription(), textStyle);
-        value.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false));
-        
-        // value
-        label = _toolkit.createLabel(parent, ATTRIBUTE_TABLE_TITLES[1], SWT.NONE);
-        label.setLayoutData(new GridData(SWT.TRAIL, SWT.TOP, false, false));
-        
-        if (!attribute.isReadable())
-        {
-            value = _toolkit.createText(parent, "", textStyle);
-            value.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false));
-        }
-        else
-        {
-            if (!isSimpleType(attribute.getValue()))
-            {
-                Composite composite = new Composite(parent, SWT.BORDER);
-                composite.setLayout(new GridLayout());
-                composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
-                ViewUtility.populateCompositeWithData(_toolkit, composite, attribute.getValue());
-            }
-            else
-            {
-                if (attribute.isWritable())
-                {
-                    value = _toolkit.createText(parent, "", SWT.BEGINNING | SWT.BORDER);
-                    value.addVerifyListener(new NumberVerifyListener());
-                    
-                    // set data to access in the listener
-                    parent.setData(attribute);
-                }
-                else
-                {
-                    value = _toolkit.createText(parent, "", textStyle);
-                }
-                
-                value.setText(attribute.getValue().toString());
-                value.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false));
-            }
-        }  
-        
-        
-        // Update button
-        Button updateButton = addUpdateButton(parent);
-        updateButton.setData(value);
-        if (!attribute.isWritable())
-        {
-            updateButton.setVisible(false);
-        }
-        
-        if (disableEditing)
-        {
-            value.setEditable(false);
-            updateButton.setVisible(false);
-        }
-    }
-    
-    /**
-     * Create the button for updating attributes.  This should be enabled for writable attribute
-     */
-    private Button addUpdateButton(Composite parent)
-    {
-        final Button updateButton = new Button(parent, SWT.PUSH | SWT.CENTER);
-        // set the data to access in the listener
-        parent.setData(BUTTON_UPDATE, updateButton);
-        
-        updateButton.setText(BUTTON_UPDATE);
-        GridData gridData = new GridData (SWT.CENTER, SWT.BOTTOM, true, true, 2, 1);
-        gridData.widthHint = 100;
-        updateButton.setLayoutData(gridData);
-        updateButton.addSelectionListener(new SelectionAdapter()
-            {
-                public void widgetSelected(SelectionEvent event)
-                {
-                    try
-                    {
-                        Button button = (Button)event.widget;
-                        Text text = (Text)button.getData();
-                        AttributeData data = (AttributeData)button.getParent().getData();
-                        MBeanUtility.updateAttribute(_mbean, data, text.getText());
-                        button.getShell().close();
-                        refresh();
-                    }
-                    catch (Exception ex)
-                    {
-                        MBeanUtility.handleException(_mbean, ex);
-                    }
-                }
-            });
-        
-        return updateButton;
-    }    
-
-    // Refresh from the server registry
-    public void refresh()
-    {
-        JMXServerRegistry serverRegistry = (JMXServerRegistry)ApplicationRegistry.getServerRegistry(_mbean);
-        ManagedAttributeModel attributesList = serverRegistry.getAttributeModel(_mbean);
-        _tableViewer.setInput(attributesList);
-    }
-    
-    /**
-     * Refreshes the attribute tab by querying the mbean server for latest values
-     */ 
-    @Override
-    public void refresh(ManagedBean mbean) 
-    {
-        _mbean = mbean;        
-        if (_mbean == null)
-        {
-            _tableViewer.setInput(null);
-            return;
-        }
-        ManagedAttributeModel attributesList = null;
-        try
-        {
-            attributesList = MBeanUtility.getAttributes(mbean);
-        }
-        catch(Exception ex)
-        {
-            MBeanUtility.handleException(_mbean, ex);
-        }
-        _tableViewer.setInput(attributesList);
-        checkForEnablingButtons(getSelectionAttribute());
-        
-        _form.layout(true);
-        _form.getBody().layout(true, true);
-    }
-    
-    /**
-     * @see TabControl#setFocus()
-     */
-    public void setFocus()
-    {
-        _table.setFocus();
-    }
-    
-    /**
-     * Checks which buttons are to be enabled or disabled. The graph button will be enabled only
-     * for readable number attributes.  Editing is enabled for writeable attribtues.
-     * @param attribute
-     */
-    private void checkForEnablingButtons(AttributeData attribute)
-    {
-        if (attribute == null)
-        {
-            _detailsButton.setEnabled(false);
-            _editButton.setEnabled(false);
-            _graphButton.setEnabled(false);
-            _refreshButton.setEnabled(false);
-            return;
-        }
-        
-        _detailsButton.setEnabled(true);
-        _refreshButton.setEnabled(true);
-        if (attribute.isWritable())
-        {
-            _editButton.setEnabled(true);
-            _graphButton.setEnabled(false);
-        }
-        else
-        {
-            _editButton.setEnabled(false);
-            // Currently only Queues are having attributes, which are suitable for a graph
-            if (attribute.isNumber() && _mbean.isQueue())
-            {
-                _graphButton.setEnabled(true);
-            }
-            else
-            {
-                _graphButton.setEnabled(false);
-            }
-        }
-    }
-    
-    /**
-     * Creates graph in a pop-up window for given attribute.
-     * @param data
-     */
-    private void createGraph(final AttributeData data)
-    {       
-        Display display = Display.getCurrent();        
-        Shell shell = new Shell(display, SWT.BORDER | SWT.CLOSE | SWT.MIN | SWT.MAX);
-        shell.setText(_mbean.getName());
-        int x = display.getBounds().width;
-        int y = display.getBounds().height;
-        shell.setBounds(x/4, y/4, GRAPH_WIDTH, GRAPH_HEIGHT);
-        shell.setLayout(new FillLayout());
-        
-        final Canvas canvas = new Canvas(shell, SWT.NONE);
-        long currentValue = Long.parseLong(data.getValue().toString());
-        long mValue = getGraphMaxValue(currentValue);
-        canvas.setData(MAX_VALUE, mValue); 
-        canvas.setData(GRAPH_VALUES, new long[] {0,0,0,0,0,currentValue});
-        
-        canvas.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WHITE));
-        canvas.addPaintListener(new PaintListener()
-            {
-                public void paintControl(PaintEvent event)
-                {
-                    Canvas canvas = (Canvas)event.widget;
-                    int maxX = canvas.getSize().x;
-                    int maxY = canvas.getSize().y;
-                    event.gc.fillRectangle(canvas.getBounds());
-                    event.gc.setForeground(Display.getCurrent().getSystemColor(SWT.COLOR_BLACK));
-                    event.gc.setLineWidth(4);
-                    
-                    Object canvasData = canvas.getData(MAX_VALUE);
-                    String str = canvasData.toString();
-                    long maxValue = Long.parseLong(str);
-                    // Set the graph dimensions
-                    event.gc.drawText("0", startX - 40, maxY - startY - 10);
-                    event.gc.drawText("" + maxValue/2, startX - 40, maxY/2);
-                    event.gc.drawText("" + maxValue, startX - 40, startY);
-                    
-                    // horizontal line
-                    event.gc.drawLine(startX, maxY - startY, maxX - 60, maxY - startY);
-                    // vertical line
-                    event.gc.drawLine(startX, maxY - startY, startX, startY);
-                    // set graph text
-                    event.gc.drawText(data.getName(), startX - 40, startY - 40);
-                    event.gc.drawText("25 sec", startX, maxY - startY + 10);
-                    event.gc.drawText("20 sec", startX + GRAPH_ITEM_GAP, maxY - startY + 10);
-                    event.gc.drawText("15 sec", startX + GRAPH_ITEM_GAP * 2, maxY - startY + 10);
-                    event.gc.drawText("10 sec", startX + GRAPH_ITEM_GAP * 3, maxY - startY + 10);
-                    event.gc.drawText(" 5 sec", startX + GRAPH_ITEM_GAP * 4, maxY - startY + 10);
-                    event.gc.drawText(" 0 sec", startX + GRAPH_ITEM_GAP * 5, maxY - startY + 10);
-                    
-                    // plot the graph now for values
-                    event.gc.setForeground(Display.getCurrent().getSystemColor(SWT.COLOR_BLUE));
-                    canvasData = canvas.getData(GRAPH_VALUES);
-                    long[] graphValues = (long[]) canvasData;
-                    for (int i = 0; i < graphValues.length; i++)
-                    {
-                        int x = startX + i * GRAPH_ITEM_GAP;
-                        int yTotalLength = (maxY - 2 * startY);
-                        float ratio = ((float)graphValues[i]/(float)maxValue);
-                        int itemlength = (int)(yTotalLength *  ratio);
-                        int y = maxY - startY - itemlength;
-                        event.gc.drawLine(x, maxY- startY, x, y);
-                        event.gc.drawText(String.valueOf(graphValues[i]), x, y - 20);
-                    }
-                }            
-            });
-        
-        shell.open();
-        
-        // Set up the timer for the animation
-        Runnable runnable = new Runnable()
-        {
-          public void run()
-          {
-            try
-            {
-                animate(canvas, data);
-                Display.getCurrent().timerExec(TIMER_INTERVAL, this);
-            }
-            catch(Exception ex)
-            {
-                MBeanUtility.handleException(ex);
-            }
-          }
-        };
-
-        // Launch the timer
-        display.timerExec(TIMER_INTERVAL, runnable);
-        
-        while (!shell.isDisposed())
-        {
-            if (!display.readAndDispatch())
-            {
-                display.sleep();
-            }
-        }
-        
-        // Kill the timer
-        display.timerExec(-1, runnable);
-        shell.dispose();
-    }
-    
-    /**
-     * @return selected attribute in the table
-     */
-    public AttributeData getSelectionAttribute()
-    {
-        int index = _table.getSelectionIndex();
-        if (index == -1)
-            return null;
-        
-        return (AttributeData)_table.getItem(index).getData();
-    }
-    
-    /**
-     * checks for newer values of selected attribute to update the graph
-     * @param canvas
-     * @param data
-     * @throws Exception
-     */
-    private void animate(Canvas canvas, AttributeData data) throws Exception
-    {
-        String attribute = data.getName();
-        Object valueObj = MBeanUtility.refreshAttribute(_mbean, attribute);
-        int value = Integer.parseInt(String.valueOf(valueObj));
-        Object canvasData = canvas.getData(GRAPH_VALUES);
-        long[] graphValues = (long[]) canvasData;
-        
-        for (int i = 0; i < graphValues.length -1; i++)
-        {
-            graphValues[i] = graphValues[i + 1];            
-        }
-        graphValues[graphValues.length - 1] = value;
-        
-        canvasData = canvas.getData(MAX_VALUE);
-        long maxValue = Long.parseLong(String.valueOf(canvasData));
-        if (maxValue < value)
-        {
-            maxValue = getGraphMaxValue(value);
-            canvas.setData(MAX_VALUE, maxValue);
-        }
-        
-        canvas.redraw();
-    }
-    
-    /**
-     * @param maxAttributeValue
-     * @return dynamically calculated value for y-axis on the graph
-     */
-    private long getGraphMaxValue(long maxAttributeValue)
-    {
-        long maxGraphValue = 100;
-        long temp = maxAttributeValue * 3/2;
-        if (temp > maxGraphValue)
-        {
-            long modulus = temp % 100;
-            maxGraphValue = temp + ( 100 - modulus);
-        } 
-        
-        return maxGraphValue;
-    }
-    
-    /**
-     * Content Provider class for the table viewer
-     * @author Bhupendra Bhardwaj
-     */
-    private class ContentProviderImpl  implements IStructuredContentProvider
-    {
-        
-        public void inputChanged(Viewer v, Object oldInput, Object newInput)
-        {
-            
-        }
-        
-        public void dispose()
-        {
-            
-        }
-        
-        public Object[] getElements(Object parent)
-        {
-            return ((ManagedAttributeModel)parent).getAttributes();
-        }
-    }
-    
-    /**
-     * Label Provider class for the table viewer
-     * @author Bhupendra Bhardwaj
-     */
-    private class LabelProviderImpl extends LabelProvider implements ITableLabelProvider, 
-                                                                     IFontProvider,
-                                                                     IColorProvider
-    {
-        AttributeData attribute = null;
-        public String getColumnText(Object element, int columnIndex)
-        {
-            String result = "";
-            attribute = (AttributeData) element;
-            
-            switch (columnIndex)
-            {
-                case 0 : // attribute name column 
-                    result = ViewUtility.getDisplayText(attribute.getName());
-                    break;
-                case 1 : // attribute value column 
-                    if (attribute.getValue() != null)
-                        result = String.valueOf(attribute.getValue());
-                    break;
-                default :
-                    result = "";
-            }
-            
-            return result;
-        }
-        
-        public Image getColumnImage(Object element, int columnIndex)
-        {
-            return null;
-        }
-        
-        public Font getFont(Object element)
-        {
-            return ApplicationRegistry.getFont(FONT_TABLE_CELL);
-        }
-        
-        public Color getForeground(Object element)
-        {
-            attribute = (AttributeData) element;
-            if (attribute.isWritable())
-                return Display.getCurrent().getSystemColor(SWT.COLOR_DARK_BLUE);
-            else
-                return Display.getCurrent().getSystemColor(SWT.COLOR_BLACK);
-        }
-        public Color getBackground(Object element)
-        {
-            return _form.getBackground();
-        }
-    }
-    
-    private class DisposeListenerImpl implements DisposeListener
-    {
-        public void widgetDisposed(DisposeEvent e)
-        {
-            
-        }
-    }
-
-    /**
-     * Sorter class for the table viewer. It sorts the table for according to attribute name.
-     * @author Bhupendra Bhardwaj
-     *
-     */
-    private class ViewerSorterImpl extends ViewerSorter
-    {
-        public int compare(Viewer viewer, Object o1, Object o2) 
-        {
-            AttributeData attribtue1 = (AttributeData)o1;
-            AttributeData attribtue2 = (AttributeData)o2;
-            
-            return collator.compare(attribtue1.getName(), attribtue2.getName());
-        }
-    }
-}
\ No newline at end of file
diff --git a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/ConnectionTypeTabControl.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/ConnectionTypeTabControl.java
deleted file mode 100644
index d891a45210..0000000000
--- a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/ConnectionTypeTabControl.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-package org.apache.qpid.management.ui.views;
-
-import org.apache.qpid.management.ui.ApplicationRegistry;
-import org.apache.qpid.management.ui.Constants;
-import org.apache.qpid.management.ui.ManagedBean;
-import org.apache.qpid.management.ui.ServerRegistry;
-import org.eclipse.swt.widgets.TabFolder;
-
-/**
- * Controller class, which takes care of displaying appropriate information and widgets for Connections.
- * This allows user to select Connections and add those to the navigation view
- */
-public class ConnectionTypeTabControl extends MBeanTypeTabControl
-{
-
-    public ConnectionTypeTabControl(TabFolder tabFolder)
-    {
-        super(tabFolder, Constants.CONNECTION);
-        createWidgets();
-    }
-    
-    protected void createWidgets()
-    {
-        createHeaderComposite(getFormComposite());
-        createButtonsComposite(getFormComposite());
-        createListComposite(getFormComposite());
-    }
-    
-    protected void populateList() throws Exception
-    {
-        // map should be cleared before populating it with new values
-        getMBeansMap().clear();
-        
-        ServerRegistry serverRegistry = ApplicationRegistry.getServerRegistry(MBeanView.getServer());
-        java.util.List<ManagedBean> list = serverRegistry.getConnections(MBeanView.getVirtualHost());
-        getListWidget().setItems(getItems(list));  
-    }
-}
diff --git a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/ExchangeTypeTabControl.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/ExchangeTypeTabControl.java
deleted file mode 100644
index ee55b251ee..0000000000
--- a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/ExchangeTypeTabControl.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-package org.apache.qpid.management.ui.views;
-
-import org.apache.qpid.management.ui.ApplicationRegistry;
-import org.apache.qpid.management.ui.Constants;
-import org.apache.qpid.management.ui.ManagedBean;
-import org.apache.qpid.management.ui.ServerRegistry;
-import org.eclipse.swt.widgets.TabFolder;
-
-/**
- * Controller class, which takes care of displaying appropriate information and widgets for Exchanges.
- * This allows user to select Exchanges and add those to the navigation view
- * @author Bhupendra Bhardwaj
- */
-public class ExchangeTypeTabControl extends MBeanTypeTabControl
-{
-
-    public ExchangeTypeTabControl(TabFolder tabFolder)
-    {
-        super(tabFolder, Constants.EXCHANGE);
-        createWidgets();
-    }
-    
-    protected void createWidgets()
-    {   
-        createHeaderComposite(getFormComposite());
-        createButtonsComposite(getFormComposite());
-        createListComposite(getFormComposite());
-    }
-    
-    protected void populateList() throws Exception
-    {
-        // map should be cleared before populating it with new values
-        getMBeansMap().clear();
-        
-        ServerRegistry serverRegistry = ApplicationRegistry.getServerRegistry(MBeanView.getServer());
-        java.util.List<ManagedBean> list = serverRegistry.getExchanges(MBeanView.getVirtualHost());
-        getListWidget().setItems(getItems(list));         
-    }
-}
diff --git a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/INotificationViewer.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/INotificationViewer.java
deleted file mode 100644
index bc560b6064..0000000000
--- a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/INotificationViewer.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.management.ui.views;
-
-import java.util.List;
-
-import org.apache.qpid.management.ui.model.NotificationObject;
-
-public interface INotificationViewer
-{
-    public void addNotification(NotificationObject notification);
-    
-    public void addNotification(List<NotificationObject> notificationList);
-}
diff --git a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/MBeanTypeTabControl.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/MBeanTypeTabControl.java
deleted file mode 100644
index 24dfb519fd..0000000000
--- a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/MBeanTypeTabControl.java
+++ /dev/null
@@ -1,336 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-package org.apache.qpid.management.ui.views;
-
-import static org.apache.qpid.management.ui.Constants.BUTTON_REFRESH;
-import static org.apache.qpid.management.ui.Constants.FONT_BOLD;
-import static org.apache.qpid.management.ui.Constants.FONT_ITALIC;
-import static org.apache.qpid.management.ui.Constants.FONT_NORMAL;
-
-import java.util.Collections;
-import java.util.HashMap;
-
-import org.apache.qpid.management.ui.ApplicationRegistry;
-import org.apache.qpid.management.ui.ManagedBean;
-import org.apache.qpid.management.ui.jmx.MBeanUtility;
-import org.apache.qpid.management.ui.model.AttributeData;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.List;
-import org.eclipse.swt.widgets.TabFolder;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.forms.widgets.Form;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- * Abstract class to be extended by the Controller classes for different MBean types (Connection, Queue, Exchange)
- */
-public abstract class MBeanTypeTabControl
-{
-    private FormToolkit  _toolkit = null;
-    private Form _form = null;
-    private TabFolder _tabFolder = null;
-    private Composite _composite = null;
-    private Composite _headerComposite = null;
-    private Composite _listComposite = null;
-    private Label _labelName = null;
-    private Label _labelDesc = null;
-    private Label _labelList = null;
-    
-    private org.eclipse.swt.widgets.List _list = null;
-    private Button _refreshButton = null;
-    private Button _addButton = null;
-    
-    private String _type = null;
-    
-    // maps an mbean name with the mbean object. Required to get mbean object when an mbean
-    // is to be added to the navigation view. 
-    private HashMap<String, ManagedBean> _objectsMap = new HashMap<String, ManagedBean>();
-    private Sorter _sorterByName = new Sorter();
-    
-    public MBeanTypeTabControl(TabFolder tabFolder, String type)
-    {
-        _type = type;
-        _tabFolder = tabFolder;
-        _toolkit = new FormToolkit(_tabFolder.getDisplay());
-        _form = _toolkit.createForm(_tabFolder);
-        createFormComposite();
-    }
-    
-    public FormToolkit getToolkit()
-    {
-        return _toolkit;
-    }
-    
-    public Control getControl()
-    {
-        return _form;
-    }
-    
-    public String getType()
-    {
-        return _type;
-    }
-    
-    protected List getListWidget()
-    {
-        return _list;
-    }
-    
-    protected HashMap<String, ManagedBean> getMBeansMap()
-    {
-        return _objectsMap;
-    }
-    
-    public Sorter getMBeanNameSorter()
-    {
-        return _sorterByName;
-    }
-    
-    public Button getAddButton()
-    {
-        return _addButton;
-    }
-    
-    public Button getRefreshButton()
-    {
-        return _refreshButton;
-    }
-        
-    /**
-     * Creates the main Composite, which will contain all other Composites and Widgets
-     */
-    protected void createFormComposite()
-    {
-        _form.getBody().setLayout(new GridLayout());
-        _composite = _toolkit.createComposite(_form.getBody(), SWT.NONE);
-        _composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
-        GridLayout layout = new GridLayout();
-        layout.verticalSpacing = 10;
-        layout.horizontalSpacing = 0;
-        _composite.setLayout(layout);
-    }
-    
-    protected Composite getFormComposite()
-    {
-        return _composite;
-    }
-    
-    /**
-     * Creates the header composite, which has MBean type name and description
-     * @param parentComposite
-     */
-    protected void createHeaderComposite(Composite parentComposite)
-    {
-        _headerComposite = _toolkit.createComposite(parentComposite);
-        _headerComposite.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false));
-        GridLayout layout = new GridLayout();
-        layout.verticalSpacing = 10;
-        layout.horizontalSpacing = 0;
-        _headerComposite.setLayout(layout);
-        
-        _labelName = _toolkit.createLabel(_headerComposite, "Type:", SWT.NONE);
-        GridData gridData = new GridData(SWT.CENTER, SWT.TOP, true, false);
-        _labelName.setLayoutData(gridData);
-        _labelName.setFont(ApplicationRegistry.getFont(FONT_BOLD));
-        
-        _labelDesc = _toolkit.createLabel(_headerComposite, " ", SWT.NONE);
-        _labelDesc.setLayoutData(new GridData(SWT.CENTER, SWT.TOP, true, false));
-        _labelDesc.setFont(ApplicationRegistry.getFont(FONT_ITALIC));
-        
-        _headerComposite.layout();
-    }
-    
-    /**
-     * Creates Composite, which contains the common buttons - Add and Refresh.
-     * @param parentComposite
-     */
-    protected void createButtonsComposite(Composite parentComposite)
-    {
-        Composite composite = _toolkit.createComposite(parentComposite);
-        composite.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false));
-        GridLayout layout = new GridLayout(2, true);
-        layout.verticalSpacing = 10;
-        layout.horizontalSpacing = 20;
-        composite.setLayout(layout);
-        
-        createAddButton(composite);
-        createRefreshButton(composite);
-    }
-    
-    /**
-     * Creates the Add button, which adds the selected item to the navigation view
-     * @param parentComposite
-     */
-    protected void createAddButton(Composite parentComposite)
-    {
-        Button _addButton = _toolkit.createButton(parentComposite, "<- Add to Navigation", SWT.PUSH);
-        GridData gridData = new GridData(SWT.CENTER, SWT.CENTER, false, false);
-        _addButton.setLayoutData(gridData);
-        _addButton.addSelectionListener(new SelectionAdapter(){
-            public void widgetSelected(SelectionEvent e)
-            {
-                if (_list.getSelectionCount() == 0)
-                    return;
-                
-                String[] selectedItems = _list.getSelection();
-                for (int i = 0; i < selectedItems.length; i++)
-                {
-                    String name = selectedItems[i];
-                    // pass the ManagedBean to the navigation view to be added
-                    ManagedBean mbean = _objectsMap.get(name);
-                    IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow(); 
-                    NavigationView view = (NavigationView)window.getActivePage().findView(NavigationView.ID);
-                    try
-                    {
-                        view.addManagedBean(mbean);
-                    }
-                    catch (Exception ex)
-                    {
-                        MBeanUtility.handleException(mbean, ex);
-                    }
-                }
-            }
-        });
-    }
-    
-    /**
-     * Creates the Refresh button, which gets syncs the items with the broker server
-     * @param parentComposite
-     */
-    protected void createRefreshButton(Composite parentComposite)
-    {
-        Button _refreshButton = _toolkit.createButton(parentComposite, BUTTON_REFRESH, SWT.PUSH);
-        GridData gridData = new GridData(SWT.CENTER, SWT.CENTER, false, false);
-        gridData.widthHint = 120;
-        _refreshButton.setLayoutData(gridData);
-        _refreshButton.addSelectionListener(new SelectionAdapter(){
-            public void widgetSelected(SelectionEvent e)
-            {
-                try
-                {
-                    // refresh the list from the broker server
-                    populateList();
-                }
-                catch (Exception ex)
-                {
-                    MBeanUtility.handleException(ex);
-                }
-            }
-        });
-    }
-    
-    /**
-     * Creates the Composite, which contains the items ( Connections, Exchanges or Queues)
-     * @param parentComposite
-     */
-    protected void createListComposite(Composite parentComposite)
-    {
-        // Composite to contain the item list 
-        _listComposite = _toolkit.createComposite(parentComposite);
-        GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
-        _listComposite.setLayoutData(gridData);
-        GridLayout layout = new GridLayout();
-        layout.verticalSpacing = 0;
-        _listComposite.setLayout(layout);
-        
-        // Label for item name
-        _labelList = _toolkit.createLabel(_listComposite, " ", SWT.CENTER);
-        gridData = new GridData(SWT.CENTER, SWT.TOP, true, false, 1, 1);
-        _labelList.setLayoutData(gridData);
-        _labelList.setFont(ApplicationRegistry.getFont(FONT_NORMAL));
-        
-        _list = new List(_listComposite, SWT.MULTI | SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL);
-        gridData = new GridData(SWT.FILL, SWT.FILL, true, true,1, 1);
-        _list.setLayoutData(gridData);
-        
-    }
-    
-    /**
-     * This is called from MBean View to refresh the tab contents
-     * @throws Exception
-     */
-    public void refresh() throws Exception
-    {        
-        setLabelValues();
-        populateList();
-        layout();
-    }
-    
-    protected void setLabelValues()
-    {
-        _labelName.setText("Type : " + _type);        
-        _labelDesc.setText("Select the " + _type + "(s) to add in the Navigation View");
-        _labelList.setText("-- List of " + _type + "s --");
-    }
-    
-    protected abstract void populateList() throws Exception;
-    
-    public void layout()
-    {
-        _form.layout(true);
-        _form.getBody().layout(true, true);
-    }
-    
-    // sets the map with appropriate mbean and name
-    protected String[] getItems(java.util.List<ManagedBean> list)
-    {
-        if (list == null)
-            return new String[0];
-        
-        Collections.sort(list, _sorterByName);
-        String[] items = new String[list.size()];
-        int i = 0;
-        for (ManagedBean mbean : list)
-        {
-            items[i++] = mbean.getName();
-            _objectsMap.put(mbean.getName(), mbean);
-        }
-        return items;
-    }
-    
-    protected class ComparatorImpl implements java.util.Comparator<AttributeData>
-    {
-        public int compare(AttributeData data1, AttributeData data2)
-        {
-            Integer int1 = Integer.parseInt(data1.getValue().toString());
-            Integer int2 = Integer.parseInt(data2.getValue().toString());
-            return int1.compareTo(int2) * -1;
-        }
-    }
-    
-    protected class Sorter implements java.util.Comparator<ManagedBean>
-    {
-        public int compare(ManagedBean mbean1, ManagedBean mbean2)
-        {
-            return mbean1.getName().compareTo(mbean2.getName());
-        }
-    }
-}
diff --git a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/MBeanView.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/MBeanView.java
deleted file mode 100644
index 344c3c4e7f..0000000000
--- a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/MBeanView.java
+++ /dev/null
@@ -1,545 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.management.ui.views;
-
-import java.util.HashMap;
-
-import static org.apache.qpid.management.ui.Constants.*;
-import org.apache.qpid.management.ui.ApplicationRegistry;
-import org.apache.qpid.management.ui.ManagedBean;
-import org.apache.qpid.management.ui.ManagedServer;
-import org.apache.qpid.management.ui.ServerRegistry;
-import org.apache.qpid.management.ui.exceptions.InfoRequiredException;
-import org.apache.qpid.management.ui.jmx.MBeanUtility;
-import org.apache.qpid.management.ui.model.AttributeData;
-import org.apache.qpid.management.ui.model.OperationData;
-import org.apache.qpid.management.ui.model.OperationDataModel;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.FormAttachment;
-import org.eclipse.swt.layout.FormData;
-import org.eclipse.swt.layout.FormLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.TabFolder;
-import org.eclipse.swt.widgets.TabItem;
-import org.eclipse.ui.ISelectionListener;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.forms.widgets.Form;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.part.ViewPart;
-
-/**
- * MBean View create appropriate view based on the user selection on the Navigation View.
- * Create TabFolder for all MBeans and displays the attribtues and method tabs.
- * @author Bhupendra Bhardwaj
- *
- */
-public class MBeanView extends ViewPart
-{
-    public static final String ID = "org.apache.qpid.management.ui.mbeanView";
-    private static final String CONTROLLER = "CONTROLLER";
-    
-    private FormToolkit  _toolkit = null;
-    private Form _form = null;
-    private String _formText = APPLICATION_NAME;
-    private static ManagedServer _server = null;
-    private TreeObject _selectedNode = null;
-    private ManagedBean _mbean = null;
-    private static String _virtualHostName = null;
-    // This map contains a TabFolder for each kind of MBean.
-    // TabFolder is mapped with mbeantype(Connection, Queue and Exchange)
-    private HashMap<String, TabFolder> tabFolderMap = new HashMap<String, TabFolder>();
-    private ISelectionListener selectionListener = new SelectionListenerImpl();
-
-    // TabFolder to list all the mbeans for a given mbeantype(eg Connection, Queue, Exchange)
-    private TabFolder typeTabFolder = null;
-    
-    private TabFolder notificationTabFolder = null;
-    /*
-     * Listener for the selection events in the navigation view
-     */ 
-    private class SelectionListenerImpl implements ISelectionListener
-    {
-        public void selectionChanged(IWorkbenchPart part, ISelection sel)
-        {
-            if (!(sel instanceof IStructuredSelection))
-                return;
-
-            IStructuredSelection ss = (IStructuredSelection) sel;
-            _selectedNode = (TreeObject)ss.getFirstElement();
-            
-            
-            // mbean should be set to null. A selection done on the navigation view can be either an mbean or
-            // an mbeantype. For mbeantype selection(eg Connection, Queue, Exchange) _mbean will remain null.
-            _mbean = null;
-            setInvisible();
-            
-            // If a selected node(mbean) gets unregistered from mbean server, mbeanview should 
-            // make the tabfolber for that mbean invisible
-            if (_selectedNode == null)            
-                return;
-            
-            setServer();
-            refreshMBeanView();
-            setFormTitle();            
-        }
-    }
-    
-    private void setFormTitle()
-    {
-        if (_mbean != null)
-        {
-            _formText = _mbean.getType();
-            if ((_mbean.getVirtualHostName() != null) && (!DEFAULT_VH.equals(_mbean.getVirtualHostName())) )
-            {
-                _formText = _formText.replaceFirst(VIRTUAL_HOST, _mbean.getVirtualHostName());
-                if (_mbean.getName() != null && _mbean.getName().length() != 0)
-                {
-                    _formText = _formText + ": " + _mbean.getName();
-                }
-            }
-        }
-        else if ((_selectedNode.getVirtualHost() != null) && (!DEFAULT_VH.equals(_selectedNode.getVirtualHost())))
-        {
-            _formText = _selectedNode.getVirtualHost();
-        }
-        else
-        {
-            _formText = APPLICATION_NAME;
-        }
-        _form.setText(_formText);
-    }
-    
-    public void refreshMBeanView()
-    {
-        try
-        {
-            if (NODE_TYPE_SERVER.equals(_selectedNode.getType()) ||
-                NODE_TYPE_DOMAIN.equals(_selectedNode.getType()) )
-            {
-                return;
-            }
-            else if (NODE_TYPE_TYPEINSTANCE.equals(_selectedNode.getType()))
-            {
-                // An virtual host instance is selected
-                refreshTypeTabFolder(typeTabFolder.getItem(0));
-            }
-            else if (NODE_TYPE_MBEANTYPE.equals(_selectedNode.getType()))
-            {
-                refreshTypeTabFolder(_selectedNode.getName());
-            } 
-            else if (NOTIFICATIONS.equals(_selectedNode.getType()))
-            {
-                refreshNotificationPage();
-            }
-            else if (MBEAN.equals(_selectedNode.getType()))
-            {
-                _mbean = (ManagedBean)_selectedNode.getManagedObject(); 
-                showSelectedMBean();
-            }
-            
-            _form.layout(true);
-            _form.getBody().layout(true, true);
-        }
-        catch(Exception ex)
-        {
-            MBeanUtility.handleException(_mbean, ex);
-        }
-    }
-
-    /**
-     * Sets the managedServer based on the selection in the navigation view
-     * At any given time MBeanView will be displaying information for an mbean of mbeantype
-     * for a specifiv managed server. This server information will be used by the tab controllers
-     * to get server registry.
-     */
-    private void setServer()
-    {
-        if (NODE_TYPE_SERVER.equals(_selectedNode.getType()) ||
-            NODE_TYPE_DOMAIN.equals(_selectedNode.getType()) )
-        {
-            _server = (ManagedServer)_selectedNode.getManagedObject();
-            _virtualHostName = null;
-        }
-        else
-        {
-            TreeObject parent = _selectedNode.getParent();
-            while (parent != null && !parent.getType().equals(NODE_TYPE_SERVER))
-            {
-                parent = parent.getParent();
-            }
-            
-            if (parent != null && parent.getType().equals(NODE_TYPE_SERVER))
-                _server = (ManagedServer)parent.getManagedObject();
-            
-            _virtualHostName = _selectedNode.getVirtualHost();
-        }
-    }
-    
-    public static ManagedServer getServer()
-    {
-        return _server;
-    }
-    
-    public static String getVirtualHost()
-    {
-        return _virtualHostName;
-    }
-    
-    private void showSelectedMBean() throws Exception
-    {           
-        try
-        {                
-            MBeanUtility.getMBeanInfo(_mbean);     
-        }
-        catch(Exception ex)
-        {
-            MBeanUtility.handleException(_mbean, ex);
-            return;
-        }
-
-        TabFolder tabFolder = tabFolderMap.get(_mbean.getType());
-        /*
-         * This solution can be used if there are many versions of Qpid running. Otherwise
-         * there is no need to create a tabFolder everytime a bean is selected.
-        if (tabFolder != null && !tabFolder.isDisposed())
-        {
-            tabFolder.dispose();
-        }
-        tabFolder = createTabFolder();
-        */
-        if (tabFolder == null)
-        {
-            tabFolder = createMBeanTabFolder();
-        }
-        
-        int tabIndex = 0;
-        if (NOTIFICATIONS.equals(_selectedNode.getType()))
-        {
-            tabIndex = tabFolder.getItemCount() -1;
-        }
-       
-        TabItem tab = tabFolder.getItem(tabIndex);
-        // If folder is being set as visible after tab refresh, then the tab 
-        // doesn't have the focus.                  
-        tabFolder.setSelection(tabIndex);
-        refreshTab(tab);
-        setVisible(tabFolder); 
-    }
-    
-    public void createPartControl(Composite parent)
-    {
-        // Create the Form
-        _toolkit = new FormToolkit(parent.getDisplay());
-        _form = _toolkit.createForm(parent);
-        _form.getBody().setLayout(new FormLayout());
-        _form.setText(APPLICATION_NAME);
-        
-        // Add selection listener for selection events in the Navigation view
-        getSite().getPage().addSelectionListener(NavigationView.ID, selectionListener); 
-        
-        // Add mbeantype TabFolder. This will list all the mbeans under a mbeantype (eg Queue, Exchange).
-        // Using this list mbeans will be added in the navigation view
-        createMBeanTypeTabFolder();
-        
-        createNotificationsTabFolder();
-    }
-    
-    private TabFolder createMBeanTabFolder()
-    {
-        TabFolder tabFolder = new TabFolder(_form.getBody(), SWT.NONE);
-        FormData layoutData = new FormData();
-        layoutData.left = new FormAttachment(0);
-        layoutData.top = new FormAttachment(0);
-        layoutData.right = new FormAttachment(100);
-        layoutData.bottom = new FormAttachment(100);
-        tabFolder.setLayoutData(layoutData);
-        tabFolder.setVisible(false);
-        
-        createAttributesTab(tabFolder);
-        createOperationTabs(tabFolder);
-        createNotificationsTab(tabFolder);
-        
-        tabFolder.addListener(SWT.Selection, new Listener()
-        {
-            public void handleEvent(Event evt)
-            {
-                TabItem tab = (TabItem)evt.item;        
-                refreshTab(tab);
-            }
-        });
-        
-        tabFolderMap.put(_mbean.getType(), tabFolder);
-        return tabFolder;
-    }
-    
-    private void refreshTab(TabItem tab)
-    {
-        // We can avoid refreshing the attributes tab because it's control
-        // already contains the required values. But it is added for now and 
-        // will remove if there is any performance issue or any other issue.
-        // The operations control should be refreshed because there is only one
-        // controller for all operations tab.
-        // The Notifications control needs to refresh with latest set of notifications
-        
-        if (tab == null)
-            return;
-        
-        TabControl controller = (TabControl)tab.getData(CONTROLLER);
-        controller.refresh(_mbean);
-    }
-    
-    public void setFocus()
-    {   
-        //_form.setFocus();
-    }
-
-    public void dispose()
-    {
-        _toolkit.dispose();
-        super.dispose();
-    }
-    
-    private void createAttributesTab(TabFolder tabFolder)
-    {
-        ServerRegistry serverRegistry = ApplicationRegistry.getServerRegistry(_mbean);
-        if (serverRegistry.getAttributeModel(_mbean).getCount() == 0)
-        {
-            return;
-        }
-        
-        TabItem tab = new TabItem(tabFolder, SWT.NONE);
-        tab.setText(ATTRIBUTES);
-        AttributesTabControl controller = new AttributesTabControl(tabFolder);
-        tab.setControl(controller.getControl());
-        tab.setData(CONTROLLER, controller);
-    }
-    
-    private void createOperationTabs(TabFolder tabFolder)
-    {
-        ServerRegistry serverRegistry = ApplicationRegistry.getServerRegistry(_mbean);        
-        int operationsCount = serverRegistry.getOperationModel(_mbean).getCount();
-        if (operationsCount == 0)
-        {
-            return;
-        }
-        
-        OperationDataModel operationModel = serverRegistry.getOperationModel(_mbean);
-        for (OperationData operationData : operationModel.getOperations())
-        {
-            TabItem operationTab = new TabItem(tabFolder, SWT.NONE);
-            operationTab.setText(ViewUtility.getDisplayText(operationData.getName()));
-            operationTab.setData(operationData);
-            OperationTabControl control = new OperationTabControl(tabFolder, operationData);
-            operationTab.setData(CONTROLLER, control);
-            operationTab.setControl(control.getControl());
-        }
-    }
-    
-    private void createNotificationsTab(TabFolder tabFolder)
-    {
-        NotificationsTabControl controller = new NotificationsTabControl(tabFolder);
-        
-        TabItem tab = new TabItem(tabFolder, SWT.NONE);
-        tab.setText(NOTIFICATIONS);
-        tab.setData(CONTROLLER, controller);
-        tab.setControl(controller.getControl());
-    }
-    
-    /**
-     * For the EditAttribtue Action. Invoking this from action is same as clicking
-     * "EditAttribute" button from Attribute tab.
-     */
-    public void editAttribute() throws Exception
-    {
-       if (_mbean == null)
-           throw new InfoRequiredException("Please select the managed object and then attribute to be edited");
-       
-       String name = (_mbean.getName() != null) ? _mbean.getName() : _mbean.getType();
-       ServerRegistry serverRegistry = ApplicationRegistry.getServerRegistry(_mbean);
-       if (serverRegistry.getAttributeModel(_mbean).getCount() == 0)
-       {
-           throw new InfoRequiredException("There are no attributes to be edited for " + name);
-       }
-       
-       TabFolder tabFolder = tabFolderMap.get(_mbean.getType());
-       int index = tabFolder.getSelectionIndex();
-       if (index != 0)
-       {
-           tabFolder.setSelection(0);
-           throw new InfoRequiredException("Please select the attribute to be edited");
-       }
-       
-       TabItem tab = tabFolder.getItem(0);
-       AttributesTabControl tabControl = (AttributesTabControl)tab.getData(CONTROLLER);
-       AttributeData attribute = tabControl.getSelectionAttribute();
-       if (attribute == null)
-           throw new InfoRequiredException("Please select the attribute to be edited");
-       
-       tabControl.createDetailsPopup(attribute);
-    }
-    
-    /**
-     * Creates TabFolder and tabs for each mbeantype (eg Connection, Queue, Exchange)
-     */
-    private void createMBeanTypeTabFolder()
-    {
-        typeTabFolder = new TabFolder(_form.getBody(), SWT.NONE);
-        FormData layoutData = new FormData();
-        layoutData.left = new FormAttachment(0);
-        layoutData.top = new FormAttachment(0);
-        layoutData.right = new FormAttachment(100);
-        layoutData.bottom = new FormAttachment(100);
-        typeTabFolder.setLayoutData(layoutData);
-        typeTabFolder.setVisible(false);
-              
-        TabItem tab = new TabItem(typeTabFolder, SWT.NONE);
-        tab.setText(CONNECTION); 
-        MBeanTypeTabControl controller = new ConnectionTypeTabControl(typeTabFolder);
-        tab.setData(CONTROLLER, controller);
-        tab.setControl(controller.getControl());
-        
-        tab = new TabItem(typeTabFolder, SWT.NONE);
-        tab.setText(EXCHANGE);      
-        controller = new ExchangeTypeTabControl(typeTabFolder);
-        tab.setData(CONTROLLER, controller);
-        tab.setControl(controller.getControl());
-        
-        tab = new TabItem(typeTabFolder, SWT.NONE);
-        tab.setText(QUEUE);  
-        controller = new QueueTypeTabControl(typeTabFolder);
-        tab.setData(CONTROLLER, controller);
-        tab.setControl(controller.getControl());
-        
-        typeTabFolder.addListener(SWT.Selection, new Listener()
-        {
-            public void handleEvent(Event evt)
-            {
-                TabItem tab = (TabItem)evt.item;     
-                try
-                {
-                    refreshTypeTabFolder(tab);
-                }
-                catch (Exception ex)
-                {
-                    MBeanUtility.handleException(ex);
-                }
-            }
-        });
-    }
-    
-    private void createNotificationsTabFolder()
-    {
-        notificationTabFolder = new TabFolder(_form.getBody(), SWT.NONE);
-        FormData layoutData = new FormData();
-        layoutData.left = new FormAttachment(0);
-        layoutData.top = new FormAttachment(0);
-        layoutData.right = new FormAttachment(100);
-        layoutData.bottom = new FormAttachment(100);
-        notificationTabFolder.setLayoutData(layoutData);
-        notificationTabFolder.setVisible(false);
-        
-        VHNotificationsTabControl controller = new VHNotificationsTabControl(notificationTabFolder);       
-        TabItem tab = new TabItem(notificationTabFolder, SWT.NONE);
-        tab.setText(NOTIFICATIONS);
-        tab.setData(CONTROLLER, controller);
-        tab.setControl(controller.getControl());
-    }
-    
-    private void refreshNotificationPage()
-    {        
-        TabItem tab = notificationTabFolder.getItem(0);
-        VHNotificationsTabControl controller = (VHNotificationsTabControl)tab.getData(CONTROLLER);
-        controller.refresh();
-        notificationTabFolder.setVisible(true);
-    }
-    
-    /**
-     * Refreshes the Selected mbeantype tab. The control lists all the available mbeans
-     * for an mbeantype(eg Queue, Exchange etc)
-     * @param tab
-     * @throws Exception
-     */
-    private void refreshTypeTabFolder(TabItem tab) throws Exception
-    {
-        if (tab == null)
-        {
-            return;
-        }
-        typeTabFolder.setSelection(tab);
-        MBeanTypeTabControl controller = (MBeanTypeTabControl)tab.getData(CONTROLLER);
-        controller.refresh();
-        typeTabFolder.setVisible(true);
-    }
-    
-    private void refreshTypeTabFolder(String type) throws Exception
-    {
-        if (CONNECTION.equals(type))
-        {
-            refreshTypeTabFolder(typeTabFolder.getItem(0));
-        }
-        else if (EXCHANGE.equals(type))
-        {
-            refreshTypeTabFolder(typeTabFolder.getItem(1));
-        }
-        else if (QUEUE.equals(type))
-        {
-            refreshTypeTabFolder(typeTabFolder.getItem(2));
-        }
-    }
-    
-    /**
-     * hides other folders and makes the given one visible.
-     * @param tabFolder
-     */
-    private void setVisible(TabFolder tabFolder)
-    {
-        for (TabFolder folder : tabFolderMap.values())
-        {
-            if (folder == tabFolder)
-                folder.setVisible(true);
-            else
-                folder.setVisible(false);
-        }
-    }
-    
-    private void setInvisible()
-    {
-        for (TabFolder folder : tabFolderMap.values())
-        {
-            folder.setVisible(false);
-        }
-        
-        if (typeTabFolder != null)
-        {
-            typeTabFolder.setVisible(false);
-        }
-        
-        if (notificationTabFolder != null)
-        {
-            notificationTabFolder.setVisible(false);
-        }
-    }
-    
-}
diff --git a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NavigationView.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NavigationView.java
deleted file mode 100644
index 1da13a9b56..0000000000
--- a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NavigationView.java
+++ /dev/null
@@ -1,1253 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.management.ui.views;
-
-import static org.apache.qpid.management.ui.Constants.*;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
-import org.apache.qpid.management.ui.ApplicationRegistry;
-import org.apache.qpid.management.ui.ManagedBean;
-import org.apache.qpid.management.ui.ManagedServer;
-import org.apache.qpid.management.ui.ServerRegistry;
-import org.apache.qpid.management.ui.exceptions.InfoRequiredException;
-import org.apache.qpid.management.ui.jmx.JMXServerRegistry;
-import org.apache.qpid.management.ui.jmx.MBeanUtility;
-import org.eclipse.jface.preference.PreferenceStore;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
-import org.eclipse.jface.viewers.IFontProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.ITreeViewerListener;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TreeExpansionEvent;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerSorter;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.MenuItem;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.swt.widgets.TreeItem;
-import org.eclipse.ui.part.ViewPart;
-
-/**
- * Navigation View for navigating the managed servers and managed beans on
- * those servers
- * @author Bhupendra Bhardwaj
- */
-public class NavigationView extends ViewPart
-{
-    public static final String ID = "org.apache.qpid.management.ui.navigationView";
-    public static final String INI_FILENAME = System.getProperty("user.home") + File.separator + "qpidManagementConsole.ini";
-
-    private static final String INI_SERVERS = "Servers";
-    private static final String INI_QUEUES = QUEUE + "s";
-    private static final String INI_CONNECTIONS = CONNECTION + "s";
-    private static final String INI_EXCHANGES = EXCHANGE + "s";
-
-    private TreeViewer _treeViewer = null;
-    private TreeObject _rootNode = null;
-    private TreeObject _serversRootNode = null;
-
-    private PreferenceStore _preferences;
-    // Map of connected servers
-    private HashMap<ManagedServer, TreeObject> _managedServerMap = new HashMap<ManagedServer, TreeObject>();
-
-    private void createTreeViewer(Composite parent)
-    {
-        _treeViewer = new TreeViewer(parent);
-        _treeViewer.setContentProvider(new ContentProviderImpl());
-        _treeViewer.setLabelProvider(new LabelProviderImpl());
-        _treeViewer.setSorter(new ViewerSorterImpl());
-
-        // layout the tree viewer below the label field, to cover the area
-        GridData layoutData = new GridData();
-        layoutData = new GridData();
-        layoutData.grabExcessHorizontalSpace = true;
-        layoutData.grabExcessVerticalSpace = true;
-        layoutData.horizontalAlignment = GridData.FILL;
-        layoutData.verticalAlignment = GridData.FILL;
-        _treeViewer.getControl().setLayoutData(layoutData);
-        _treeViewer.setUseHashlookup(true);
-
-        createListeners();
-    }
-
-    /**
-     * Creates listeners for the JFace treeviewer
-     */
-    private void createListeners()
-    {
-        _treeViewer.addDoubleClickListener(new IDoubleClickListener()
-            {
-                public void doubleClick(DoubleClickEvent event)
-                {
-                    IStructuredSelection ss = (IStructuredSelection) event.getSelection();
-                    if ((ss == null) || (ss.getFirstElement() == null))
-                    {
-                        return;
-                    }
-
-                    boolean state = _treeViewer.getExpandedState(ss.getFirstElement());
-                    _treeViewer.setExpandedState(ss.getFirstElement(), !state);
-                }
-            });
-
-        _treeViewer.addTreeListener(new ITreeViewerListener()
-            {
-                public void treeExpanded(TreeExpansionEvent event)
-                {
-                    _treeViewer.setExpandedState(event.getElement(), true);
-                    // Following will cause the selection event to be sent, so commented
-                    // _treeViewer.setSelection(new StructuredSelection(event.getElement()));
-                    _treeViewer.refresh();
-                }
-
-                public void treeCollapsed(TreeExpansionEvent event)
-                {
-                    _treeViewer.setExpandedState(event.getElement(), false);
-                    _treeViewer.refresh();
-                }
-            });
-
-        // This listener is for popup menu, which pops up if a queue,exchange or connection is selected
-        // with right click.
-        _treeViewer.getTree().addListener(SWT.MenuDetect, new Listener()
-            {
-                Display display = getSite().getShell().getDisplay();
-                final Shell shell = new Shell(display);
-
-                public void handleEvent(Event event)
-                {
-                    Tree widget = (Tree) event.widget;
-                    TreeItem[] items = widget.getSelection();
-                    if (items == null)
-                    {
-                        return;
-                    }
-
-                    // Get the selected node
-                    final TreeObject selectedNode = (TreeObject) items[0].getData();
-                    final TreeObject parentNode = selectedNode.getParent();
-
-                    // This popup is only for mbeans and only connection,exchange and queue types
-                    if ((parentNode == null) || !MBEAN.equals(selectedNode.getType())
-                            || !(CONNECTION.equals(parentNode.getName()) || QUEUE.equals(parentNode.getName())
-                                || EXCHANGE.equals(parentNode.getName())))
-                    {
-                        return;
-                    }
-
-                    Menu menu = new Menu(shell, SWT.POP_UP);
-                    MenuItem item = new MenuItem(menu, SWT.PUSH);
-                    // Add the action item, which will remove the node from the tree if selected
-                    item.setText(ACTION_REMOVE_MBEANNODE);
-                    item.addListener(SWT.Selection, new Listener()
-                        {
-                            public void handleEvent(Event e)
-                            {
-                                removeManagedObject(parentNode, (ManagedBean) selectedNode.getManagedObject());
-                                _treeViewer.refresh();
-                                // set the selection to the parent node
-                                _treeViewer.setSelection(new StructuredSelection(parentNode));
-                            }
-                        });
-                    menu.setLocation(event.x, event.y);
-                    menu.setVisible(true);
-                    while (!menu.isDisposed() && menu.isVisible())
-                    {
-                        if (!display.readAndDispatch())
-                        {
-                            display.sleep();
-                        }
-                    }
-
-                    menu.dispose();
-                }
-            });
-    }
-
-    /**
-     * Creates Qpid Server connection using JMX RMI protocol
-     * @param server
-     * @throws Exception
-     */
-    private void createRMIServerConnection(ManagedServer server) throws Exception
-    {
-        // Currently Qpid Management Console only supports JMX MBeanServer
-        ServerRegistry serverRegistry = new JMXServerRegistry(server);
-        ApplicationRegistry.addServer(server, serverRegistry);
-    }
-
-    /**
-     * Adds a new server node in the navigation view if server connection is successful.
-     * @param transportProtocol
-     * @param host
-     * @param port
-     * @param domain
-     * @throws Exception
-     */
-    public void addNewServer(String transportProtocol, String host, int port, String domain, String user, String pwd)
-        throws Exception
-    {
-        String serverAddress = host + ":" + port;
-        String url = null;
-        ManagedServer managedServer = new ManagedServer(host, port, domain, user, pwd);
-
-        if ("RMI".equals(transportProtocol))
-        {
-            url = managedServer.getUrl();
-            List<TreeObject> list = _serversRootNode.getChildren();
-            for (TreeObject node : list)
-            {
-                ManagedServer nodeServer = (ManagedServer)node.getManagedObject();
-                if (url.equals(nodeServer.getUrl()))
-                {
-                    // Server is already in the list of added servers, so now connect it.
-                    // Set the server node as selected and then connect it.
-                    _treeViewer.setSelection(new StructuredSelection(node));
-                    reconnect(user, pwd);
-
-                    return;
-                }
-            }
-
-            // The server is not in the list of already added servers, so now connect and add it.
-            managedServer.setName(serverAddress);
-            createRMIServerConnection(managedServer);
-        }
-        else
-        {
-            throw new InfoRequiredException(transportProtocol + " transport is not supported");
-        }
-
-        // Server connection is successful. Now add the server in the tree
-        TreeObject serverNode = new TreeObject(serverAddress, NODE_TYPE_SERVER);
-        serverNode.setManagedObject(managedServer);
-        _serversRootNode.addChild(serverNode);
-
-        // Add server in the connected server map
-        _managedServerMap.put(managedServer, serverNode);
-
-        // populate the server tree
-        try
-        {
-            populateServer(serverNode);
-        }
-        catch (SecurityException ex)
-        {
-            disconnect(managedServer);
-            throw ex;
-        }
-
-        // Add the Queue/Exchanges/Connections from config file into the navigation tree
-        addConfiguredItems(managedServer);
-
-        _treeViewer.refresh();
-
-        // save server address in file
-        addServerInConfigFile(serverAddress);
-    }
-
-    /**
-     * Create the config file, if it doesn't already exist.
-     * Exits the application if the file could not be created.
-     */
-    private void createConfigFile()
-    {
-        File file = new File(INI_FILENAME);
-        try
-        {
-            if (!file.exists())
-            {
-                file.createNewFile();
-            }
-        }
-        catch (IOException ex)
-        {
-            System.out.println("Could not write to the file " + INI_FILENAME);
-            System.out.println(ex);
-            System.exit(1);
-        }
-    }
-
-    /**
-     * Server addresses are stored in a file. When user launches the application again, the
-     * server addresses are picked up from the file and shown in the navigfation view. This method
-     * adds the server address in a file, when a new server is added in the navigation view.
-     * @param serverAddress
-     */
-    private void addServerInConfigFile(String serverAddress)
-    {
-        // Check if the address already exists
-        List<String> list = getServerListFromFile();
-        if ((list != null) && list.contains(serverAddress))
-        {
-            return;
-        }
-
-        // Get the existing server list and add to that
-        String servers = _preferences.getString(INI_SERVERS);
-        String value = (servers.length() != 0) ? (servers + "," + serverAddress) : serverAddress;
-        _preferences.putValue(INI_SERVERS, value);
-        try
-        {
-            _preferences.save();
-        }
-        catch (IOException ex)
-        {
-            System.err.println("Could not add " + serverAddress + " in " + INI_SERVERS + " (" + INI_FILENAME + ")");
-            System.out.println(ex);
-        }
-    }
-
-    /**
-     * Adds the item (Queue/Exchange/Connection) to the config file
-     * @param server
-     * @param virtualhost
-     * @param type - (Queue or Exchange or Connection)
-     * @param name - item name
-     */
-    private void addItemInConfigFile(TreeObject node)
-    {
-        ManagedBean mbean = (ManagedBean) node.getManagedObject();
-        String server = mbean.getServer().getName();
-        String virtualhost = mbean.getVirtualHostName();
-        String type = node.getParent().getName() + "s";
-        String name = node.getName();
-        String itemKey = server + "." + virtualhost + "." + type;
-
-        // Check if the item already exists in the config file
-        List<String> list = getConfiguredItemsFromFile(itemKey);
-        if ((list != null) && list.contains(name))
-        {
-            return;
-        }
-
-        // Add this item to the existing list of items
-        String items = _preferences.getString(itemKey);
-        String value = (items.length() != 0) ? (items + "," + name) : name;
-        _preferences.putValue(itemKey, value);
-        try
-        {
-            _preferences.save();
-        }
-        catch (IOException ex)
-        {
-            System.err.println("Could not add " + name + " in " + itemKey + " (" + INI_FILENAME + ")");
-            System.out.println(ex);
-        }
-    }
-
-    private void removeItemFromConfigFile(TreeObject node)
-    {
-        ManagedBean mbean = (ManagedBean) node.getManagedObject();
-        String server = mbean.getServer().getName();
-        String vHost = mbean.getVirtualHostName();
-        String type = node.getParent().getName() + "s";
-        String itemKey = server + "." + vHost + "." + type;
-
-        List<String> list = getConfiguredItemsFromFile(itemKey);
-        if (list.contains(node.getName()))
-        {
-            list.remove(node.getName());
-            String value = "";
-            for (String item : list)
-            {
-                value += item + ",";
-            }
-
-            value = (value.lastIndexOf(",") != -1) ? value.substring(0, value.lastIndexOf(",")) : value;
-
-            _preferences.putValue(itemKey, value);
-            try
-            {
-                _preferences.save();
-            }
-            catch (IOException ex)
-            {
-                System.err.println("Error in updating the config file " + INI_FILENAME);
-                System.out.println(ex);
-            }
-        }
-    }
-
-    /**
-     * Queries the qpid server for MBeans and populates the navigation view with all MBeans for
-     * the given server node.
-     * @param serverNode
-     */
-    private void populateServer(TreeObject serverNode) throws Exception
-    {
-        ManagedServer server = (ManagedServer) serverNode.getManagedObject();
-        String domain = server.getDomain();
-        if (!domain.equals(ALL))
-        {
-            TreeObject domainNode = new TreeObject(domain, NODE_TYPE_DOMAIN);
-            domainNode.setParent(serverNode);
-
-            populateDomain(domainNode);
-        }
-        else
-        {
-            List<TreeObject> domainList = new ArrayList<TreeObject>();
-            List<String> domains = MBeanUtility.getAllDomains(server);
-
-            for (String domainName : domains)
-            {
-                TreeObject domainNode = new TreeObject(domainName, NODE_TYPE_DOMAIN);
-                domainNode.setParent(serverNode);
-
-                domainList.add(domainNode);
-                populateDomain(domainNode);
-            }
-        }
-    }
-
-    /**
-     * Queries the Qpid Server and populates the given domain node with all MBeans undser that domain.
-     * @param domain
-     * @throws IOException
-     * @throws Exception
-     */
-    @SuppressWarnings("unchecked")
-    private void populateDomain(TreeObject domain) throws IOException, Exception
-    {
-        ManagedServer server = (ManagedServer) domain.getParent().getManagedObject();
-
-        // Now populate the mbenas under those types
-        List<ManagedBean> mbeans = MBeanUtility.getManagedObjectsForDomain(server, domain.getName());
-        for (ManagedBean mbean : mbeans)
-        {
-            mbean.setServer(server);
-            ServerRegistry serverRegistry = ApplicationRegistry.getServerRegistry(server);
-            serverRegistry.addManagedObject(mbean);
-
-            // Add all mbeans other than Connections, Exchanges and Queues. Because these will be added
-            // manually by selecting from MBeanView
-            if (!(mbean.isConnection() || mbean.isExchange() || mbean.isQueue()))
-            {
-                addManagedBean(domain, mbean);
-            }
-        }
-        // To make it work with the broker without virtual host implementation.
-        // This will add the default nodes to the domain node
-        for (TreeObject child : domain.getChildren())
-        {
-            if (!child.getName().startsWith(VIRTUAL_HOST))
-            {
-                addDefaultNodes(domain);
-            }
-
-            break;
-        }
-    }
-
-    /**
-     * Add these three types - Connection, Exchange, Queue
-     * By adding these, these will always be available, even if there are no mbeans under thse types
-     * This is required because, the mbeans will be added from mbeanview, by selecting from the list
-     * @param parent Node
-     */
-    private void addDefaultNodes(TreeObject parent)
-    {
-        TreeObject typeChild = new TreeObject(CONNECTION, NODE_TYPE_MBEANTYPE);
-        typeChild.setParent(parent);
-        typeChild.setVirtualHost(parent.getVirtualHost());
-        typeChild = new TreeObject(EXCHANGE, NODE_TYPE_MBEANTYPE);
-        typeChild.setParent(parent);
-        typeChild.setVirtualHost(parent.getVirtualHost());
-        typeChild = new TreeObject(QUEUE, NODE_TYPE_MBEANTYPE);
-        typeChild.setParent(parent);
-        typeChild.setVirtualHost(parent.getVirtualHost());
-        
-        // Add common notification node for virtual host
-        TreeObject notificationNode = new TreeObject(NOTIFICATIONS, NOTIFICATIONS);
-        notificationNode.setParent(parent);
-        notificationNode.setVirtualHost(parent.getVirtualHost());
-    }
-
-    /**
-     * Checks if a particular mbeantype is already there in the navigation view for a domain.
-     * This is used while populating domain with mbeans.
-     * @param parent
-     * @param typeName
-     * @return Node if given mbeantype already exists, otherwise null
-     */
-    private TreeObject getMBeanTypeNode(TreeObject parent, String typeName)
-    {
-        List<TreeObject> childNodes = parent.getChildren();
-        for (TreeObject child : childNodes)
-        {
-            if ((NODE_TYPE_MBEANTYPE.equals(child.getType()) || NODE_TYPE_TYPEINSTANCE.equals(child.getType()))
-                    && typeName.equals(child.getName()))
-            {
-                return child;
-            }
-        }
-
-        return null;
-    }
-
-    private boolean doesMBeanNodeAlreadyExist(TreeObject typeNode, String mbeanName)
-    {
-        List<TreeObject> childNodes = typeNode.getChildren();
-        for (TreeObject child : childNodes)
-        {
-            if (MBEAN.equals(child.getType()) && mbeanName.equals(child.getName()))
-            {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Adds the given MBean to the given domain node. Creates Notification node for the MBean.
-     * sample ObjectNames -
-     * org.apache.qpid:type=VirtualHost.VirtualHostManager,VirtualHost=localhost
-     * org.apache.qpid:type=VirtualHost.Queue,VirtualHost=test,name=ping_1
-     * @param domain
-     * @param mbean
-     * @throws Exception
-     */
-    private void addManagedBean(TreeObject domain, ManagedBean mbean) // throws Exception
-    {
-        String name = mbean.getName();
-        // Split the mbean type into array of Strings, to create hierarchy
-        // eg. type=VirtualHost.VirtualHostManager,VirtualHost=localhost will be:
-        // localhost->VirtualHostManager
-        // eg. type=org.apache.qpid:type=VirtualHost.Queue,VirtualHost=test,name=ping will be:
-        // test->Queue->ping
-        String[] types = mbean.getType().split("\\.");
-        TreeObject typeNode = null;
-        TreeObject parentNode = domain;
-
-        // Run this loop till all nodes(hierarchy) for this mbean are created. This loop only creates
-        // all the required parent nodes for the mbean
-        for (int i = 0; i < types.length; i++)
-        {
-            String type = types[i];
-            String valueOftype = mbean.getProperty(type);
-            // If value is not null, then there will be a parent node for this mbean
-            // eg. for type=VirtualHost the value is "test"
-            typeNode = getMBeanTypeNode(parentNode, type);
-
-            // create the type node if not already created
-            if (typeNode == null)
-            {
-                // If the ObjectName doesn't have name property, that means there will be only one instance
-                // of this mbean for given "type". So there will be no type node created for this mbean.
-                if ((name == null) && (i == (types.length - 1)))
-                {
-                    break;
-                }
-
-                // create a node for "type"
-                typeNode = createTypeNode(parentNode, type);
-                if (!type.equals(VIRTUAL_HOST))
-                {
-                    typeNode.setVirtualHost(mbean.getVirtualHostName());
-                }
-            }
-
-            // now type node create becomes the parent node for next node in hierarchy
-            parentNode = typeNode;
-
-            /*
-             * Now create instances node for this type if value exists.
-             */
-            if (valueOftype == null)
-            {
-                // No instance node will be created when value is null (eg type=Queue)
-                break;
-            }
-
-            // For different virtual hosts, the nodes with given value will be created.
-            // eg type=VirtualHost, value=test
-            typeNode = getMBeanTypeNode(parentNode, valueOftype);
-            if (typeNode == null)
-            {
-                typeNode = createTypeInstanceNode(parentNode, valueOftype);
-                typeNode.setVirtualHost(mbean.getVirtualHostName());
-
-                // Create default nodes for VHost instances
-                if (type.equals(VIRTUAL_HOST))
-                {
-                    addDefaultNodes(typeNode);
-                }
-            }
-
-            parentNode = typeNode;
-        }
-
-        if (typeNode == null)
-        {
-            typeNode = parentNode;
-        }
-
-        // Check if an MBean is already added
-        if (doesMBeanNodeAlreadyExist(typeNode, name))
-        {
-            return;
-        }
-
-        // Add the mbean node now
-        TreeObject mbeanNode = new TreeObject(mbean);
-        mbeanNode.setParent(typeNode);
-
-        // Add the mbean to the config file
-        if (mbean.isQueue() || mbean.isExchange() || mbean.isConnection())
-        {
-            addItemInConfigFile(mbeanNode);
-        }
-
-        // Add notification node
-        // TODO: show this only if the mbean sends any notification
-        //TreeObject notificationNode = new TreeObject(NOTIFICATION, NOTIFICATION);
-        //notificationNode.setParent(mbeanNode);
-    }
-
-    private TreeObject createTypeNode(TreeObject parent, String name)
-    {
-        TreeObject typeNode = new TreeObject(name, NODE_TYPE_MBEANTYPE);
-        typeNode.setParent(parent);
-
-        return typeNode;
-    }
-
-    private TreeObject createTypeInstanceNode(TreeObject parent, String name)
-    {
-        TreeObject typeNode = new TreeObject(name, NODE_TYPE_TYPEINSTANCE);
-        typeNode.setParent(parent);
-
-        return typeNode;
-    }
-
-    /**
-     * Removes all the child nodes of the given parent node. Used when closing a server.
-     * @param parent
-     */
-    private void removeManagedObject(TreeObject parent)
-    {
-        List<TreeObject> list = parent.getChildren();
-        for (TreeObject child : list)
-        {
-            removeManagedObject(child);
-        }
-
-        list.clear();
-    }
-
-    /**
-     * Removes the mbean from the tree
-     * @param parent
-     * @param mbean
-     */
-    private void removeManagedObject(TreeObject parent, ManagedBean mbean)
-    {
-        List<TreeObject> list = parent.getChildren();
-        TreeObject objectToRemove = null;
-        for (TreeObject child : list)
-        {
-            if (MBEAN.equals(child.getType()))
-            {
-                String name = (mbean.getName() != null) ? mbean.getName() : mbean.getType();
-                if (child.getName().equals(name))
-                {
-                    objectToRemove = child;
-
-                    break;
-                }
-            }
-            else
-            {
-                removeManagedObject(child, mbean);
-            }
-        }
-
-        if (objectToRemove != null)
-        {
-            list.remove(objectToRemove);
-            removeItemFromConfigFile(objectToRemove);
-        }
-
-    }
-
-    /**
-     * Closes the Qpid server connection
-     */
-    public void disconnect() throws Exception
-    {
-        TreeObject selectedNode = getSelectedServerNode();
-        ManagedServer managedServer = (ManagedServer) selectedNode.getManagedObject();
-        disconnect(managedServer);
-    }
-    
-    private void disconnect(ManagedServer managedServer) throws Exception
-    {
-        if (!_managedServerMap.containsKey(managedServer))
-        {
-            return;
-        }
-
-        // Close server connection
-        ServerRegistry serverRegistry = ApplicationRegistry.getServerRegistry(managedServer);
-        if (serverRegistry == null) // server connection is already closed
-        {
-            return;
-        }
-
-        serverRegistry.closeServerConnection();
-        // Add server to the closed server list and the worker thread will remove the server from required places.
-        ApplicationRegistry.serverConnectionClosed(managedServer);
-    }
-
-    /**
-     * Connects the selected server node
-     * @throws Exception
-     */
-    public void reconnect(String user, String password) throws Exception
-    {
-        TreeObject selectedNode = getSelectedServerNode();
-        ManagedServer managedServer = (ManagedServer) selectedNode.getManagedObject();
-        if (_managedServerMap.containsKey(managedServer))
-        {
-            throw new InfoRequiredException("Server " + managedServer.getName() + " is already connected");
-        }
-
-        managedServer.setUser(user);
-        managedServer.setPassword(password);
-        createRMIServerConnection(managedServer);
-
-        // put the server in the managed server map
-        _managedServerMap.put(managedServer, selectedNode);
-
-        try
-        {
-            // populate the server tree now
-            populateServer(selectedNode);
-        }
-        catch (SecurityException ex)
-        {
-            disconnect(managedServer);
-            throw ex;
-        }
-        
-
-        // Add the Queue/Exchanges/Connections from config file into the navigation tree
-        addConfiguredItems(managedServer);
-
-        _treeViewer.refresh();
-    }
-
-    /**
-     * Adds the items(queues/exchanges/connectins) from config file to the server tree
-     * @param server
-     */
-    private void addConfiguredItems(ManagedServer server)
-    {
-        ServerRegistry serverRegistry = ApplicationRegistry.getServerRegistry(server);
-        List<String> list = serverRegistry.getVirtualHosts();
-        for (String virtualHost : list)
-        {
-            // Add Queues
-            String itemKey = server.getName() + "." + virtualHost + "." + INI_QUEUES;
-            List<String> items = getConfiguredItemsFromFile(itemKey);
-            List<ManagedBean> mbeans = serverRegistry.getQueues(virtualHost);
-            addConfiguredItems(items, mbeans);
-
-            // Add Exchanges
-            itemKey = server.getName() + "." + virtualHost + "." + INI_EXCHANGES;
-            items = getConfiguredItemsFromFile(itemKey);
-            mbeans = serverRegistry.getExchanges(virtualHost);
-            addConfiguredItems(items, mbeans);
-
-            // Add Connections
-            itemKey = server.getName() + "." + virtualHost + "." + INI_CONNECTIONS;
-            items = getConfiguredItemsFromFile(itemKey);
-            mbeans = serverRegistry.getConnections(virtualHost);
-            addConfiguredItems(items, mbeans);
-        }
-    }
-
-    /**
-     * Gets the mbeans corresponding to the items and adds those to the navigation tree
-     * @param items
-     * @param mbeans
-     */
-    private void addConfiguredItems(List<String> items, List<ManagedBean> mbeans)
-    {
-        if ((items == null) || (items.isEmpty() | (mbeans == null)) || mbeans.isEmpty())
-        {
-            return;
-        }
-
-        for (String item : items)
-        {
-            for (ManagedBean mbean : mbeans)
-            {
-                if (item.equals(mbean.getName()))
-                {
-                    addManagedBean(mbean);
-
-                    break;
-                }
-            }
-        }
-    }
-
-    /**
-     * Closes the Qpid server connection if not already closed and removes the server node from the navigation view and
-     * also from the ini file stored in the system.
-     * @throws Exception
-     */
-    public void removeServer() throws Exception
-    {
-        disconnect();
-
-        // Remove from the Tree
-        String serverNodeName = getSelectedServerNode().getName();
-        List<TreeObject> list = _serversRootNode.getChildren();
-        TreeObject objectToRemove = null;
-        for (TreeObject child : list)
-        {
-            if (child.getName().equals(serverNodeName))
-            {
-                objectToRemove = child;
-
-                break;
-            }
-        }
-
-        if (objectToRemove != null)
-        {
-            list.remove(objectToRemove);
-        }
-
-        _treeViewer.refresh();
-
-        // Remove from the ini file
-        removeServerFromConfigFile(serverNodeName);
-    }
-
-    private void removeServerFromConfigFile(String serverNodeName)
-    {
-        List<String> serversList = getServerListFromFile();
-        serversList.remove(serverNodeName);
-
-        String value = "";
-        for (String item : serversList)
-        {
-            value += item + ",";
-        }
-
-        value = (value.lastIndexOf(",") != -1) ? value.substring(0, value.lastIndexOf(",")) : value;
-
-        _preferences.putValue(INI_SERVERS, value);
-
-        try
-        {
-            _preferences.save();
-        }
-        catch (IOException ex)
-        {
-            System.err.println("Error in updating the config file " + INI_FILENAME);
-            System.out.println(ex);
-        }
-    }
-
-    /**
-     * @return the server addresses from the ini file
-     * @throws Exception
-     */
-    private List<String> getServerListFromFile()
-    {
-        return getConfiguredItemsFromFile(INI_SERVERS);
-    }
-
-    /**
-     * Returns the list of items from the config file.
-     * sample ini file:
-     * Servers=localhost:8999,127.0.0.1:8999
-     * localhost.virtualhost1.Queues=queue1,queue2
-     * localhost.virtualhost1.Exchanges=exchange1,exchange2
-     * localhost.virtualhost2.Connections=conn1
-     * @param key
-     * @return
-     */
-    private List<String> getConfiguredItemsFromFile(String key)
-    {
-        List<String> list = new ArrayList<String>();
-        String items = _preferences.getString(key);
-        if (items.length() != 0)
-        {
-            String[] array = items.split(",");
-            for (String item : array)
-            {
-                list.add(item);
-            }
-        }
-
-        return list;
-    }
-
-    public TreeObject getSelectedServerNode() throws Exception
-    {
-        IStructuredSelection ss = (IStructuredSelection) _treeViewer.getSelection();
-        TreeObject selectedNode = (TreeObject) ss.getFirstElement();
-        if (ss.isEmpty() || (selectedNode == null) || (!selectedNode.getType().equals(NODE_TYPE_SERVER)))
-        {
-            throw new InfoRequiredException("Please select the server");
-        }
-
-        return selectedNode;
-    }
-
-    /**
-     * This is a callback that will allow us to create the viewer and initialize
-     * it.
-     */
-    public void createPartControl(Composite parent)
-    {
-        Composite composite = new Composite(parent, SWT.NONE);
-        GridLayout gridLayout = new GridLayout();
-        gridLayout.marginHeight = 2;
-        gridLayout.marginWidth = 2;
-        gridLayout.horizontalSpacing = 0;
-        gridLayout.verticalSpacing = 2;
-        composite.setLayout(gridLayout);
-
-        createTreeViewer(composite);
-        _rootNode = new TreeObject("ROOT", "ROOT");
-        _serversRootNode = new TreeObject(NAVIGATION_ROOT, "ROOT");
-        _serversRootNode.setParent(_rootNode);
-
-        _treeViewer.setInput(_rootNode);
-        // set viewer as selection event provider for MBeanView
-        getSite().setSelectionProvider(_treeViewer);
-
-        // Start worker thread to refresh tree for added or removed objects
-        (new Thread(new Worker())).start();
-
-        createConfigFile();
-        _preferences = new PreferenceStore(INI_FILENAME);
-
-        try
-        {
-            _preferences.load();
-        }
-        catch (IOException ex)
-        {
-            System.out.println(ex);
-        }
-
-        // load the list of servers already added from file
-        List<String> serversList = getServerListFromFile();
-        if (serversList != null)
-        {
-            for (String serverAddress : serversList)
-            {
-                String[] server = serverAddress.split(":");
-                ManagedServer managedServer = new ManagedServer(server[0], Integer.parseInt(server[1]), "org.apache.qpid");
-                TreeObject serverNode = new TreeObject(serverAddress, NODE_TYPE_SERVER);
-                serverNode.setManagedObject(managedServer);
-                _serversRootNode.addChild(serverNode);
-            }
-        }
-
-        _treeViewer.refresh();
-
-    }
-
-    /**
-     * Passing the focus request to the viewer's control.
-     */
-    public void setFocus()
-    { }
-
-    public void refresh()
-    {
-        _treeViewer.refresh();
-    }
-
-    /**
-     * Content provider class for the tree viewer
-     */
-    private class ContentProviderImpl implements ITreeContentProvider
-    {
-        public Object[] getElements(Object parent)
-        {
-            return getChildren(parent);
-        }
-
-        public Object[] getChildren(final Object parentElement)
-        {
-            final TreeObject node = (TreeObject) parentElement;
-
-            return node.getChildren().toArray(new TreeObject[0]);
-        }
-
-        public Object getParent(final Object element)
-        {
-            final TreeObject node = (TreeObject) element;
-
-            return node.getParent();
-        }
-
-        public boolean hasChildren(final Object element)
-        {
-            final TreeObject node = (TreeObject) element;
-
-            return !node.getChildren().isEmpty();
-        }
-
-        public void inputChanged(final Viewer viewer, final Object oldInput, final Object newInput)
-        {
-            // Do nothing
-        }
-
-        public void dispose()
-        {
-            // Do nothing
-        }
-    }
-
-    /**
-     * Label provider class for the tree viewer
-     */
-    private class LabelProviderImpl extends LabelProvider implements IFontProvider
-    {
-        public Image getImage(Object element)
-        {
-            TreeObject node = (TreeObject) element;
-            if (node.getType().equals(NOTIFICATIONS))
-            {
-                return ApplicationRegistry.getImage(NOTIFICATION_IMAGE);
-            }
-            else if (!node.getType().equals(MBEAN))
-            {
-                if (_treeViewer.getExpandedState(node))
-                {
-                    return ApplicationRegistry.getImage(OPEN_FOLDER_IMAGE);
-                }
-                else
-                {
-                    return ApplicationRegistry.getImage(CLOSED_FOLDER_IMAGE);
-                }
-
-            }
-            else
-            {
-                return ApplicationRegistry.getImage(MBEAN_IMAGE);
-            }
-        }
-
-        public String getText(Object element)
-        {
-            TreeObject node = (TreeObject) element;
-            if (node.getType().equals(NODE_TYPE_MBEANTYPE))
-            {
-                return node.getName() + "s";
-            }
-            else
-            {
-                return node.getName();
-            }
-        }
-
-        public Font getFont(Object element)
-        {
-            TreeObject node = (TreeObject) element;
-            if (node.getType().equals(NODE_TYPE_SERVER))
-            {
-                if (node.getChildren().isEmpty())
-                {
-                    return ApplicationRegistry.getFont(FONT_NORMAL);
-                }
-                else
-                {
-                    return ApplicationRegistry.getFont(FONT_BOLD);
-                }
-            }
-
-            return ApplicationRegistry.getFont(FONT_NORMAL);
-        }
-    } // End of LabelProviderImpl
-
-    private class ViewerSorterImpl extends ViewerSorter
-    {
-        public int category(Object element)
-        {
-            TreeObject node = (TreeObject) element;
-            if (node.getType().equals(MBEAN))
-            {
-                return 1;
-            }
-            if (node.getType().equals(NOTIFICATIONS))
-            {
-                return 2;
-            }
-            return 3;
-        }
-    }
-
-    /**
-     * Worker thread, which keeps looking for new ManagedObjects to be added and
-     * unregistered objects to be removed from the tree.
-     * @author Bhupendra Bhardwaj
-     */
-    private class Worker implements Runnable
-    {
-        public void run()
-        {
-            while (true)
-            {
-                if (!_managedServerMap.isEmpty())
-                {
-                    refreshRemovedObjects();
-                    refreshClosedServerConnections();
-                }
-
-                try
-                {
-                    Thread.sleep(3000);
-                }
-                catch (Exception ex)
-                { }
-
-            } // end of while loop
-        } // end of run method.
-    } // end of Worker class
-
-    /**
-     * Adds the mbean to the navigation tree
-     * @param mbean
-     * @throws Exception
-     */
-    public void addManagedBean(ManagedBean mbean) // throws Exception
-    {
-        TreeObject treeServerObject = _managedServerMap.get(mbean.getServer());
-        List<TreeObject> domains = treeServerObject.getChildren();
-        TreeObject domain = null;
-        for (TreeObject child : domains)
-        {
-            if (child.getName().equals(mbean.getDomain()))
-            {
-                domain = child;
-
-                break;
-            }
-        }
-
-        addManagedBean(domain, mbean);
-        _treeViewer.refresh();
-    }
-
-    private void refreshRemovedObjects()
-    {
-        for (ManagedServer server : _managedServerMap.keySet())
-        {
-            final ServerRegistry serverRegistry = ApplicationRegistry.getServerRegistry(server);
-            if (serverRegistry == null) // server connection is closed
-            {
-                continue;
-            }
-
-            final List<ManagedBean> removalList = serverRegistry.getObjectsToBeRemoved();
-            if (removalList != null)
-            {
-                Display display = getSite().getShell().getDisplay();
-                display.syncExec(new Runnable()
-                    {
-                        public void run()
-                        {
-                            for (ManagedBean mbean : removalList)
-                            {
-                                TreeObject treeServerObject = _managedServerMap.get(mbean.getServer());
-                                List<TreeObject> domains = treeServerObject.getChildren();
-                                TreeObject domain = null;
-                                for (TreeObject child : domains)
-                                {
-                                    if (child.getName().equals(mbean.getDomain()))
-                                    {
-                                        domain = child;
-
-                                        break;
-                                    }
-                                }
-
-                                removeManagedObject(domain, mbean);
-                                // serverRegistry.removeManagedObject(mbean);
-                            }
-
-                            _treeViewer.refresh();
-                        }
-                    });
-            }
-        }
-    }
-
-    /**
-     * Gets the list of closed server connection from the ApplicationRegistry and then removes
-     * the closed server nodes from the navigation view
-     */
-    private void refreshClosedServerConnections()
-    {
-        final List<ManagedServer> closedServers = ApplicationRegistry.getClosedServers();
-        if (closedServers != null)
-        {
-            Display display = getSite().getShell().getDisplay();
-            display.syncExec(new Runnable()
-                {
-                    public void run()
-                    {
-                        for (ManagedServer server : closedServers)
-                        {
-                            removeManagedObject(_managedServerMap.get(server));
-                            _managedServerMap.remove(server);
-                            ApplicationRegistry.removeServer(server);
-                        }
-
-                        _treeViewer.refresh();
-                    }
-                });
-        }
-    }
-
-}
diff --git a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NotificationsTabControl.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NotificationsTabControl.java
deleted file mode 100644
index 6894080859..0000000000
--- a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NotificationsTabControl.java
+++ /dev/null
@@ -1,427 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.management.ui.views;
-
-import static org.apache.qpid.management.ui.Constants.BUTTON_CLEAR;
-import static org.apache.qpid.management.ui.Constants.BUTTON_REFRESH;
-import static org.apache.qpid.management.ui.Constants.DESCRIPTION;
-import static org.apache.qpid.management.ui.Constants.FONT_BOLD;
-import static org.apache.qpid.management.ui.Constants.FONT_BUTTON;
-import static org.apache.qpid.management.ui.Constants.FONT_ITALIC;
-import static org.apache.qpid.management.ui.Constants.SUBSCRIBE_BUTTON;
-import static org.apache.qpid.management.ui.Constants.UNSUBSCRIBE_BUTTON;
-
-import java.util.List;
-
-import org.apache.qpid.management.ui.ApplicationRegistry;
-import org.apache.qpid.management.ui.ManagedBean;
-import org.apache.qpid.management.ui.ServerRegistry;
-import org.apache.qpid.management.ui.jmx.MBeanUtility;
-import org.apache.qpid.management.ui.model.NotificationInfoModel;
-import org.apache.qpid.management.ui.model.NotificationObject;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.FormAttachment;
-import org.eclipse.swt.layout.FormData;
-import org.eclipse.swt.layout.FormLayout;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.TabFolder;
-
-/**
- * Creates control composite for Notifications tab
- * @author Bhupendra Bhardwaj
- */
-public class NotificationsTabControl extends VHNotificationsTabControl
-{    
-    private static final String SELECT_NOTIFICATIONNAME = "Select Notification";
-    private static final String SELECT_NOTIFICATIONTYPE = "Select Type";
-    private SelectionListener selectionListener;
-    private SelectionListener comboListener;    
-    
-    private Combo notificationNameCombo = null;
-    private Combo typesCombo = null;
-    private Label descriptionLabel = null;
-    private Button _subscribeButton   = null;
-    private Button _unsubscribeButton = null;
-    
-    public NotificationsTabControl(TabFolder tabFolder)
-    {
-        super(tabFolder);
-    }
-    
-    protected void createWidgets()
-    {       
-        selectionListener = new SelectionListenerImpl();
-        comboListener = new ComboSelectionListener();
-        createNotificationInfoComposite();
-        //addFilterComposite();
-        addButtons();  
-        createTableViewer();
-    }
-    
-    /**
-     * Creates composite and populates for displaying Notification Information (name, type, description)
-     * and creates buttons for subscribing or unsubscribing for notifications
-     */
-    private void createNotificationInfoComposite()
-    {
-        Composite composite = _toolkit.createComposite(_form.getBody(), SWT.NONE);
-        composite.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false));
-        composite.setLayout(new FormLayout());
-        
-        Label label = _toolkit.createLabel(composite, "Select the notification to subscribe or unsubscribe");
-        label.setFont(ApplicationRegistry.getFont(FONT_BOLD));
-        FormData formData = new FormData();
-        formData.top = new FormAttachment(0, 10);
-        formData.left = new FormAttachment(0, 10);
-        label.setLayoutData(formData);
-        
-        notificationNameCombo = new Combo(composite, SWT.READ_ONLY | SWT.DROP_DOWN);
-        formData = new FormData();
-        formData.top = new FormAttachment(label, 10);
-        formData.left = new FormAttachment(0, 10);
-        formData.right = new FormAttachment(40);
-        notificationNameCombo.setLayoutData(formData);
-        notificationNameCombo.addSelectionListener(comboListener);
-        
-        typesCombo = new Combo(composite, SWT.READ_ONLY | SWT.DROP_DOWN);
-        formData = new FormData();
-        formData.top = new FormAttachment(label, 10);
-        formData.left = new FormAttachment(notificationNameCombo, 5);
-        formData.right = new FormAttachment(65);
-        typesCombo.setLayoutData(formData);
-        typesCombo.addSelectionListener(comboListener);
-        
-        _subscribeButton = new Button(composite, SWT.PUSH | SWT.CENTER);
-        _subscribeButton.setFont(ApplicationRegistry.getFont(FONT_BUTTON));
-        _subscribeButton.setText(SUBSCRIBE_BUTTON);
-        formData = new FormData();
-        formData.top = new FormAttachment(label, 10);
-        formData.left = new FormAttachment(65, 10);
-        formData.width = 80;
-        _subscribeButton.setLayoutData(formData);
-        _subscribeButton.addSelectionListener(selectionListener);
-        
-        _unsubscribeButton = new Button(composite, SWT.PUSH | SWT.CENTER);
-        _unsubscribeButton.setFont(ApplicationRegistry.getFont(FONT_BUTTON));
-        _unsubscribeButton.setText(UNSUBSCRIBE_BUTTON);
-        formData = new FormData();
-        formData.top = new FormAttachment(label, 10);
-        formData.left = new FormAttachment(_subscribeButton, 10);
-        formData.width = 80;
-        _unsubscribeButton.setLayoutData(formData);
-        _unsubscribeButton.addSelectionListener(selectionListener);
-        
-        Label fixedLabel = _toolkit.createLabel(composite, "");
-        formData = new FormData();
-        formData.top = new FormAttachment(notificationNameCombo, 5);
-        formData.left = new FormAttachment(0, 10);
-        fixedLabel.setLayoutData(formData);
-        fixedLabel.setText(DESCRIPTION + " : ");
-        fixedLabel.setFont(ApplicationRegistry.getFont(FONT_BOLD));
-        
-        descriptionLabel = _toolkit.createLabel(composite, "");
-        formData = new FormData();
-        formData.top = new FormAttachment(notificationNameCombo, 5);
-        formData.left = new FormAttachment(fixedLabel, 10);
-        formData.right = new FormAttachment(100);
-        descriptionLabel.setLayoutData(formData);
-        descriptionLabel.setText("      ");
-        descriptionLabel.setFont(ApplicationRegistry.getFont(FONT_ITALIC));
-    }
-    
-    /**
-     * Creates clear buttin and refresh button
-     */
-    protected void addButtons()
-    {    
-        Composite composite = _toolkit.createComposite(_form.getBody(), SWT.NONE);
-        composite.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false));
-        composite.setLayout(new GridLayout(2, true));
-        
-        // Add Clear Button
-        _clearButton = _toolkit.createButton(composite, BUTTON_CLEAR, SWT.PUSH | SWT.CENTER);
-        _clearButton.setFont(ApplicationRegistry.getFont(FONT_BUTTON));
-        GridData gridData = new GridData(SWT.LEAD, SWT.TOP, true, false);
-        gridData.widthHint = 80;
-        _clearButton.setLayoutData(gridData);
-        _clearButton.addSelectionListener(new SelectionAdapter()
-            {
-                public void widgetSelected(SelectionEvent e)
-                {    
-                    if (_mbean == null)
-                        return;
-                    
-                    IStructuredSelection ss = (IStructuredSelection)_tableViewer.getSelection();
-                    ServerRegistry serverRegistry = ApplicationRegistry.getServerRegistry(_mbean);
-                    serverRegistry.clearNotifications(_mbean, ss.toList());
-                    refresh();
-                }
-            });
-        
-        // Add Refresh Button
-        _refreshButton = _toolkit.createButton(composite, BUTTON_REFRESH, SWT.PUSH | SWT.CENTER);
-        _refreshButton.setFont(ApplicationRegistry.getFont(FONT_BUTTON));
-        gridData = new GridData(SWT.TRAIL, SWT.TOP, true, false);
-        gridData.widthHint = 80;
-        _refreshButton.setLayoutData(gridData);
-        _refreshButton.addSelectionListener(new SelectionAdapter()
-            {
-                public void widgetSelected(SelectionEvent e)
-                {    
-                    if (_mbean == null)
-                        return;
-                    
-                    refresh();
-                }
-            });
-    }
-  
-    @Override
-    public void refresh(ManagedBean mbean)
-    {
-        _mbean = mbean;
-        _notifications = null;
-        _table.deselectAll();
-        _tableViewer.getTable().clearAll();
-        
-        if (_mbean == null)
-        {            
-            _tableViewer.getTable().clearAll();
-            _subscribeButton.setEnabled(false);
-            _unsubscribeButton.setEnabled(false);
-            return;
-        }        
-        
-        if (!doesMBeanSendsNotification())
-        {
-            Control[] children = _form.getBody().getChildren();        
-            for (int i = 0; i < children.length; i++)
-            {
-                children[i].setVisible(false);
-            }
-            
-            String name = (_mbean.getName() != null) ? _mbean.getName() : _mbean.getType();
-            _form.setText(name + " does not send any notification");
-            return;
-        }
-        
-        Control[] children = _form.getBody().getChildren();        
-        for (int i = 0; i < children.length; i++)
-        {
-            children[i].setVisible(true);
-        }
-        
-        populateNotificationInfo();        
-        workerRunning = true;
-        _form.layout(true);   
-        _form.getBody().layout(true, true);
-    }
-    
-    public void refresh()
-    {
-        _notifications = null;
-        _table.deselectAll();
-        _tableViewer.getTable().clearAll();
-    }
-    
-    /**
-     * Fills the notification information widgets for selected mbean
-     */
-    private void populateNotificationInfo()
-    {
-        notificationNameCombo.removeAll();
-        NotificationInfoModel[] items = MBeanUtility.getNotificationInfo(_mbean);
-        if (items.length > 1)
-        {
-            notificationNameCombo.add(SELECT_NOTIFICATIONNAME);
-        }
-        
-        for (int i = 0; i < items.length; i++)
-        {
-            notificationNameCombo.add(items[i].getName());
-            notificationNameCombo.setData(items[i].getName(), items[i]);
-        } 
-        notificationNameCombo.select(0);
-        
-        typesCombo.removeAll();
-        typesCombo.add("Select Type", 0);
-        typesCombo.select(0);
-        typesCombo.setEnabled(false);
-        
-        populateNotificationType(notificationNameCombo.getItem(0));
-        checkForEnablingButtons();
-    }
-    
-    /**
-     * Checks and the enabing/disabling of buttons
-     */
-    private void checkForEnablingButtons()
-    {
-        int nameIndex = notificationNameCombo.getSelectionIndex();
-        int itemCount = notificationNameCombo.getItems().length;
-        if ((itemCount > 1) && (nameIndex == 0))
-        {
-            _subscribeButton.setEnabled(false);
-            _unsubscribeButton.setEnabled(false);
-            descriptionLabel.setText("");
-            return;
-        }
-        
-        int typeIndex = typesCombo.getSelectionIndex();
-        itemCount = typesCombo.getItems().length;
-        if ((itemCount > 1) && (typeIndex == 0))
-        {
-            _subscribeButton.setEnabled(false);
-            _unsubscribeButton.setEnabled(false);
-            return;
-        }
-        
-        String type = typesCombo.getItem(typeIndex);
-        String name = notificationNameCombo.getItem(nameIndex);
-        ServerRegistry serverRegistry = ApplicationRegistry.getServerRegistry(_mbean);
-        
-        if (serverRegistry.hasSubscribedForNotifications(_mbean, name, type))
-        {
-            _subscribeButton.setEnabled(false);
-            _unsubscribeButton.setEnabled(true);
-        }
-        else
-        {
-            _subscribeButton.setEnabled(true);
-            _unsubscribeButton.setEnabled(false);
-        }
-    }
-    
-    private boolean doesMBeanSendsNotification()
-    {
-        NotificationInfoModel[] items = MBeanUtility.getNotificationInfo(_mbean);
-        if (items == null || items.length == 0)
-            return false;
-        else
-            return true;
-    }
-    
-    /**
-     * Selection listener for subscribing or unsubscribing the notifications
-     */
-    private class SelectionListenerImpl extends SelectionAdapter
-    {
-        public void widgetSelected(SelectionEvent e)
-        {
-            if (_mbean == null)
-                return;
-            
-            Button source = (Button)e.getSource();
-            String type = typesCombo.getItem(typesCombo.getSelectionIndex());
-            String name = notificationNameCombo.getItem(notificationNameCombo.getSelectionIndex());
-            if (source == _unsubscribeButton)
-            {
-                try
-                {
-                    MBeanUtility.removeNotificationListener(_mbean, name, type);
-                }
-                catch(Exception ex)
-                {
-                    MBeanUtility.handleException(ex);
-                }
-            }
-            else if (source == _subscribeButton)
-            {
-                try
-                {
-                    MBeanUtility.createNotificationlistener(_mbean, name, type);
-                }
-                catch(Exception ex)
-                {
-                    MBeanUtility.handleException(ex);
-                }
-            }
-            checkForEnablingButtons();
-        }
-    }
-    
-    /**
-     * Selection listener class for the Notification Name. The notification type and description will be 
-     * displayed accordingly
-     */
-    private class ComboSelectionListener extends SelectionAdapter
-    {
-        public void widgetSelected(SelectionEvent e)
-        {
-            if (_mbean == null)
-                return;
-            
-            Combo combo = (Combo)e.getSource();
-            if (combo == notificationNameCombo)
-            {
-                String selectedItem = combo.getItem(combo.getSelectionIndex());                
-                populateNotificationType(selectedItem);
-            }
-            checkForEnablingButtons();
-        }
-    }
-    
-    private void populateNotificationType(String notificationName)
-    {
-        NotificationInfoModel data = (NotificationInfoModel)notificationNameCombo.getData(notificationName);
-        if (data == null)
-        {
-            descriptionLabel.setText("");
-            typesCombo.select(0);
-            typesCombo.setEnabled(false);
-            return;
-        }
-        descriptionLabel.setText(data.getDescription());
-        typesCombo.removeAll();       
-        typesCombo.setItems(data.getTypes());
-        if (typesCombo.getItemCount() > 1)
-        {
-            typesCombo.add(SELECT_NOTIFICATIONTYPE, 0);
-        }
-        typesCombo.select(0);
-        typesCombo.setEnabled(true);
-    }
-    
-    /**
-     * Updates the table with new notifications received from mbean server for the selected mbean
-     */
-    protected void updateTableViewer()
-    {
-        ServerRegistry serverRegistry = ApplicationRegistry.getServerRegistry(_mbean);        
-        List<NotificationObject> newList = serverRegistry.getNotifications(_mbean);
-        if (newList == null)
-            return;
-        
-        _notifications = newList;
-        _tableViewer.setInput(_notifications);
-        _tableViewer.refresh();
-    }
-}
diff --git a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NumberVerifyListener.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NumberVerifyListener.java
deleted file mode 100644
index 1774209dae..0000000000
--- a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NumberVerifyListener.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.management.ui.views;
-
-import org.eclipse.swt.events.VerifyEvent;
-import org.eclipse.swt.events.VerifyListener;
-
-/**
- * Implementation of VeryfyListener for numeric values
- * @author Bhupendra Bhardwaj
- */
-public class NumberVerifyListener implements VerifyListener
-{
-    public void verifyText(VerifyEvent event)
-    {
-        String string = event.text;
-        char [] chars = new char [string.length ()];
-        string.getChars (0, chars.length, chars, 0);
-        for (int i=0; i<chars.length; i++)
-        {
-            if (!('0' <= chars [i] && chars [i] <= '9'))
-            {
-                event.doit = false;
-                return;
-            }
-        }
-    }
-}
diff --git a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/OperationTabControl.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/OperationTabControl.java
deleted file mode 100644
index 12f38f1c74..0000000000
--- a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/OperationTabControl.java
+++ /dev/null
@@ -1,898 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.management.ui.views;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map.Entry;
-
-import javax.management.openmbean.CompositeData;
-import javax.management.openmbean.TabularDataSupport;
-
-import static org.apache.qpid.management.ui.Constants.*;
-
-import org.apache.qpid.management.ui.ApplicationRegistry;
-import org.apache.qpid.management.ui.ManagedBean;
-import org.apache.qpid.management.ui.jmx.MBeanUtility;
-import org.apache.qpid.management.ui.model.OperationData;
-import org.apache.qpid.management.ui.model.ParameterData;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.ScrolledComposite;
-import org.eclipse.swt.events.KeyAdapter;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.events.KeyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.events.VerifyEvent;
-import org.eclipse.swt.events.VerifyListener;
-import org.eclipse.swt.layout.FormAttachment;
-import org.eclipse.swt.layout.FormData;
-import org.eclipse.swt.layout.FormLayout;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.TabFolder;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.forms.widgets.Form;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- * Control class for the MBean operations tab. It creates the required widgets
- * for the selected MBean.
- * @author Bhupendra Bhardwaj
- */
-public class OperationTabControl extends TabControl
-{
-    private static final int heightForAParameter = 30;
-    private static final int labelWidth = 30;
-    private static final int valueWidth = labelWidth + 25;
-    
-    private FormToolkit _toolkit;
-    private Form        _form;
-    private OperationData _opData;
-    
-    private SelectionListener operationExecutionListener = new OperationExecutionListener(); 
-    private SelectionListener refreshListener = new RefreshListener(); 
-    private SelectionListener parameterSelectionListener = new ParameterSelectionListener();
-    private SelectionListener booleanSelectionListener = new BooleanSelectionListener();
-    private VerifyListener    verifyListener = new VerifyListenerImpl();
-    private KeyListener       keyListener = new KeyListenerImpl();
-    private KeyListener       headerBindingListener = new HeaderBindingKeyListener();
-    
-    private Composite _headerComposite = null;
-    private Composite _paramsComposite = null;
-    private Composite _resultsComposite = null;
-    private Button _executionButton = null;
-    
-    // for customized method in header exchange
-    private HashMap<Text, Text> headerBindingHashMap = null;
-    private String _virtualHostName = null;
-    
-    public OperationTabControl(TabFolder tabFolder, OperationData opData)
-    {
-        super(tabFolder);
-        _toolkit = new FormToolkit(_tabFolder.getDisplay());
-        _form = _toolkit.createForm(_tabFolder);
-        _form.getBody().setLayout(new GridLayout());
-        _opData = opData;
-        createComposites();
-        setHeader();
-    }
-    
-    /**
-     * Form area is devided in four parts:
-     * Header composite - displays operaiton information
-     * Patameters composite - displays parameters if there
-     * Button - operation execution button
-     * Results composite - displays results for operations, which have 
-     *                     no parameters but have some return value
-     */
-    private void createComposites()
-    {
-        // 
-        _headerComposite = _toolkit.createComposite(_form.getBody(), SWT.NONE);
-        _headerComposite.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false));
-        
-        List<ParameterData> params = _opData.getParameters();
-        if (params != null && !params.isEmpty())
-        {
-            _paramsComposite = _toolkit.createComposite(_form.getBody(), SWT.NONE);
-            _paramsComposite.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false));
-        }
-        _executionButton = _toolkit.createButton(_form.getBody(), BUTTON_EXECUTE, SWT.PUSH | SWT.CENTER);
-        _executionButton.setFont(ApplicationRegistry.getFont(FONT_BUTTON));
-        GridData layoutData = new GridData(SWT.CENTER, SWT.TOP, true, false);
-        layoutData.verticalIndent = 20;
-        _executionButton.setLayoutData(layoutData);
-        
-        _resultsComposite = _toolkit.createComposite(_form.getBody(), SWT.NONE);
-        layoutData = new GridData(SWT.FILL, SWT.FILL, true, true);
-        layoutData.verticalIndent = 20;
-        _resultsComposite.setLayoutData(layoutData);
-        _resultsComposite.setLayout(new GridLayout());
-    }
-    
-    /**
-     * @see TabControl#getControl()
-     */
-    public Control getControl()
-    {
-        return _form;
-    }
-    
-    @Override
-    public void refresh(ManagedBean mbean)
-    {
-        _mbean = mbean;
-        _virtualHostName = _mbean.getVirtualHostName();
-        
-        // Setting the form to be invisible. Just in case the mbean server connection
-        // is done and it takes time in getting the response, then the ui should be blank
-        // instead of having half the widgets displayed.
-        _form.setVisible(false);
-        
-        ViewUtility.disposeChildren(_paramsComposite);
-        createParameterWidgets();
-        
-        // Set button text and add appropriate listener to button.
-        // If there are no parameters and it is info operation, then operation gets executed
-        // and result is displayed
-        List<ParameterData> params = _opData.getParameters();
-        if (params != null && !params.isEmpty())
-        {            
-            setButton(BUTTON_EXECUTE);
-        }
-        else if (_opData.getImpact() == OPERATION_IMPACT_ACTION)
-        {
-            setButton(BUTTON_EXECUTE);
-        }
-        else if (_opData.getImpact() == OPERATION_IMPACT_INFO)
-        {
-            setButton(BUTTON_REFRESH);
-            executeAndShowResults();
-        }
-        
-        _form.setVisible(true);
-        layout();
-    }
-    
-    public void layout()
-    {
-        _form.layout(true);
-        _form.getBody().layout(true, true);
-    }
-    
-    /**
-     * populates the header composite, containing the operation name and description.
-     */
-    private void setHeader()
-    {
-        _form.setText(ViewUtility.getDisplayText(_opData.getName()));
-        _headerComposite.setLayout(new GridLayout(2, false));
-        //operation description
-        Label label = _toolkit.createLabel(_headerComposite,  DESCRIPTION + " : ");
-        label.setFont(ApplicationRegistry.getFont(FONT_BOLD));
-        label.setLayoutData(new GridData(SWT.LEAD, SWT.TOP, false, false));
-        
-        label = _toolkit.createLabel(_headerComposite,  _opData.getDescription());
-        label.setFont(ApplicationRegistry.getFont(FONT_NORMAL));
-        label.setLayoutData(new GridData(SWT.LEAD, SWT.TOP, true, false));
-        
-        _headerComposite.layout();
-    }
-    
-    /**
-     * Creates the widgets for operation parameters if there are any
-     */
-    private void createParameterWidgets()
-    {
-        List<ParameterData> params = _opData.getParameters();
-        if (params == null || params.isEmpty())
-        {
-            return;
-        }
-        
-        // Customised parameter widgets        
-        if (_mbean.isExchange() &&
-            EXCHANGE_TYPE_VALUES[2].equals(_mbean.getProperty(EXCHANGE_TYPE)) &&
-            _opData.getName().equalsIgnoreCase(OPERATION_CREATE_BINDING))
-        {                                  
-            customCreateNewBinding(); 
-            return;
-        }
-        // end of Customised parameter widgets       
-        
-        _paramsComposite.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false));
-        _paramsComposite.setLayout(new FormLayout());
-        int parameterPositionOffset = 0;
-        for (ParameterData param : params)
-        {            
-            boolean valueInCombo = false;
-            Label label = _toolkit.createLabel(_paramsComposite, ViewUtility.getDisplayText(param.getName()));
-            FormData formData = new FormData();
-            if (params.indexOf(param) == 0)
-            {
-                parameterPositionOffset = 0;
-            }
-            else
-            {
-                parameterPositionOffset += heightForAParameter;
-            }
-            formData.top = new FormAttachment(0, parameterPositionOffset + 2);
-            formData.right = new FormAttachment(labelWidth);
-            label.setLayoutData(formData);
-            label.setToolTipText(param.getDescription());
-            
-            formData = new FormData();
-            formData.top = new FormAttachment(0, parameterPositionOffset);
-            formData.left = new FormAttachment(label, 5);
-            formData.right = new FormAttachment(valueWidth);
-            // this will contain the list of items, if the list is to be made available to choose from
-            // e.g. the list of exchanges
-            String[] items = null;
-            if (param.getName().equals(QUEUE))
-            {
-                List<String> qList = ApplicationRegistry.getServerRegistry(_mbean).getQueueNames(_virtualHostName);
-                // Customization for AMQQueueMBean method OPERATION_MOVE_MESSAGES
-                if (_opData.getName().equals(OPERATION_MOVE_MESSAGES))
-                {
-                    qList.remove(_mbean.getName());    
-                }
-                // End of Customization
-                items = qList.toArray(new String[0]);
-            }
-            else if (param.getName().equals(EXCHANGE))
-            {
-                items = ApplicationRegistry.getServerRegistry(_mbean).getExchangeNames(_virtualHostName);
-            }
-            else if (param.getName().equals(EXCHANGE_TYPE))
-            {
-                items = EXCHANGE_TYPE_VALUES;
-            }
-            else if (isUserListParameter(param))
-            {
-                List<String> list = ApplicationRegistry.getServerRegistry(_mbean).getUsernames();
-                if (list != null && !list.isEmpty())
-                {
-                    items = list.toArray(new String[0]);
-                }
-            }
-            
-            if (items != null)
-            {
-                org.eclipse.swt.widgets.List _list = new org.eclipse.swt.widgets.List(_paramsComposite, SWT.BORDER | SWT.V_SCROLL);
-                int listSize = _form.getClientArea().height * 2 / 3;
-                int itemsHeight = items.length * (_list.getItemHeight() + 2);
-                // Set a min height for the list widget (set it to min 4 items)
-                if (items.length < 4)
-                {
-                    itemsHeight = 4 * (_list.getItemHeight() + 2);
-                }
-                
-                listSize = (listSize > itemsHeight) ? itemsHeight : listSize;
-                parameterPositionOffset = parameterPositionOffset + listSize;
-                formData.bottom = new FormAttachment(0, parameterPositionOffset);
-                _list.setLayoutData(formData);
-                _list.setData(param);
-                _list.setItems(items);
-                _list.addSelectionListener(parameterSelectionListener);
-                valueInCombo = true;
-            }
-            else if (param.isBoolean())
-            {
-                Button booleanButton = _toolkit.createButton(_paramsComposite, "", SWT.CHECK);
-                booleanButton.setLayoutData(formData);
-                booleanButton.setData(param);
-                booleanButton.addSelectionListener(booleanSelectionListener);
-                valueInCombo = true;                
-            }
-            else
-            {
-                int style = SWT.NONE;
-                if (PASSWORD.equalsIgnoreCase(param.getName()))
-                {
-                    style = SWT.PASSWORD;
-                }
-                Text text = _toolkit.createText(_paramsComposite, "", style);
-                formData = new FormData();
-                formData.top = new FormAttachment(0, parameterPositionOffset);
-                formData.left = new FormAttachment(label, 5);
-                formData.right = new FormAttachment(valueWidth);
-                text.setLayoutData(formData);
-                // Listener to assign value to the parameter
-                text.addKeyListener(keyListener);
-                // Listener to verify if the entered key is valid
-                text.addVerifyListener(verifyListener);
-                text.setData(param);
-            }
-            
-            // display the parameter data type next to the text field
-            if (valueInCombo)
-            {
-                label = _toolkit.createLabel(_paramsComposite, "");
-            }
-            else if (PASSWORD.equalsIgnoreCase(param.getName()))
-            {
-                label = _toolkit.createLabel(_paramsComposite, "(String)");
-            }
-            else
-            {
-                String str = param.getType();
-                
-                if (param.getType().lastIndexOf(".") != -1)
-                    str = param.getType().substring(1 + param.getType().lastIndexOf("."));
-                
-                label = _toolkit.createLabel(_paramsComposite, "(" + str + ")");
-            }
-            formData = new FormData();
-            formData.top = new FormAttachment(0, parameterPositionOffset);
-            formData.left = new FormAttachment(valueWidth, 5);
-            label.setLayoutData(formData);
-        }
-    }
-    
-    private boolean isUserListParameter(ParameterData param)
-    {
-        if (_mbean.isAdmin() && param.getName().equals(OPERATION_PARAM_USERNAME)
-                && !_opData.getName().equals(OPERATION_CREATEUSER))
-        {
-            return true;
-        }
-        
-        return false;
-    }
-    
-    /**
-     * Creates customized dispaly for a method "CreateNewBinding" for Headers exchange
-     *
-     */
-    private void customCreateNewBinding()
-    {
-        headerBindingHashMap = new HashMap<Text, Text>();
- 
-        _paramsComposite.setLayout(new GridLayout());
-        _paramsComposite.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, true));
-        final ScrolledComposite scrolledComposite = new ScrolledComposite(_paramsComposite, SWT.BORDER | SWT.V_SCROLL);
-        scrolledComposite.setExpandHorizontal(true);
-        scrolledComposite.setExpandVertical(true);   
-        GridData layoutData = new GridData(SWT.FILL, SWT.TOP, true, true);
-        scrolledComposite.setLayoutData(layoutData);
-        scrolledComposite.setLayout(new GridLayout());
-        
-        final Composite composite = _toolkit.createComposite(scrolledComposite, SWT.NONE);
-        scrolledComposite.setContent(composite);
-        layoutData = new GridData(SWT.FILL, SWT.FILL, true, true);            
-        layoutData.verticalIndent = 20;
-        composite.setLayoutData(layoutData);
-        composite.setLayout(new FormLayout());
-        
-        List<ParameterData> params = _opData.getParameters();
-        ParameterData param = params.get(0);
-        // Queue selection widget
-        Label label = _toolkit.createLabel(composite, ViewUtility.getDisplayText(param.getName()));
-        FormData formData = new FormData();
-        formData.top = new FormAttachment(0, 2);
-        formData.right = new FormAttachment(labelWidth);
-        label.setLayoutData(formData);
-        label.setToolTipText(param.getDescription());
-        
-        formData = new FormData();
-        formData.top = new FormAttachment(0);
-        formData.left = new FormAttachment(label, 5);
-        formData.right = new FormAttachment(valueWidth);
-
-        Combo combo = new Combo(composite, SWT.READ_ONLY | SWT.DROP_DOWN);
-        List<String> qList = ApplicationRegistry.getServerRegistry(_mbean).getQueueNames(_virtualHostName);
-        combo.setItems(qList.toArray(new String[0]));
-        combo.add("Select Queue", 0); 
-        combo.select(0);
-        combo.setLayoutData(formData);
-        combo.setData(param);
-        combo.addSelectionListener(parameterSelectionListener);
-
-        // Binding creation widgets
-        createARowForCreatingHeadersBinding(composite, 1);
-        createARowForCreatingHeadersBinding(composite, 2);
-        createARowForCreatingHeadersBinding(composite, 3);
-        createARowForCreatingHeadersBinding(composite, 4);
-        createARowForCreatingHeadersBinding(composite, 5);
-        createARowForCreatingHeadersBinding(composite, 6);
-        createARowForCreatingHeadersBinding(composite, 7);
-        createARowForCreatingHeadersBinding(composite, 8);
-        
-        final Button addMoreButton = _toolkit.createButton(composite, "Add More", SWT.PUSH);
-        formData = new FormData();
-        formData.top = new FormAttachment(0, heightForAParameter);
-        formData.left = new FormAttachment(70, 5);
-        addMoreButton.setLayoutData(formData);
-        addMoreButton.setData("rowCount", 8);
-        addMoreButton.addSelectionListener(new SelectionAdapter()
-            {
-                public void widgetSelected(SelectionEvent e)
-                {
-                    int count = Integer.parseInt(addMoreButton.getData("rowCount").toString());
-                    createARowForCreatingHeadersBinding(composite, ++count);
-                    addMoreButton.setData("rowCount", count);
-                    scrolledComposite.setMinSize(composite.computeSize(SWT.DEFAULT, SWT.DEFAULT));
-                    composite.layout();
-                    _form.layout();
-                }
-            });
-          
-        scrolledComposite.setMinSize(composite.computeSize(SWT.DEFAULT, SWT.DEFAULT));
-        composite.layout();
-    }
-    
-    /**
-     * Adds a row for adding a binding for Headers Exchange. Used by the method, which creates the customized
-     * layout and widgest for Header's exchange method createNewBinding.
-     * @param parent composite
-     * @param rowCount - row number
-     */
-    private void createARowForCreatingHeadersBinding(Composite parent, int rowCount)
-    {  
-        Label key = _toolkit.createLabel(parent, "Name");
-        FormData formData = new FormData();
-        formData.top = new FormAttachment(0, rowCount * heightForAParameter + 2);
-        formData.right = new FormAttachment(15);
-        key.setLayoutData(formData);
-        
-        Text keyText = _toolkit.createText(parent, "", SWT.NONE);
-        formData = new FormData();
-        formData.top = new FormAttachment(0, rowCount * heightForAParameter);
-        formData.left = new FormAttachment(key, 5);
-        formData.right = new FormAttachment(40);
-        keyText.setLayoutData(formData);
-        keyText.addKeyListener(headerBindingListener);
-        
-        Label value = _toolkit.createLabel(parent, "Value");
-        formData = new FormData();
-        formData.top = new FormAttachment(0, rowCount * heightForAParameter + 2);
-        formData.right = new FormAttachment(45);
-        value.setLayoutData(formData);
-        
-        Text valueText = _toolkit.createText(parent, "", SWT.NONE);
-        formData = new FormData();
-        formData.top = new FormAttachment(0, rowCount * heightForAParameter);
-        formData.left = new FormAttachment(value, 5);
-        formData.right = new FormAttachment(70);
-        valueText.setLayoutData(formData);
-        valueText.addKeyListener(headerBindingListener);
-        
-        // Add these to the map, to retrieve the values while setting the parameter value
-        headerBindingHashMap.put(keyText, valueText);
-    }
-    
-    /**
-     * Sets text and listener for the operation execution button
-     * @param text
-     */
-    private void setButton(String text)
-    {
-        _executionButton.setText(text);
-        _executionButton.removeSelectionListener(refreshListener);
-        _executionButton.removeSelectionListener(operationExecutionListener);
-        
-        if (BUTTON_EXECUTE.equals(text))
-        {
-            _executionButton.addSelectionListener(operationExecutionListener);    
-        }
-        else
-        {
-            _executionButton.addSelectionListener(refreshListener);
-        }
-    }   
-
-    /**
-     * displays the operation result in a pop-up window
-     * @param result
-     */
-    private void populateResults(Object result)
-    {
-        Display display = Display.getCurrent();
-        int width = 610;
-        int height = 400;        
-        Shell shell = ViewUtility.createPopupShell(RESULT, width, height);
-        shell.setImage(ApplicationRegistry.getImage(CONSOLE_IMAGE));
-        ViewUtility.populateCompositeWithData(_toolkit, shell, result);
-       
-        shell.open();
-        while (!shell.isDisposed()) {
-            if (!display.readAndDispatch()) {
-                display.sleep();
-            }
-        }
-        shell.dispose();
-    }
-    
-    /**
-     * Clears the parameter values of the operation
-     */
-    private void clearParameters()
-    {
-        List<ParameterData> params = _opData.getParameters();
-        if (params != null && !params.isEmpty())
-        {
-            for (ParameterData param : params)
-            {
-                param.setDefaultValue();
-            }
-        }
-    }
-    
-    /**
-     * Clears the values entered by the user from parameter value widgets
-     * @param control
-     */
-    private void clearParameterValues(Composite control)
-    {
-        if (control == null || (control.isDisposed()))
-            return;
-        
-        Control[] controls = control.getChildren();
-        if (controls == null || controls.length == 0)
-            return;
-        
-        for (int i = 0; i < controls.length; i++)
-        {
-            if (controls[i] instanceof Combo)
-                ((Combo)controls[i]).select(0);
-            if (controls[i] instanceof org.eclipse.swt.widgets.List)
-                ((org.eclipse.swt.widgets.List)controls[i]).deselectAll();
-            else if (controls[i] instanceof Text)
-                ((Text)controls[i]).setText("");
-            else if (controls[i] instanceof Button)
-                ((Button)controls[i]).setSelection(false);
-            else if (controls[i] instanceof Composite)
-                clearParameterValues((Composite)controls[i]);
-        }
-    }
-    
-    /**
-     * Listener class for operation execution events
-     */
-    private class OperationExecutionListener extends SelectionAdapter
-    {
-        public void widgetSelected(SelectionEvent e)
-        {
-            List<ParameterData> params = _opData.getParameters();
-            if (params != null && !params.isEmpty())
-            {
-                for (ParameterData param : params)
-                { 
-                    if (param.getValue() == null || param.getValue().toString().length() == 0)
-                    {
-                        // Customized check, because for this parameter null is allowed
-                        if (param.getName().equals(ATTRIBUTE_QUEUE_OWNER) &&
-                            _opData.getName().equals(OPERATION_CREATE_QUEUE))
-                        {
-                            continue;
-                        }
-                        // End of custom code
-                        
-                        ViewUtility.popupInfoMessage(_form.getText(), "Please select the " + ViewUtility.getDisplayText(param.getName()));                       
-                        return;
-                    }
-                    
-                    // customized for passwords
-                    String securityMechanism = ApplicationRegistry.getSecurityMechanism();
-                    if ((MECH_CRAMMD5.equals(securityMechanism)) && PASSWORD.equalsIgnoreCase(param.getName()))
-                    {
-                        try
-                        {
-                            param.setValue(ViewUtility.getMD5HashedCharArray(param.getValue()));
-                        }
-                        catch (Exception ex)
-                        {
-                            MBeanUtility.handleException(_mbean, ex);
-                            return;
-                        }
-                    }
-                    // end of customization
-                }
-            }
-            
-            if (_opData.getImpact() == OPERATION_IMPACT_ACTION)
-            {
-                String bean = _mbean.getName() == null ? _mbean.getType() : _mbean.getName();
-                int response = ViewUtility.popupConfirmationMessage(bean, "Do you want to " + _form.getText()+ " ?");
-                if (response == SWT.YES)
-                {
-                    executeAndShowResults();
-                }            
-            }
-            else
-            {
-                executeAndShowResults();
-            }
-            
-            if (_mbean.isAdmin() && _opData.getName().equals(OPERATION_DELETEUSER))
-            {
-                refresh(_mbean);
-            }
-            else
-            {
-                clearParameters();
-                clearParameterValues(_paramsComposite);
-            }
-        }
-    }
-    
-    // Listener for the "Refresh" execution button
-    private class RefreshListener extends SelectionAdapter
-    {
-        public void widgetSelected(SelectionEvent e)
-        {
-            executeAndShowResults();
-        }
-    }
-    
-    /**
-     * Executres the operation, gets the result from server and displays to the user
-     */
-    private void executeAndShowResults()
-    {
-        Object result = null;
-        try
-        {
-            result = MBeanUtility.execute(_mbean, _opData);     
-        }
-        catch(Exception ex)
-        {
-            MBeanUtility.handleException(_mbean, ex);
-            return;
-        }
-        
-        // Custom code for Admin mbean operation
-        /* These custome codes here are to make the GUI look more user friendly. 
-         * Here we are adding the users to a list, which will be used to list username to be selected on
-         * pages like "delete user", "set password" instead of typing the username
-        */
-        if (_mbean.isAdmin())
-        {
-            if (_opData.getName().equals(OPERATION_VIEWUSERS))
-            {
-                ApplicationRegistry.getServerRegistry(_mbean).setUserList(extractUserList(result));
-            }
-            else if (_opData.getName().equals(OPERATION_DELETEUSER))
-            {
-                List<String> list = ApplicationRegistry.getServerRegistry(_mbean).getUsernames();
-                Object userName = _opData.getParameterValue(OPERATION_PARAM_USERNAME);
-                if ((list != null) && !list.isEmpty() && (userName != null))
-                {
-                    list.remove(userName);
-                    ApplicationRegistry.getServerRegistry(_mbean).setUserList(list);
-                }                
-            }
-            else if (_opData.getName().equals(OPERATION_CREATEUSER))
-            {
-                List<String> list = ApplicationRegistry.getServerRegistry(_mbean).getUsernames();
-                Object userName = _opData.getParameterValue(OPERATION_PARAM_USERNAME);
-                if ((list != null) && !list.isEmpty() && (userName != null))
-                {
-                    list.add(userName.toString());
-                    ApplicationRegistry.getServerRegistry(_mbean).setUserList(list);
-                }                
-            }
-        }
-        // end of custom code
-        
-        // Some mbeans have only "type" and no "name".
-        String title = _mbean.getType();
-        if (_mbean.getName() != null && _mbean.getName().length() != 0)
-        {
-            title = _mbean.getName();
-        }
-        
-        if (_opData.isReturnTypeVoid())
-        {
-            ViewUtility.popupInfoMessage(title, OPERATION_SUCCESSFUL);
-        }
-        else if (_opData.isReturnTypeBoolean())
-        {
-            boolean success = Boolean.parseBoolean(result.toString());
-            String message = success ? OPERATION_SUCCESSFUL : OPERATION_UNSUCCESSFUL;
-            ViewUtility.popupInfoMessage(title, message);
-        }
-        else if (_opData.getParameters() != null && !_opData.getParameters().isEmpty())
-        {
-            populateResults(result);
-        }
-        else
-        {
-            ViewUtility.disposeChildren(_resultsComposite);
-            ViewUtility.populateCompositeWithData(_toolkit, _resultsComposite, result);
-            _resultsComposite.layout();
-            _form.layout();
-        }
-
-    }
-    
-    private List<String> extractUserList(Object result)
-    {
-        if (!(result instanceof TabularDataSupport))
-        {
-            return null;
-        }
-        
-        TabularDataSupport tabularData = (TabularDataSupport)result;
-        Collection<Object> records = tabularData.values();
-        List<String> list = new ArrayList<String>();
-        for (Object o : records)
-        {
-            CompositeData data = (CompositeData) o;
-            if (data.containsKey(USERNAME))
-            {
-                list.add(data.get(USERNAME).toString());
-            }
-        }
-        
-        return list;
-    }
-    
-    /**
-     * Listener class for the operation parameters widget
-     */
-    private class ParameterSelectionListener extends SelectionAdapter
-    {
-        public void widgetSelected(SelectionEvent e)
-        {
-            ParameterData parameter = (ParameterData)e.widget.getData();
-            parameter.setValue(null);
-            if (e.widget instanceof Combo)
-            {
-                Combo combo = (Combo)e.widget;
-                if (combo.getSelectionIndex() > 0)
-                {
-                    String item = combo.getItem(combo.getSelectionIndex());                
-                    parameter.setValueFromString(item);
-                }
-            }
-            else if (e.widget instanceof org.eclipse.swt.widgets.List)
-            {
-                org.eclipse.swt.widgets.List list = (org.eclipse.swt.widgets.List)e.widget;
-                String[] selectedItems = list.getSelection();
-                if (selectedItems.length > 0)
-                {
-                    parameter.setValueFromString(selectedItems[0]);
-                }
-            }
-        }
-    }
-    
-    /**
-     * Listener class for boolean parameter widgets
-     */
-    private class BooleanSelectionListener extends SelectionAdapter
-    {
-        public void widgetSelected(SelectionEvent e)
-        {
-            ParameterData parameter = (ParameterData)(e.widget.getData());
-            if (e.widget instanceof Button)
-            {
-                Button button = (Button)e.widget;
-                parameter.setValue(button.getSelection());
-            }
-            else if (e.widget instanceof Combo)
-            {
-                Combo combo = (Combo)e.widget;
-                String item = combo.getItem(combo.getSelectionIndex());                
-                parameter.setValueFromString(item);
-            }
-        }
-    }
-    
-    /**
-     * Listener class for the operation parameter value widget (Text field)
-     */
-    private class KeyListenerImpl extends KeyAdapter
-    {
-        public void keyReleased(KeyEvent e) 
-        {
-            if (!(e.widget instanceof Text))
-                return;
-            
-            Text text = (Text)e.widget;
-            // Get the parameters widget and assign the text to the parameter
-            String strValue = text.getText();
-            ParameterData parameter = (ParameterData)text.getData();
-            try
-            {
-                parameter.setValueFromString(strValue);
-            }
-            catch(Exception ex)
-            {
-                // Exception occured in setting parameter value. 
-                // ignore it. The value will not be assigned to the parameter
-            }
-        }
-    }
-    
-    /**
-     * Listener class for HeaderExchange's new binding widgets. Used when the new bindings are 
-     * being created for Header's Exchange
-     */
-    private class HeaderBindingKeyListener extends KeyAdapter
-    {
-        public void keyReleased(KeyEvent e) 
-        {
-            ParameterData param = _opData.getParameters().get(1);
-            StringBuffer paramValue = new StringBuffer();
-            for (Entry<Text, Text> entry : headerBindingHashMap.entrySet())
-            {
-                
-                Text nameText = entry.getKey();
-                String name = nameText.getText();
-                Text valueText = entry.getValue();
-                String value = valueText.getText();
-                if ((name != null) && (name.length() != 0) && (value != null) && (value.length() != 0))
-                {
-                    if (paramValue.length() != 0)
-                    {
-                        paramValue.append(",");
-                    }
-                    paramValue.append(name + "=" + value);
-                }
-            }
-            
-            param.setValue(paramValue.toString());
-        }
-    }
-    
-    /**
-     * Listener class for verifying the user input with parameter type
-     */
-    private class VerifyListenerImpl implements VerifyListener
-    {
-        public void verifyText(VerifyEvent event)
-        {
-            ParameterData parameter = (ParameterData)event.widget.getData();
-            String text = event.text;
-            char [] chars = new char [text.length ()];
-            text.getChars(0, chars.length, chars, 0);           
-            String type = parameter.getType();
-            if (type.equals("int") || type.equals("java.lang.Integer") ||
-                type.equals("long") || type.equals("java.lang.Long"))
-            {
-                for (int i=0; i<chars.length; i++)
-                {
-                    if (!('0' <= chars [i] && chars [i] <= '9'))
-                    {
-                        event.doit = false;
-                        return;
-                    }
-                }
-                
-            }
-        }
-    }
-    
-}
diff --git a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/QueueTypeTabControl.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/QueueTypeTabControl.java
deleted file mode 100644
index 31a0bc857b..0000000000
--- a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/QueueTypeTabControl.java
+++ /dev/null
@@ -1,296 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-package org.apache.qpid.management.ui.views;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-import org.apache.qpid.management.ui.ApplicationRegistry;
-import org.apache.qpid.management.ui.Constants;
-import org.apache.qpid.management.ui.ManagedBean;
-import org.apache.qpid.management.ui.ServerRegistry;
-import org.apache.qpid.management.ui.jmx.MBeanUtility;
-import org.apache.qpid.management.ui.model.AttributeData;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.TabFolder;
-
-/**
- * Controller class, which takes care of displaying appropriate information and widgets for Queues.
- * This allows user to select Queues and add those to the navigation view
- */
-public class QueueTypeTabControl extends MBeanTypeTabControl
-{
-    private boolean _showTempQueues = false;
-    private Button _sortBySizeButton = null;
-    private Button _sortByConsumercountButton = null;
-    private Button _sortByNameButton = null;
-    private Button _showTempQueuesButton = null;
-    
-    private ComparatorImpl _sorterByAttribute = new ComparatorImpl();
-    
-    // Map required for sorting queues based on attribute values
-    private Map<AttributeData, ManagedBean> _queueDepthMap = new LinkedHashMap<AttributeData, ManagedBean>();
-    // Map used for sorting Queues based on consumer count
-    private Map<AttributeData, ManagedBean> _queueConsumerCountMap = new LinkedHashMap<AttributeData, ManagedBean>();
-
-    
-    public QueueTypeTabControl(TabFolder tabFolder)
-    {
-        super(tabFolder, Constants.QUEUE);
-        createWidgets();
-    }
-    
-    protected void createWidgets()
-    {        
-        createHeaderComposite(getFormComposite());
-        createButtonsComposite(getFormComposite());
-        createListComposite();
-    }
-    
-    @Override
-    public void refresh() throws Exception
-    {
-        setLabelValues();
-        selectDefaultSortingButton();
-        populateList();
-        layout();
-    }
-    
-    /**
-     * populates the map with mbean name and the mbean object.
-     * @throws Exception
-     */
-    protected void populateList() throws Exception
-    {
-        // map should be cleared before populating it with new values
-        getMBeansMap().clear();
-        _queueDepthMap.clear();
-        _queueConsumerCountMap.clear();
-        
-        ServerRegistry serverRegistry = ApplicationRegistry.getServerRegistry(MBeanView.getServer());
-        String[] items = null;
-        java.util.List<ManagedBean> list = null;
-        
-        // populate the map and list with appropriate mbeans
-        list = serverRegistry.getQueues(MBeanView.getVirtualHost());
-        items = getQueueItems(list);
-        // sort the refreshed list in the selected order
-        if (_sortBySizeButton.getSelection())
-        {
-            sortQueuesByQueueDepth();
-        }
-        else if (_sortByConsumercountButton.getSelection())
-        {
-            sortQueuesByConsumerCount();
-        }
-        else
-        {
-            getListWidget().setItems(items);
-        }      
-    }
-    
-    private void selectDefaultSortingButton()
-    {
-        _sortByNameButton.setSelection(true);
-        _sortBySizeButton.setSelection(false);
-        _sortByConsumercountButton.setSelection(false);
-        
-        _showTempQueues = false;
-        _showTempQueuesButton.setSelection(_showTempQueues);
-    }
-     
-    protected void createListComposite()
-    {
-        // Composite to contain the item list 
-        Composite composite = getToolkit().createComposite(getFormComposite());
-        GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
-        composite.setLayoutData(gridData);
-        GridLayout layout = new GridLayout(2, true);
-        layout.verticalSpacing = 0;
-        composite.setLayout(layout);
-        
-        createListComposite(composite);        
-        
-        // Composite to contain buttons like - Sort by size
-        Composite _sortingComposite = getToolkit().createComposite(composite);
-        gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
-        _sortingComposite.setLayoutData(gridData);
-        GridLayout gridLayout = new GridLayout();
-        gridLayout.verticalSpacing = 20;
-        _sortingComposite.setLayout(gridLayout);
-        
-        Group sortingGroup = new Group(_sortingComposite, SWT.SHADOW_NONE);
-        sortingGroup.setBackground(_sortingComposite.getBackground());
-        sortingGroup.setText(" Sort List By ");
-        sortingGroup.setFont(ApplicationRegistry.getFont(Constants.FONT_BOLD));
-        gridData = new GridData(SWT.CENTER, SWT.TOP, true, false);
-        sortingGroup.setLayoutData(gridData);
-        sortingGroup.setLayout(new GridLayout());
-        
-        _sortByNameButton = getToolkit().createButton(sortingGroup, Constants.QUEUE_SORT_BY_NAME, SWT.RADIO);
-        gridData = new GridData(SWT.LEAD, SWT.CENTER, true, false);
-        _sortByNameButton.setLayoutData(gridData);     
-        _sortByNameButton.addSelectionListener(new SelectionAdapter(){
-            public void widgetSelected(SelectionEvent e)
-            {
-                try
-                {
-                    // sort the stored list of items
-                    java.util.List<String> list = new ArrayList<String>(getMBeansMap().keySet());
-                    Collections.sort(list);
-                    getListWidget().setItems(list.toArray(new String[0]));
-                }
-                catch (Exception ex)
-                {
-                    MBeanUtility.handleException(ex);
-                }
-            }
-        });
-               
-        _sortBySizeButton = getToolkit().createButton(sortingGroup, Constants.QUEUE_SORT_BY_DEPTH, SWT.RADIO);
-        gridData = new GridData(SWT.LEAD, SWT.CENTER, true, false);
-        _sortBySizeButton.setLayoutData(gridData);     
-        _sortBySizeButton.addSelectionListener(new SelectionAdapter(){
-            public void widgetSelected(SelectionEvent e)
-            {
-                try
-                {
-                    // sort the stored list of items
-                    sortQueuesByQueueDepth();
-                }
-                catch (Exception ex)
-                {
-                    MBeanUtility.handleException(ex);
-                }
-            }
-        });
-        
-        _sortByConsumercountButton = getToolkit().createButton(sortingGroup, Constants.QUEUE_SORT_BY_CONSUMERCOUNT, SWT.RADIO);
-        gridData = new GridData(SWT.LEAD, SWT.CENTER, true, false);
-        _sortByConsumercountButton.setLayoutData(gridData);
-        _sortByConsumercountButton.addSelectionListener(new SelectionAdapter(){
-            public void widgetSelected(SelectionEvent e)
-            {
-                try
-                {
-                    sortQueuesByConsumerCount();
-                }
-                catch (Exception ex)
-                {
-                    MBeanUtility.handleException(ex);
-                }
-            }
-        });
-        
-        _showTempQueuesButton = getToolkit().createButton(_sortingComposite, Constants.QUEUE_SHOW_TEMP_QUEUES, SWT.CHECK);
-        _showTempQueuesButton.setLayoutData(new GridData(SWT.CENTER, SWT.TOP, true, false));
-        _showTempQueuesButton.addSelectionListener(new SelectionAdapter(){
-            public void widgetSelected(SelectionEvent e)
-            {
-                Button button = (Button)e.widget;
-                _showTempQueues = button.getSelection();
-                try
-                {
-                    populateList();
-                }
-                catch (Exception ex)
-                {
-                    MBeanUtility.handleException(ex);
-                }
-            }
-        });
-    }
-    
-
-    private String[] getQueueItems(java.util.List<ManagedBean> list) throws Exception
-    {
-        if (list == null)
-            return new String[0];
-        
-        // Sort the list. It will keep the mbeans in sorted order in the _queueMap, which is required for
-        // sorting the queue according to size etc
-        Collections.sort(list, getMBeanNameSorter());
-        java.util.List<String> items = new ArrayList<String>();;
-        int i = 0;
-        for (ManagedBean mbean : list)
-        {
-            if ((!_showTempQueues && mbean.isTempQueue()))
-            {
-                continue;
-            }
-            AttributeData data = MBeanUtility.getAttributeData(mbean, Constants.ATTRIBUTE_QUEUE_DEPTH);
-            String value = mbean.getName() + " (" + data.getValue().toString() + " KB)";
-            items.add(value);
-            //items[i] = mbean.getName() + " (" + value + " KB)";
-            getMBeansMap().put(value, mbean);
-            _queueDepthMap.put(data, mbean);
-            data = MBeanUtility.getAttributeData(mbean, Constants.ATTRIBUTE_QUEUE_CONSUMERCOUNT);
-            _queueConsumerCountMap.put(data, mbean);
-            i++;
-        }
-        
-        return items.toArray(new String[0]);
-    }
-    
-    
-    private void sortQueuesByQueueDepth()
-    {
-        // Queues are already in the alphabetically sorted order in _queueMap, now sort for queueDepth
-        java.util.List<AttributeData> list = new ArrayList<AttributeData>(_queueDepthMap.keySet());
-        Collections.sort(list, _sorterByAttribute);
-        
-        String[] items = new String[list.size()];
-        int i = 0;
-        for (AttributeData data : list)
-        {
-            ManagedBean mbean = _queueDepthMap.get(data);
-            String value = data.getValue().toString();
-            items[i++] = mbean.getName() + " (" + value + " KB)";
-        }
-        getListWidget().setItems(items);
-    }
-    
-    private void sortQueuesByConsumerCount()
-    {
-        java.util.List<AttributeData> list = new ArrayList<AttributeData>(_queueConsumerCountMap.keySet());
-        Collections.sort(list, _sorterByAttribute);
-        
-        String[] items = new String[list.size()];
-        int i = 0;
-        for (AttributeData data : list)
-        {
-            ManagedBean mbean = _queueConsumerCountMap.get(data);
-            String value = data.getValue().toString();
-            items[i++] = mbean.getName() + " (" + value + " )";
-        }
-        getListWidget().setItems(items);
-    }
-}
diff --git a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/TabControl.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/TabControl.java
deleted file mode 100644
index c13c92066c..0000000000
--- a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/TabControl.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.management.ui.views;
-
-import java.util.ArrayList;
-
-import org.apache.qpid.management.ui.ManagedBean;
-import org.apache.qpid.management.ui.model.OperationData;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.TabFolder;
-
-/**
- * Abstract class for all the control classes of tabs.
- * @author Bhupendra Bhardwaj
- */
-public abstract class TabControl
-{
-    protected ManagedBean _mbean = null;
-    protected TabFolder _tabFolder = null;
-    
-    private static java.util.List<String> simpleTypes = new ArrayList<String>();
-    
-    static
-    {
-        simpleTypes.add("java.math.BigDecimal");
-        simpleTypes.add("java.math.BigInteger");
-        simpleTypes.add("java.lang.Boolean");
-        simpleTypes.add("java.lang.Byte");
-        simpleTypes.add("java.lang.Character");
-        simpleTypes.add("java.util.Date");
-        simpleTypes.add("java.lang.Double");
-        simpleTypes.add("java.lang.Float");
-        simpleTypes.add("java.lang.Integer");
-        simpleTypes.add("java.lang.Long");
-        simpleTypes.add("javax.management.ObjectName");
-        simpleTypes.add("java.lang.Short");
-        simpleTypes.add("java.lang.String");
-        simpleTypes.add("boolean");
-    }
-    
-    public TabControl(TabFolder tabFolder)
-    {
-        _tabFolder = tabFolder;
-    }
-    
-    /**
-     * @return controller composite for the tab
-     */
-    public Control getControl()
-    {
-        return null;
-    }
-    
-    public void refresh(ManagedBean mbean)
-    {
-        if (mbean == null)
-        {
-            refresh();
-        }
-    }
-    
-    public void refresh()
-    {
-        
-    }
-    
-    public void refresh(ManagedBean mbean, OperationData opData)
-    {
-        
-    }
-    
-    /**
-     * Sets focus on a widget
-     */
-    public void setFocus()
-    {
-        
-    }
-    
-    public boolean isSimpleType(Object data)
-    {        
-        return simpleTypes.contains(data.getClass().getName());
-    }
-}
diff --git a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/TreeObject.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/TreeObject.java
deleted file mode 100644
index 9545ed9876..0000000000
--- a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/TreeObject.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.management.ui.views;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.qpid.management.ui.Constants;
-import org.apache.qpid.management.ui.ManagedBean;
-import org.apache.qpid.management.ui.ManagedObject;
-
-public class TreeObject
-{
-    private String _name;
-    private String _type;
-    private String _virtualHost;
-    private TreeObject _parent;
-    private List<TreeObject> _children = new ArrayList<TreeObject>();
-    private ManagedObject _object;
-    
-    public TreeObject(String name, String type)
-    {
-       this._name = name;
-       this._type = type;
-    }
-    
-    public TreeObject(ManagedObject obj)
-    {
-        _name = obj.getName();
-        if (_name == null && (obj instanceof ManagedBean))
-        {
-            String[] types = ((ManagedBean)obj).getType().split("\\.");
-            _name = types[types.length - 1];
-        }
-        this._type = Constants.MBEAN;
-        this._object = obj;
-    }
-    
-    public void addChild(TreeObject child)
-    {
-        _children.add(child);
-    }
-    
-    public void addChildren(List<TreeObject> subList)
-    {
-        _children.addAll(subList);
-    }
-    
-    public List<TreeObject> getChildren()
-    {
-        return _children;
-    }
-    
-    public void setChildren(List<TreeObject> children)
-    {
-        this._children = children;
-    }
-    
-    public void setName(String value)
-    {
-        _name = value;
-    }
-    
-    public String getName()
-    {
-        return _name;
-    }
-    public String getType()
-    {
-        return _type;
-    }
-    
-    public String getVirtualHost()
-    {
-        // To make it work with the broker with no virtual host implementation
-        return _virtualHost == null ? Constants.DEFAULT_VH : _virtualHost;
-    }
-    
-    public void setVirtualHost(String vHost)
-    {
-        _virtualHost = vHost;
-    }
-
-    public ManagedObject getManagedObject()
-    {
-        return _object;
-    }
-
-    public void setManagedObject(ManagedObject obj)
-    {
-        this._object = obj;
-    }
-    
-    public TreeObject getParent()
-    {
-        return _parent;
-    }
-    
-    public void setParent(TreeObject parent)
-    {
-        this._parent = parent;
-        
-        if (parent != null)
-        {
-            parent.addChild(this);
-        }
-    }
-}
diff --git a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/VHNotificationsTabControl.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/VHNotificationsTabControl.java
deleted file mode 100644
index be25707bd3..0000000000
--- a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/VHNotificationsTabControl.java
+++ /dev/null
@@ -1,483 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-package org.apache.qpid.management.ui.views;
-
-import static org.apache.qpid.management.ui.Constants.BUTTON_CLEAR;
-import static org.apache.qpid.management.ui.Constants.BUTTON_REFRESH;
-import static org.apache.qpid.management.ui.Constants.CONSOLE_IMAGE;
-import static org.apache.qpid.management.ui.Constants.FONT_BUTTON;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.qpid.management.ui.ApplicationRegistry;
-import org.apache.qpid.management.ui.ServerRegistry;
-import org.apache.qpid.management.ui.model.NotificationObject;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.TabFolder;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.forms.widgets.Form;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-public class VHNotificationsTabControl extends TabControl
-{
-    protected FormToolkit  _toolkit;
-    protected Form _form;
-    protected Table _table = null;
-    protected TableViewer _tableViewer  = null;
-     
-    protected Thread worker = null;
-    
-    protected List<NotificationObject> _notifications = null;
-    
-    private static final String COLUMN_OBJ = "Object Name";
-    private static final String COLUMN_SEQ  = "Sequence No";
-    private static final String COLUMN_TIME = "TimeStamp";
-    private static final String COLUMN_TYPE  = "Type";
-    private static final String COLUMN_MSG  = "Notification Message";
-    protected static final String[] _tableTitles = new String [] {
-            COLUMN_OBJ,
-            COLUMN_SEQ,
-            COLUMN_TIME,
-            COLUMN_TYPE,
-            COLUMN_MSG
-         };
-    
-    protected Button _clearButton       = null;
-    protected Button _refreshButton       = null;
-    
-    public VHNotificationsTabControl(TabFolder tabFolder)
-    {
-        super(tabFolder);
-        _toolkit = new FormToolkit(_tabFolder.getDisplay());
-        _form = _toolkit.createForm(_tabFolder);
-        GridLayout gridLayout = new GridLayout();      
-        gridLayout.marginWidth = 0;
-        gridLayout.marginHeight = 0;       
-        _form.getBody().setLayout(gridLayout);
-        
-        worker = new Thread(new Worker()); 
-        worker.start();
-    }
-    
-    protected void createWidgets()
-    {       
-        addButtons();  
-        createTableViewer();
-    }
-    
-    /**
-     * @see TabControl#getControl()
-     */
-    public Control getControl()
-    {
-        if (_table == null)
-        {
-            createWidgets();
-        }
-        return _form;
-    }
-
-    /**
-     * Creates clear buttin and refresh button
-     */
-    protected void addButtons()
-    {    
-        Composite composite = _toolkit.createComposite(_form.getBody(), SWT.NONE);
-        composite.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false));
-        composite.setLayout(new GridLayout(2, true));
-        
-        // Add Clear Button
-        _clearButton = _toolkit.createButton(composite, BUTTON_CLEAR, SWT.PUSH | SWT.CENTER);
-        _clearButton.setFont(ApplicationRegistry.getFont(FONT_BUTTON));
-        GridData gridData = new GridData(SWT.LEAD, SWT.TOP, true, false);
-        gridData.widthHint = 80;
-        _clearButton.setLayoutData(gridData);
-        _clearButton.addSelectionListener(new SelectionAdapter()
-            {
-                public void widgetSelected(SelectionEvent e)
-                {  
-                    //TODO : Get selected rows and clear those
-                    IStructuredSelection ss = (IStructuredSelection)_tableViewer.getSelection();
-                    ServerRegistry serverRegistry = ApplicationRegistry.getServerRegistry(MBeanView.getServer());
-                    serverRegistry.clearNotifications(null, ss.toList());
-                    refresh();
-                }
-            });
-        
-        // Add Refresh Button
-        _refreshButton = _toolkit.createButton(composite, BUTTON_REFRESH, SWT.PUSH | SWT.CENTER);
-        _refreshButton.setFont(ApplicationRegistry.getFont(FONT_BUTTON));
-        gridData = new GridData(SWT.TRAIL, SWT.TOP, true, false);
-        gridData.widthHint = 80;
-        _refreshButton.setLayoutData(gridData);
-        _refreshButton.addSelectionListener(new SelectionAdapter()
-            {
-                public void widgetSelected(SelectionEvent e)
-                { 
-                    refresh();
-                }
-            });
-    }
-    
-    /**
-     * Creates table to display notifications
-     */
-    private void createTable()
-    {
-        _table = _toolkit.createTable(_form.getBody(), SWT.MULTI | SWT.FULL_SELECTION);
-        _table.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
-        
-        TableColumn column = new TableColumn(_table, SWT.NONE);
-        column.setText(_tableTitles[0]);
-        column.setWidth(100);
-        
-        column = new TableColumn(_table, SWT.NONE);
-        column.setText(_tableTitles[1]);
-        column.setWidth(100); 
-
-        column = new TableColumn(_table, SWT.NONE);
-        column.setText(_tableTitles[2]);
-        column.setWidth(130);
-        
-        column = new TableColumn(_table, SWT.NONE);
-        column.setText(_tableTitles[3]);
-        column.setWidth(100);
-        
-        column = new TableColumn(_table, SWT.NONE);
-        column.setText(_tableTitles[4]);
-        column.setWidth(500);
-        
-        _table.setHeaderVisible(true);
-        _table.setLinesVisible(true);
-    }
-    
-    /**
-     * Creates JFace viewer for the notifications table
-     */
-    protected void createTableViewer()
-    {
-        createTable();
-        _tableViewer = new TableViewer(_table);
-        //_tableViewer.getControl().setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
-        _tableViewer.setUseHashlookup(true);
-        _tableViewer.setContentProvider(new ContentProviderImpl());
-        _tableViewer.setLabelProvider(new LabelProviderImpl());
-        _tableViewer.setColumnProperties(_tableTitles);
-        /*
-        CellEditor[] cellEditors = new CellEditor[_tableTitles.length];
-        TextCellEditor textEditor = new TextCellEditor(table);
-        cellEditors[0] = textEditor;
-        textEditor = new TextCellEditor(table);
-        cellEditors[1] = textEditor;
-        textEditor = new TextCellEditor(table);
-        cellEditors[2] = textEditor;
-        textEditor = new TextCellEditor(table);
-        cellEditors[3] = textEditor;
-        
-        // Assign the cell editors to the viewer 
-        _tableViewer.setCellEditors(cellEditors);
-        _tableViewer.setCellModifier(new TableCellModifier());
-        */
-        
-        addTableListeners();
-        
-        //_tableViewer.addSelectionChangedListener(new );
-        
-        //_notificationDetails = new Composite(_tabControl, SWT.BORDER);
-        //_notificationDetails.setLayoutData(new GridData(GridData.FILL_BOTH));
-        
-        //_tabControl.layout();
-        //viewerComposite.layout();
-    }
-    
-    /**
-     * Adds listeners to the viewer for displaying notification details 
-     */
-    protected void addTableListeners()
-    {
-        _tableViewer.addDoubleClickListener(new IDoubleClickListener()
-            {
-                Display display = null;
-                Shell   shell = null;
-                public void doubleClick(DoubleClickEvent event)
-                {
-                    display = Display.getCurrent();
-                    shell = new Shell(display, SWT.BORDER | SWT.CLOSE | SWT.MIN | SWT.MAX | SWT.RESIZE);
-                    shell.setText("Notification");
-                    shell.setImage(ApplicationRegistry.getImage(CONSOLE_IMAGE));
-
-                    int x = display.getBounds().width;
-                    int y = display.getBounds().height;
-                    shell.setBounds(x/4, y/4, x/2, y/3);
-                    StructuredSelection selection = (StructuredSelection)event.getSelection();
-                    createPopupContents((NotificationObject)selection.getFirstElement());
-                    shell.open();
-                    while (!shell.isDisposed()) {
-                        if (!display.readAndDispatch()) {
-                            display.sleep();
-                        }
-                    }
-                    
-                    //If you create it, you dispose it.
-                    shell.dispose();
-                }
-
-                private void createPopupContents(NotificationObject obj)
-                {                    
-                    shell.setLayout(new GridLayout());
-                    
-                    Composite parent = _toolkit.createComposite(shell, SWT.NONE);
-                    parent.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
-                    GridLayout layout = new GridLayout(4, true);
-                    parent.setLayout(layout);
-                    
-                    // Object name record
-                    Label key = _toolkit.createLabel(parent, COLUMN_OBJ, SWT.TRAIL); 
-                    GridData layoutData = new GridData(SWT.TRAIL, SWT.TOP, false, false,1,1);
-                    key.setLayoutData(layoutData);
-                    Text  value = _toolkit.createText(parent, obj.getSourceName(), SWT.BEGINNING | SWT.BORDER |SWT.READ_ONLY);
-                    value.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false,3,1));
-
-                    // Sequence no record
-                    key = _toolkit.createLabel(parent, COLUMN_SEQ, SWT.TRAIL);             
-                    layoutData = new GridData(SWT.TRAIL, SWT.TOP, false, false,1,1);
-                    key.setLayoutData(layoutData);
-                    value = _toolkit.createText(parent, ""+obj.getSequenceNo(), SWT.BEGINNING | SWT.BORDER |SWT.READ_ONLY);
-                    value.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false,3,1));
-
-                    // Time row
-                    key = _toolkit.createLabel(parent, COLUMN_TIME, SWT.TRAIL);
-                    key.setLayoutData(new GridData(SWT.TRAIL, SWT.TOP, true, false,1,1));
-                    value = _toolkit.createText(parent, obj.getTimeStamp(), SWT.BEGINNING | SWT.BORDER | SWT.READ_ONLY);
-                    value.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false,3,1));
-
-                    key = _toolkit.createLabel(parent, COLUMN_TYPE, SWT.TRAIL);
-                    key.setLayoutData(new GridData(SWT.TRAIL, SWT.TOP, true, false,1,1));
-                    value = _toolkit.createText(parent, obj.getType(), SWT.BEGINNING | SWT.BORDER | SWT.READ_ONLY);
-                    value.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false,3,1));
-
-                    key = _toolkit.createLabel(parent, COLUMN_MSG, SWT.TRAIL);
-                    key.setLayoutData(new GridData(SWT.TRAIL, SWT.TOP, true, false,1,1));
-                    value = _toolkit.createText(parent, obj.getMessage(), SWT.MULTI | SWT.WRAP| SWT.BORDER | SWT.V_SCROLL | SWT.READ_ONLY);
-                    GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, true, 3, 1);
-                    gridData.heightHint = 100;
-                    value.setLayoutData(gridData);
-                }
-            });
-    }
-    
-    public void refresh()
-    {        
-        _notifications = null;
-        _table.deselectAll();
-        _tableViewer.getTable().clearAll();  
-        
-        Control[] children = _form.getBody().getChildren();        
-        for (int i = 0; i < children.length; i++)
-        {
-            children[i].setVisible(true);
-        }
-             
-        workerRunning = true;
-        _form.layout(true);   
-        _form.getBody().layout(true, true);
-    }
-    
-    /**
-     * Content provider class for the table viewer
-     */
-    protected class ContentProviderImpl implements IStructuredContentProvider, INotificationViewer
-    {
-        public void inputChanged(Viewer v, Object oldInput, Object newInput)
-        {
-            
-        }
-        public void dispose()
-        {
-            
-        }
-        public Object[] getElements(Object parent) 
-        {
-            return _notifications.toArray(new NotificationObject[0]);
-        }
-        public void addNotification(NotificationObject notification)
-        {
-            _tableViewer.add(notification);
-        }
-        
-        public void addNotification(List<NotificationObject> notificationList)
-        {
-            _tableViewer.add(notificationList.toArray(new NotificationObject[0]));
-        }
-    }
-    
-    /**
-     * Label provider for the table viewer
-     */
-    protected class LabelProviderImpl implements ITableLabelProvider
-    {
-        List<ILabelProviderListener> listeners = new ArrayList<ILabelProviderListener>();       
-        public void addListener(ILabelProviderListener listener)
-        {
-            listeners.add(listener);
-        }
-        
-        public void dispose(){
-            
-        }
-        
-        public Image getColumnImage(Object element, int columnIndex)
-        {
-            return null;
-        }
-        
-        public String getColumnText(Object element, int columnIndex)
-        {
-            String result = null;
-            NotificationObject t = (NotificationObject)element;
-            switch(columnIndex)
-            {
-            case 0 : 
-                result = t.getSourceName();
-                break;
-            case 1 : 
-                result = String.valueOf(t.getSequenceNo());
-                break;
-            case 2 :
-                result = String.valueOf(t.getTimeStamp());
-                break;
-            case 3 : 
-                result = t.getType();
-                break;
-            case 4 : 
-                result = t.getMessage();
-                break;
-            default : 
-                result = "";
-            }
-            
-            return result;
-        }
-        
-        public boolean isLabelProperty(Object element, String property)
-        {
-            return false;
-        }
-        
-        public void removeListener(ILabelProviderListener listener)
-        {
-            listeners.remove(listener);
-        }
-    } // end of LabelProviderImpl
-    
-    protected boolean workerRunning = false;
-    protected void setWorkerRunning(boolean running)
-    {
-        workerRunning = running;
-    }
-    
-    /**
-     * Worker class which keeps looking if there are new notifications coming from server for the selected mbean
-     */
-    private class Worker implements Runnable
-    {
-        public void run()
-        {
-            Display display = _tabFolder.getDisplay();
-            while(true)
-            {
-                if (!workerRunning || display == null)
-                {
-                    sleep();
-                    continue;
-                }
-                
-                display.syncExec(new Runnable()
-                {
-                    public void run()
-                    {
-                        if (_form == null || _form.isDisposed())
-                            return;
-                        setWorkerRunning(_form.isVisible());
-                        if (!workerRunning) return;
-                        
-                        updateTableViewer();
-                    }
-                });     
-            
-                sleep();
-            }
-        }
-        
-        private void sleep()
-        {
-            try
-            {
-                Thread.sleep(2000);
-            }
-            catch(Exception ex)
-            {
-
-            }  
-        }
-    }
-    
-    /**
-     * Updates the table with new notifications received from mbean server for all mbeans
-     */
-    protected void updateTableViewer()
-    {
-        ServerRegistry serverRegistry = ApplicationRegistry.getServerRegistry(MBeanView.getServer());        
-        List<NotificationObject> newList = serverRegistry.getNotifications(null);
-        if (newList == null)
-            return;
-        
-        _notifications = newList;
-        _tableViewer.setInput(_notifications);
-        _tableViewer.refresh();
-    }
-
-}
diff --git a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/ViewUtility.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/ViewUtility.java
deleted file mode 100644
index 4a441d3ae5..0000000000
--- a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/ViewUtility.java
+++ /dev/null
@@ -1,979 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.management.ui.views;
-
-import org.apache.commons.codec.binary.Hex;
-import org.apache.qpid.management.ui.ApplicationWorkbenchAdvisor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ControlAdapter;
-import org.eclipse.swt.events.ControlEvent;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.MessageBox;
-import org.eclipse.swt.widgets.ScrollBar;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-import javax.management.openmbean.ArrayType;
-import javax.management.openmbean.CompositeData;
-import javax.management.openmbean.CompositeDataSupport;
-import javax.management.openmbean.CompositeType;
-import javax.management.openmbean.OpenType;
-import javax.management.openmbean.TabularDataSupport;
-import javax.management.openmbean.TabularType;
-import java.io.UnsupportedEncodingException;
-import java.nio.charset.Charset;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-
-/**
- * Utility Class for displaying OpenMbean data types by creating required SWT widgets
- * @author Bhupendra Bhardwaj
- */
-public class ViewUtility
-{
-    public static final String OP_NAME = "operation_name";
-    public static final String OP_PARAMS = "parameters";
-    public static final String PARAMS_TEXT = "text";
-
-    public static final String FIRST = "First";
-    public static final String LAST = "Last";
-    public static final String NEXT = "Next";
-    public static final String PREV = "Previous";
-    public static final String INDEX = "Index";
-
-    private static final Comparator tabularDataComparator = new TabularDataComparator();
-
-    private static List<String> SUPPORTED_ARRAY_DATATYPES = new ArrayList<String>();
-    private static final int DEFAULT_CONTENT_SIZE = 198;
-
-    static
-    {
-        SUPPORTED_ARRAY_DATATYPES.add("java.lang.String");
-        SUPPORTED_ARRAY_DATATYPES.add("java.lang.Boolean");
-        SUPPORTED_ARRAY_DATATYPES.add("java.lang.Character");
-        SUPPORTED_ARRAY_DATATYPES.add("java.lang.Integer");
-        SUPPORTED_ARRAY_DATATYPES.add("java.lang.Long");
-        SUPPORTED_ARRAY_DATATYPES.add("java.lang.Double");
-        SUPPORTED_ARRAY_DATATYPES.add("java.util.Date");
-    }
-
-    /**
-     * Populates the composite with given openmbean data type (TabularType or CompositeType)
-     * @param toolkit
-     * @param parent composite
-     * @param data open mbean data type(either composite type or tabular data type)
-     */
-    public static void populateCompositeWithData(FormToolkit toolkit, Composite parent, Object data)
-    {
-        if (data instanceof TabularDataSupport)
-        {
-            ViewUtility.createTabularDataHolder(toolkit, parent, (TabularDataSupport) data);
-        }
-        else if (data instanceof CompositeDataSupport)
-        {
-            ViewUtility.populateCompositeWithCompositeData(toolkit, parent, (CompositeDataSupport) data);
-        }
-    }
-
-    @SuppressWarnings("unchecked")
-    private static void createTabularDataHolder(FormToolkit toolkit, Composite parent, TabularDataSupport tabularData)
-    {
-        Composite composite = toolkit.createComposite(parent, SWT.BORDER);
-        GridLayout layout = new GridLayout(4, true);
-        layout.horizontalSpacing = 0;
-        layout.marginWidth = 0;
-        layout.marginHeight = 10;
-        layout.verticalSpacing = 10;
-        composite.setLayout(layout);
-        composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
-
-        Set entrySet = tabularData.entrySet();
-        ArrayList<Map.Entry> list = new ArrayList<Map.Entry>(entrySet);
-        if (list.size() == 0)
-        {
-            Text text = toolkit.createText(composite, " No records ", SWT.CENTER | SWT.SINGLE | SWT.READ_ONLY);
-            GridData layoutData = new GridData(SWT.FILL, SWT.FILL, true, true, 4, 1);
-            text.setLayoutData(layoutData);
-            return;
-        }
-
-        Collections.sort(list, tabularDataComparator);
-
-        // Attach the tabular record to be retrieved and shown later when record is traversed
-        // using first/next/previous/last buttons
-        composite.setData(list);
-
-        // Create button and the composite for CompositeData
-        Composite compositeDataHolder = createCompositeDataHolder(toolkit, composite,
-                                                                  tabularData.getTabularType().getRowType());
-
-        // display the first record
-        CompositeData data = (CompositeData) (list.get(0)).getValue();
-        composite.setData(INDEX, 0);
-        populateCompositeWithCompositeData(toolkit, compositeDataHolder, data);
-        enableOrDisableTraversalButtons(composite);
-    }
-
-    private static void enableOrDisableTraversalButtons(Composite composite)
-    {
-        int index = (Integer) composite.getData(INDEX);
-        int size = ((List) composite.getData()).size();
-
-        ((Button) composite.getData(FIRST)).setEnabled(true);
-        ((Button) composite.getData(PREV)).setEnabled(true);
-        ((Button) composite.getData(NEXT)).setEnabled(true);
-        ((Button) composite.getData(LAST)).setEnabled(true);
-
-        if (index == 0)
-        {
-            ((Button) composite.getData(FIRST)).setEnabled(false);
-            ((Button) composite.getData(PREV)).setEnabled(false);
-        }
-        if (index == size - 1)
-        {
-            ((Button) composite.getData(NEXT)).setEnabled(false);
-            ((Button) composite.getData(LAST)).setEnabled(false);
-        }
-    }
-
-    /**
-     * Sets up the given composite for holding a CompositeData. Create traversal buttons, label etc and
-     * creates a child Composite, which should be populated with the CompositeData
-     * @param toolkit
-     * @param dataHolder
-     * @param compositeType
-     * @return
-     */
-    private static Composite createCompositeDataHolder(final FormToolkit toolkit, final Composite dataHolder, CompositeType compositeType)
-    {
-        String desc = compositeType.getDescription();
-        Label description = toolkit.createLabel(dataHolder, desc, SWT.CENTER);
-        description.setLayoutData(new GridData(SWT.CENTER, SWT.TOP, true, false, 4, 1));
-        // TODO nameLabel.setFont(font);
-        description.setText(desc);
-
-        // Add traversal buttons
-        final Button firstRecordButton = toolkit.createButton(dataHolder, FIRST, SWT.PUSH);
-        GridData layoutData = new GridData(GridData.HORIZONTAL_ALIGN_END);
-        layoutData.widthHint = 80;
-        firstRecordButton.setLayoutData(layoutData);
-
-        final Button nextRecordButton = toolkit.createButton(dataHolder, NEXT, SWT.PUSH);
-        layoutData = new GridData(GridData.HORIZONTAL_ALIGN_END);
-        layoutData.widthHint = 80;
-        nextRecordButton.setLayoutData(layoutData);
-
-        final Button previousRecordButton = toolkit.createButton(dataHolder, PREV, SWT.PUSH);
-        layoutData = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING);
-        layoutData.widthHint = 80;
-        previousRecordButton.setLayoutData(layoutData);
-
-        final Button lastRecordButton = toolkit.createButton(dataHolder, LAST, SWT.PUSH);
-        layoutData = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING);
-        layoutData.widthHint = 80;
-        lastRecordButton.setLayoutData(layoutData);
-
-        // Now create the composite, which will hold the CompositeData
-        final Composite composite = toolkit.createComposite(dataHolder, SWT.NONE);
-        GridLayout layout = new GridLayout();
-        layout.horizontalSpacing = layout.verticalSpacing = 0;
-        layout.marginHeight = layout.marginWidth = 0;
-        composite.setLayout(layout);
-        composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 4, 1));
-
-        // Add button references.  These references will be used when buttons
-        // are to enabled or disabled based of record index. e.g. for first record
-        // First and Previous buttons will be disabled.
-        dataHolder.setData(FIRST, firstRecordButton);
-        dataHolder.setData(NEXT, nextRecordButton);
-        dataHolder.setData(PREV, previousRecordButton);
-        dataHolder.setData(LAST, lastRecordButton);
-
-        // Listener for the traversal buttons. When a button is clicked the respective
-        // CompositeData will be populated in the composite
-        SelectionListener listener = new SelectionAdapter()
-        {
-            public void widgetSelected(SelectionEvent e)
-            {
-                if (!(e.widget instanceof Button))
-                {
-                    return;
-                }
-
-                Button traverseButton = (Button) e.widget;
-                // Get the CompositeData respective to the button selected
-                CompositeData data = getCompositeData(dataHolder, traverseButton.getText());
-                populateCompositeWithCompositeData(toolkit, composite, data);
-                enableOrDisableTraversalButtons(dataHolder);
-            }
-        };
-
-        firstRecordButton.addSelectionListener(listener);
-        nextRecordButton.addSelectionListener(listener);
-        previousRecordButton.addSelectionListener(listener);
-        lastRecordButton.addSelectionListener(listener);
-
-        return composite;
-    }
-
-    /**
-     * The CompositeData is set as data with the Composite and using the index, this method will
-     * return the corresponding CompositeData
-     * @param compositeHolder
-     * @param dataIndex
-     * @return the CompositeData respective to the index
-     */
-    private static CompositeData getCompositeData(Composite compositeHolder, String dataIndex)
-    {
-        List objectData = (List) compositeHolder.getData();
-        if (objectData == null || objectData.isEmpty())
-        {
-            //          TODO
-        }
-
-        // Get the index of record to be shown.
-        int index = 0;
-        if (compositeHolder.getData(INDEX) != null)
-        {
-            index = (Integer) compositeHolder.getData(INDEX);
-        }
-
-        if (FIRST.equals(dataIndex))
-        {
-            index = 0;
-        }
-        else if (NEXT.equals(dataIndex))
-        {
-            index = index + 1;
-        }
-        else if (PREV.equals(dataIndex))
-        {
-            index = (index != 0) ? (index = index - 1) : index;
-        }
-        else if (LAST.equals(dataIndex))
-        {
-            index = objectData.size() - 1;
-        }
-
-        // Set the index being shown.
-        compositeHolder.setData(INDEX, index);
-
-        return (CompositeData) ((Map.Entry) objectData.get(index)).getValue();
-    }
-
-    /**
-     * Populates the given composite with the CompositeData. Creates required widgets to hold the data types
-     * @param toolkit
-     * @param parent
-     * @param data CompositeData
-     */
-    @SuppressWarnings("unchecked")
-    private static void populateCompositeWithCompositeData(FormToolkit toolkit, Composite parent, CompositeData data)
-    {
-        Control[] oldControls = parent.getChildren();
-        for (int i = 0; i < oldControls.length; i++)
-        {
-            oldControls[i].dispose();
-        }
-
-        Composite compositeHolder = toolkit.createComposite(parent, SWT.NONE);
-        GridLayout layout = new GridLayout(4, false);
-        layout.horizontalSpacing = 10;
-        compositeHolder.setLayout(layout);
-        compositeHolder.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
-
-        // ItemNames in composite data
-        List<String> itemNames = new ArrayList<String>(data.getCompositeType().keySet());
-
-        for (String itemName : itemNames)
-        {
-            OpenType itemType = data.getCompositeType().getType(itemName);
-            Label keyLabel = toolkit.createLabel(compositeHolder, itemName, SWT.TRAIL);
-            GridData layoutData = new GridData(SWT.FILL, SWT.FILL, false, false, 1, 1);
-            layoutData.minimumWidth = 70;
-            keyLabel.setLayoutData(layoutData);
-
-            if (itemType.isArray())
-            {
-                OpenType type = ((ArrayType) itemType).getElementOpenType();
-                //  If Byte array and mimetype is text, convert to text string
-                if (type.getClassName().equals(Byte.class.getName()))
-                {
-                    String mimeType = null;
-                    String encoding = null;
-                    if (data.containsKey("MimeType"))
-                    {
-                        mimeType = (String) data.get("MimeType");
-                    }
-                    if (data.containsKey("Encoding"))
-                    {
-                        encoding = (String) data.get("Encoding");
-                    }
-
-                    if (encoding == null || encoding.length() == 0)
-                    {
-                        encoding = Charset.defaultCharset().name();
-                    }
-
-                    if ("text/plain".equals(mimeType))
-                    {
-                        convertByteArray(toolkit, compositeHolder, data, itemName, encoding);
-                    }
-                    else
-                    {
-                        handleBinaryMessageContent(toolkit, compositeHolder, data, itemName, encoding);
-                    }
-                }
-                // If array of any other supported type, show as a list of String array
-                else if (SUPPORTED_ARRAY_DATATYPES.contains(type.getClassName()))
-                {
-                    convertArrayItemForDisplay(compositeHolder, data, itemName);
-                }
-                else
-                {
-                    setNotSupportedDataType(toolkit, compositeHolder);
-                }
-            }
-            else if (itemType instanceof TabularType)
-            {
-                Composite composite = toolkit.createComposite(compositeHolder, SWT.NONE);
-                composite.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false, 3, 1));
-                layout = new GridLayout();
-                layout.marginHeight = 0;
-                layout.marginWidth = 0;
-                composite.setLayout(layout);
-                createTabularDataHolder(toolkit, composite, (TabularDataSupport) data.get(itemName));
-            }
-            else
-            {
-                Text valueText = toolkit.createText(compositeHolder, String.valueOf(data.get(itemName)), SWT.READ_ONLY | SWT.BORDER);
-                valueText.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false, 3, 1));
-            }
-        }
-
-        // layout the composite after creating new widgets.
-        parent.layout();
-    } //end of method
-
-
-    private static void convertByteArray(FormToolkit toolkit, Composite compositeHolder, CompositeData data, String itemName, String encoding)
-    {
-        Byte[] arrayItems = (Byte[]) data.get(itemName);
-        byte[] byteArray = new byte[arrayItems.length];
-
-        for (int i = 0; i < arrayItems.length; i++)
-        {
-            byteArray[i] = arrayItems[i];
-        }
-        try
-        {
-            String textMessage = new String(byteArray, encoding);
-
-            Text valueText = toolkit.createText(compositeHolder, textMessage, SWT.READ_ONLY | SWT.BORDER |
-                                                                              SWT.MULTI | SWT.WRAP | SWT.V_SCROLL);
-            GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, true, 3, 1);
-            gridData.heightHint = 300;
-            valueText.setLayoutData(gridData);
-        }
-        catch (Exception ex)
-        {
-            ex.printStackTrace();
-        }
-    }
-
-    static Button _firstButton, _nextButton, _previousButton, _lastButton;
-    static Text _hexNumTextToEnd, _hexNumTextToStart;
-
-    /**
-     * Creates widgets for object messages and populates the content in hexadecimal format.
-     * @param toolkit
-     * @param compositeHolder
-     * @param data
-     * @param itemName
-     * @param encoding
-     */
-    private static void handleBinaryMessageContent(FormToolkit toolkit, Composite compositeHolder, CompositeData data, String itemName, String encoding)
-    {
-        final String thisEncoding = encoding;
-        final Byte[] arrayItems = (Byte[]) data.get(itemName);
-        final byte[] byteArray = new byte[arrayItems.length];
-
-        for (int i = 0; i < arrayItems.length; i++)
-        {
-            byteArray[i] = arrayItems[i];
-        }
-
-        try
-        {
-            //create a new composite to contain the widgets required to display object messages.
-            final Composite localComposite = toolkit.createComposite(compositeHolder, SWT.NONE);
-            localComposite.setData("currentBytePos", 0);
-            localComposite.setData("startingBytePos", 0);
-            GridLayout layout = new GridLayout(2, true);
-            layout.marginWidth = 0;
-            layout.marginHeight = 0;
-            localComposite.setLayout(layout);
-            localComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 3, 1));
-
-            int startContentSize = DEFAULT_CONTENT_SIZE; // This will fill the 18 rows of the standard size
-
-            if (byteArray.length < DEFAULT_CONTENT_SIZE)
-            {
-                startContentSize = byteArray.length;
-            }
-
-            //create a text to display the hexadecimal views of object messages, it takes more space than ascii view as a hex uses 2 chars
-            //and 1 space, while ascii only uses 1 char and 1 space.
-            final Text hexText = toolkit.createText(localComposite,
-                                                    new String(displayByteFormat(localComposite, byteArray, startContentSize * 2, thisEncoding, "<<", true)),
-                                                    SWT.READ_ONLY | SWT.MULTI | SWT.WRAP | SWT.V_SCROLL | SWT.BORDER);
-            GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1);
-            gridData.widthHint = 144; //set to 222 if not using any fonts
-            gridData.heightHint = 200;
-            hexText.setLayoutData(gridData);
-
-            final Text asciiText = toolkit.createText(localComposite,
-                                                      new String(displayByteFormat(localComposite, byteArray, startContentSize * 2, thisEncoding, "<<", false)),
-                                                      SWT.READ_ONLY | SWT.MULTI | SWT.WRAP | SWT.V_SCROLL | SWT.BORDER);
-
-
-            gridData = new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1);
-            gridData.widthHint = 52;//set to 98 if not using any fonts
-            gridData.heightHint = 200;
-            asciiText.setLayoutData(gridData);
-
-            //use a monospaced font for a better layout
-            Font font = new Font(compositeHolder.getDisplay(), "Courier", 10, SWT.NORMAL);
-            hexText.setFont(font);
-            asciiText.setFont(font);
-
-            final ScrollBar hexScrollBar = hexText.getVerticalBar();
-            final ScrollBar asciiScrollBar = asciiText.getVerticalBar();
-
-            //create a sub composite to contain all the buttons
-            final Composite buttonComposite = toolkit.createComposite(localComposite, SWT.NONE);
-            layout = new GridLayout(7, false);
-            layout.marginWidth = 0;
-            buttonComposite.setLayout(layout);
-            buttonComposite.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false, 2, 1));
-
-            _firstButton = toolkit.createButton(buttonComposite, "<<", SWT.PUSH);
-            GridData layoutData = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING);
-            layoutData.widthHint = 40;
-            _firstButton.setLayoutData(layoutData);
-            _firstButton.setToolTipText("See the first n bytes");
-
-            _previousButton = toolkit.createButton(buttonComposite, "<", SWT.PUSH);
-            layoutData = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING);
-            layoutData.widthHint = 40;
-            _previousButton.setLayoutData(layoutData);
-            _previousButton.setToolTipText("See the previous n bytes");
-            _previousButton.setEnabled(false);
-
-            _hexNumTextToStart = toolkit.createText(buttonComposite, "0");
-            layoutData = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING);
-            layoutData.widthHint = 40;
-            _hexNumTextToStart.setLayoutData(layoutData);
-            _hexNumTextToStart.setEditable(false);
-
-            final Text hexNumText = toolkit.createText(buttonComposite, "" + startContentSize);
-            layoutData = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING);
-            layoutData.widthHint = 40;
-            hexNumText.setLayoutData(layoutData);
-
-            _hexNumTextToEnd = toolkit.createText(buttonComposite, "" + (byteArray.length - startContentSize));
-            layoutData = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING);
-            layoutData.widthHint = 40;
-            _hexNumTextToEnd.setLayoutData(layoutData);
-            _hexNumTextToEnd.setEditable(false);
-
-            _nextButton = toolkit.createButton(buttonComposite, ">", SWT.PUSH);
-            layoutData = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING);
-            layoutData.widthHint = 40;
-            _nextButton.setLayoutData(layoutData);
-            _nextButton.setToolTipText("See the next n bytes");
-            _nextButton.setEnabled(true);
-
-            _lastButton = toolkit.createButton(buttonComposite, ">>", SWT.PUSH);
-            layoutData = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING);
-            layoutData.widthHint = 40;
-            _lastButton.setToolTipText("See the last n bytes");
-            _lastButton.setLayoutData(layoutData);
-
-            SelectionListener listener = new SelectionAdapter()
-            {
-                public void widgetSelected(SelectionEvent e)
-                {
-                    if (e.widget instanceof Button)
-                    {
-                        String numOfBytes = hexNumText.getText();
-                        try
-                        {
-                            int n = Integer.parseInt(numOfBytes);
-
-                            //Reset range display if user requests a large value
-                            if (n > byteArray.length)
-                            {
-                                n = (byteArray.length > DEFAULT_CONTENT_SIZE) ? DEFAULT_CONTENT_SIZE : byteArray.length;
-                                hexNumText.setText("" + n);
-                            }
-
-                            //rest if the user requests 0
-                            if (n < 1)
-                            {
-                                n = DEFAULT_CONTENT_SIZE;
-                                hexNumText.setText("" + n);
-                            }
-
-                            Button button = (Button) e.widget;
-                            hexText.setText(displayByteFormat(localComposite, byteArray, n * 2, thisEncoding,
-                                                              button.getText(), true));
-                            asciiText.setText(displayByteFormat(localComposite, byteArray, n * 2, thisEncoding,
-                                                                button.getText(), false));
-                        }
-                        catch (NumberFormatException exp)
-                        {
-                            popupErrorMessage("Error",
-                                              "Please input the number of bytes you wish to look at");
-                        }
-                    }
-                    if (e.widget instanceof ScrollBar)
-                    {
-                        //synchronize the movements of the two scrollbars
-                        ScrollBar sb = (ScrollBar) e.widget;
-                        if (sb.getParent().equals(hexText))
-                        {
-                            asciiScrollBar.setIncrement(sb.getIncrement());
-                            asciiScrollBar.setSelection(sb.getSelection());
-                            asciiText.setTopIndex(hexText.getTopIndex());
-                        }
-                        else if (sb.getParent().equals(asciiText))
-                        {
-                            hexScrollBar.setSelection(sb.getSelection());
-                            hexScrollBar.setIncrement(sb.getIncrement());
-                            hexText.setTopIndex(asciiText.getTopIndex());
-                        }
-                    }
-                }
-            };
-            localComposite.addControlListener(new ControlAdapter()
-            {
-                public void controlResized(ControlEvent e)
-                {
-                    //if the control is resized, set different parameters to make a single line displays the same contents.
-                    if (((GridLayout) localComposite.getLayout()).makeColumnsEqualWidth)
-                    {
-                        ((GridLayout) localComposite.getLayout()).makeColumnsEqualWidth = false;
-                        ((GridLayout) localComposite.getLayout()).numColumns = 2;
-                        ((GridData) hexText.getLayoutData()).horizontalSpan = 1;
-                        ((GridData) hexText.getLayoutData()).widthHint = 144;
-                        ((GridData) asciiText.getLayoutData()).horizontalSpan = 1;
-                        ((GridData) asciiText.getLayoutData()).widthHint = 52;
-                        ((GridData) buttonComposite.getLayoutData()).horizontalSpan = 2;
-                    }
-                    else
-                    {
-                        ((GridLayout) localComposite.getLayout()).makeColumnsEqualWidth = true;
-                        ((GridLayout) localComposite.getLayout()).numColumns = 42; //set to 47 if not using any fonts
-                        ((GridData) hexText.getLayoutData()).horizontalSpan = 25; // set to 30 if not using any fonts
-                        ((GridData) asciiText.getLayoutData()).horizontalSpan = 17; // set to 17 if not using any fonts
-                        ((GridData) buttonComposite.getLayoutData()).horizontalSpan = 42;
-                    }
-                }
-            });
-
-            _firstButton.addSelectionListener(listener);
-            _previousButton.addSelectionListener(listener);
-            _nextButton.addSelectionListener(listener);
-            _lastButton.addSelectionListener(listener);
-            hexScrollBar.addSelectionListener(listener);
-            asciiScrollBar.addSelectionListener(listener);
-            //f.dispose();
-        }
-        catch (Exception ex)
-        {
-            ex.printStackTrace();
-        }
-    }
-
-    /**
-     * Format object messages to have a hexadecimal view and a ascii view.
-     * @param numOfBytes
-     * @param encoding
-     * @return
-     */
-    private static String displayByteFormat(Composite localComposite, byte[] byteArray, int numOfBytes, String encoding, String direction, boolean isHex)
-    {
-        final Hex hexeconder = new Hex();
-        final byte[] encoded = hexeconder.encode(byteArray);
-
-        int hexLength = byteArray.length * 2;
-        StringBuilder sb = new StringBuilder();
-        int currentBytePos = (Integer) localComposite.getData("currentBytePos");
-        int startingBytePos = (Integer) localComposite.getData("startingBytePos");
-
-        int strLength = 0;
-        int offset = 0;
-        String encStr;
-        if (isHex)
-        {
-            if (direction.equals("<<"))
-            {
-                strLength = (numOfBytes > hexLength) ? hexLength : numOfBytes;
-                offset = 0;
-            }
-            else if (direction.equals("<"))
-            {
-                strLength = (startingBytePos - numOfBytes < 0) ? startingBytePos
-                            : numOfBytes;
-                offset = (startingBytePos - numOfBytes < 0) ? 0
-                         : startingBytePos - numOfBytes;
-            }
-            else if (direction.equals(">"))
-            {
-                strLength = (numOfBytes > (hexLength - currentBytePos)) ? hexLength
-                                                                          - currentBytePos
-                            : numOfBytes;
-                offset = currentBytePos;
-
-            }
-            else if (direction.equals(">>"))
-            {
-                strLength = (numOfBytes > hexLength) ? hexLength : numOfBytes;
-                offset = (hexLength - numOfBytes > 0) ? hexLength - numOfBytes
-                         : 0;
-            }
-            else
-            {
-                strLength = hexLength;
-                offset = 0;
-            }
-            localComposite.setData("strLength", strLength);
-            localComposite.setData("currentBytePos", offset + strLength);
-            localComposite.setData("startingBytePos", offset);
-
-            if (_lastButton != null && !_lastButton.isDisposed())
-            {
-                //Set button state
-                _previousButton.setEnabled(offset != 0);
-                _nextButton.setEnabled(offset + strLength != hexLength);
-
-                //set the text fields
-                _hexNumTextToStart.setText("" + offset / 2);
-                _hexNumTextToEnd.setText("" + (hexLength - (offset + strLength)) / 2);
-            }
-        }
-
-        try
-        {
-            if (isHex)
-            {
-                encStr = new String(encoded, offset, strLength, encoding);
-                for (int c = 0; c < strLength; c++)
-                {
-
-                    sb.append(encStr.charAt(c));
-                    if (c % 2 == 1)
-                    {
-                        sb.append(" ");
-                    }
-
-                }
-                return sb.toString().toUpperCase();
-            }
-            else
-            {
-                strLength = (Integer) localComposite.getData("strLength");
-                sb = new StringBuilder();
-                encStr = new String(byteArray, startingBytePos / 2, strLength / 2, encoding);
-                for (int c = 0; c < encStr.length(); c++)
-                {
-                    char ch = encStr.charAt(c);
-                    if (ch > 31 && ch < 127)
-                    {
-                        sb.append(ch);
-                    }
-                    else
-                    {
-                        sb.append("?");
-                    }
-
-                    sb.append(" ");
-                }
-            }
-        }
-        catch (UnsupportedEncodingException e)
-        {
-            e.printStackTrace();
-        }
-        return sb.toString();
-    }
-
-    public static int popupInfoMessage(String title, String message)
-    {
-        MessageBox messageBox = new MessageBox(Display.getCurrent().getActiveShell(), SWT.ICON_INFORMATION | SWT.OK);
-        messageBox.setMessage(message);
-        messageBox.setText(title);
-        int response = messageBox.open();
-
-        return response;
-    }
-
-    public static int popupErrorMessage(String title, String message)
-    {
-        MessageBox messageBox = new MessageBox(Display.getCurrent().getActiveShell(), SWT.ICON_ERROR | SWT.OK);
-        messageBox.setMessage(message);
-        messageBox.setText(title);
-        int response = messageBox.open();
-
-        return response;
-    }
-
-    public static int popupConfirmationMessage(String title, String message)
-    {
-        MessageBox messageBox = new MessageBox(Display.getCurrent().getActiveShell(),
-                                               SWT.ICON_QUESTION | SWT.YES | SWT.NO | SWT.CANCEL);
-        messageBox.setMessage(message);
-        messageBox.setText(title);
-        int response = messageBox.open();
-
-        return response;
-    }
-
-    public static void popupError(String title, String message, Throwable ex)
-    {
-        IStatus status = new Status(IStatus.ERROR, ApplicationWorkbenchAdvisor.PERSPECTIVE_ID,
-                                    IStatus.ERROR, ex.toString(), ex);
-        ErrorDialog.openError(Display.getCurrent().getActiveShell(), title, message, status);
-
-    }
-
-    public static void popupError(String errorMsg)
-    {
-        Display display = Display.getCurrent();
-        Shell shell = new Shell(display, SWT.BORDER | SWT.CLOSE | SWT.MIN | SWT.MAX);
-        shell.setText("Attribute");
-        shell.setLayout(new GridLayout());
-        int x = display.getBounds().width;
-        int y = display.getBounds().height;
-        int width = 500;
-        int height = 250;
-        shell.setBounds(x / 4, y / 4, width, height);
-
-        Label label = new Label(shell, SWT.NONE);
-        label.setText(errorMsg);
-        label.setLayoutData(new GridData(SWT.TRAIL, SWT.TOP, false, false));
-
-        shell.open();
-        while (!shell.isDisposed())
-        {
-            if (!display.readAndDispatch())
-            {
-                display.sleep();
-            }
-        }
-        shell.dispose();
-    }
-
-    public static Shell createPopupShell(String title, int width, int height)
-    {
-        Display display = Display.getCurrent();
-        Shell shell = new Shell(display, SWT.BORDER | SWT.CLOSE | SWT.MIN | SWT.MAX);
-        shell.setText(title);
-        shell.setLayout(new GridLayout());
-        int x = display.getBounds().width;
-        int y = display.getBounds().height;
-        shell.setBounds(x / 4, y / 4, width, height);
-
-        return shell;
-    }
-
-    /**
-     * Creates a List widget for displaying array of strings
-     * @param compositeHolder
-     * @param data - containing the array item value
-     * @param itemName - item name
-     */
-    private static void convertArrayItemForDisplay(Composite compositeHolder, CompositeData data, String itemName)
-    {
-        Object[] arrayItems = (Object[]) data.get(itemName);
-        String[] items = new String[arrayItems.length];
-        for (int i = 0; i < arrayItems.length; i++)
-        {
-            items[i] = String.valueOf(arrayItems[i]);
-        }
-        org.eclipse.swt.widgets.List list = new org.eclipse.swt.widgets.List(compositeHolder,
-                                                                             SWT.MULTI | SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL | SWT.READ_ONLY);
-        list.setItems(items);
-        //list.setBackground(compositeHolder.getBackground());
-        list.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 3, 1));
-    }
-
-    private static void setNotSupportedDataType(FormToolkit toolkit, Composite compositeHolder)
-    {
-        Text valueText = toolkit.createText(compositeHolder, "--- Content can not be displayed ---", SWT.READ_ONLY);
-        valueText.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false, 3, 1));
-    }
-
-    /**
-     * Converts the input string to displayable format by converting some character case or inserting space
-     * @param input
-     * @return formatted string
-     */
-    public static String getDisplayText(String input)
-    {
-        StringBuffer result = new StringBuffer(input);
-        if (Character.isLowerCase(result.charAt(0)))
-        {
-            result.setCharAt(0, Character.toUpperCase(result.charAt(0)));
-        }
-        for (int i = 1; i < input.length(); i++)
-        {
-            if (Character.isUpperCase(result.charAt(i)) && !Character.isWhitespace(result.charAt(i - 1))
-                && Character.isLowerCase(result.charAt(i - 1)))
-            {
-                result.insert(i, " ");
-                i++;
-            }
-            else if (Character.isLowerCase(result.charAt(i)) && Character.isWhitespace(result.charAt(i - 1)))
-            {
-                result.setCharAt(i, Character.toUpperCase(result.charAt(i)));
-            }
-
-        }
-
-        return result.toString();
-    }
-
-    /**
-     * Disposes the children of given Composite if not null and not already disposed
-     * @param parent composite
-     */
-    public static void disposeChildren(Composite parent)
-    {
-        if (parent == null || parent.isDisposed())
-        {
-            return;
-        }
-
-        Control[] oldControls = parent.getChildren();
-        for (int i = 0; i < oldControls.length; i++)
-        {
-            oldControls[i].dispose();
-        }
-    }
-
-    public static char[] getMD5HashedCharArray(Object text) throws NoSuchAlgorithmException, UnsupportedEncodingException
-    {
-        byte[] data = ((String) text).getBytes("utf-8");
-
-        MessageDigest md = MessageDigest.getInstance("MD5");
-
-        for (byte b : data)
-        {
-            md.update(b);
-        }
-
-        byte[] digest = md.digest();
-
-        char[] byteArray = new char[digest.length];
-        int index = 0;
-        for (byte b : digest)
-        {
-            byteArray[index++] = (char) b;
-        }
-        return byteArray;
-    }
-
-    public static char[] getHash(String text) throws NoSuchAlgorithmException, UnsupportedEncodingException
-    {
-        byte[] data = text.getBytes("utf-8");
-
-        MessageDigest md = MessageDigest.getInstance("MD5");
-
-        for (byte b : data)
-        {
-            md.update(b);
-        }
-
-        byte[] digest = md.digest();
-
-        char[] hash = new char[digest.length];
-
-        int index = 0;
-        for (byte b : digest)
-        {
-            hash[index++] = (char) b;
-        }
-
-        return hash;
-    }
-
-    private static class TabularDataComparator implements java.util.Comparator<Map.Entry>
-    {
-        public int compare(Map.Entry data1, Map.Entry data2)
-        {
-            if (data1.getKey() instanceof List)
-            {
-                Object obj1 = ((List) data1.getKey()).get(0);
-                Object obj2 = ((List) data2.getKey()).get(0);
-                String str1 = obj1.toString();
-                String str2 = obj2.toString();
-                if (obj1 instanceof String)
-                {
-                    return str1.compareTo(str2);
-                }
-
-                try
-                {
-                    return Long.valueOf(str1).compareTo(Long.valueOf(str2));
-                }
-                catch (Exception ex)
-                {
-                    return -1;
-                }
-            }
-
-            return -1;
-        }
-    }
-}
diff --git a/qpid/java/management/eclipse-plugin/src/main/resources/.eclipseproduct b/qpid/java/management/eclipse-plugin/src/main/resources/.eclipseproduct
deleted file mode 100644
index 28ee27ca17..0000000000
--- a/qpid/java/management/eclipse-plugin/src/main/resources/.eclipseproduct
+++ /dev/null
@@ -1,23 +0,0 @@
-#Eclipse Product File

-#Fri Nov 03 14:47:54 GMT 2006

-#

-# Licensed to the Apache Software Foundation (ASF) under one

-# or more contributor license agreements.  See the NOTICE file

-# distributed with this work for additional information

-# regarding copyright ownership.  The ASF licenses this file

-# to you under the Apache License, Version 2.0 (the

-# "License"); you may not use this file except in compliance

-# with the License.  You may obtain a copy of the License at

-#

-#   http://www.apache.org/licenses/LICENSE-2.0

-#

-# Unless required by applicable law or agreed to in writing,

-# software distributed under the License is distributed on an

-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-# KIND, either express or implied.  See the License for the

-# specific language governing permissions and limitations

-# under the License.

-#

-version=1.0-incubating-M2-SNAPSHOT

-name=Qpid Management Console

-id=org.apache.qpid.manager.gui.product

diff --git a/qpid/java/management/eclipse-plugin/src/main/resources/eclipse.exe b/qpid/java/management/eclipse-plugin/src/main/resources/eclipse.exe
deleted file mode 100644
index 7826d1ed80..0000000000
--- a/qpid/java/management/eclipse-plugin/src/main/resources/eclipse.exe
+++ /dev/null
diff --git a/qpid/java/management/eclipse-plugin/src/main/resources/eclipse.ini b/qpid/java/management/eclipse-plugin/src/main/resources/eclipse.ini
deleted file mode 100644
index 6a4ecb5b5d..0000000000
--- a/qpid/java/management/eclipse-plugin/src/main/resources/eclipse.ini
+++ /dev/null
@@ -1,4 +0,0 @@
--vmargs

--Xms40m

--Xmx256m

--Declipse.consoleLog=true

diff --git a/qpid/java/management/eclipse-plugin/src/main/resources/license.eclipse.txt b/qpid/java/management/eclipse-plugin/src/main/resources/license.eclipse.txt
deleted file mode 100644
index da433e89f9..0000000000
--- a/qpid/java/management/eclipse-plugin/src/main/resources/license.eclipse.txt
+++ /dev/null
@@ -1,88 +0,0 @@
-Eclipse Public License - v 1.0 
-
-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. 
-
-1. DEFINITIONS 
-
-"Contribution" means: 
-
-a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
-b) in the case of each subsequent Contributor:
-
-i) changes to the Program, and
-
-ii) additions to the Program;
-
-where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program. 
-
-"Contributor" means any person or entity that distributes the Program. 
-
-"Licensed Patents " mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program. 
-
-"Program" means the Contributions distributed in accordance with this Agreement. 
-
-"Recipient" means anyone who receives the Program under this Agreement, including all Contributors. 
-
-2. GRANT OF RIGHTS 
-
-a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.
-
-b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder. 
-
-c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program.
-
-d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement. 
-
-3. REQUIREMENTS 
-
-A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that: 
-
-a) it complies with the terms and conditions of this Agreement; and
-
-b) its license agreement:
-
-i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose; 
-
-ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits; 
-
-iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and
-
-iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange. 
-
-When the Program is made available in source code form: 
-
-a) it must be made available under this Agreement; and 
-
-b) a copy of this Agreement must be included with each copy of the Program. 
-
-Contributors may not remove or alter any copyright notices contained within the Program. 
-
-Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution. 
-
-4. COMMERCIAL DISTRIBUTION 
-
-Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense. 
-
-For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages. 
-
-5. NO WARRANTY 
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement , including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations. 
-
-6. DISCLAIMER OF LIABILITY 
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. 
-
-7. GENERAL 
-
-If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable. 
-
-If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed. 
-
-All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive. 
-
-Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved. 
-
-This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation. 
-
- 
diff --git a/qpid/java/management/eclipse-plugin/src/main/resources/org.apache.commons.codec/org.apache.commons.codec_1.3.0.jar b/qpid/java/management/eclipse-plugin/src/main/resources/org.apache.commons.codec/org.apache.commons.codec_1.3.0.jar
deleted file mode 100644
index ae60ce21b7..0000000000
--- a/qpid/java/management/eclipse-plugin/src/main/resources/org.apache.commons.codec/org.apache.commons.codec_1.3.0.jar
+++ /dev/null
diff --git a/qpid/java/management/eclipse-plugin/src/main/resources/sasl/MANIFEST.MF b/qpid/java/management/eclipse-plugin/src/main/resources/sasl/MANIFEST.MF
deleted file mode 100644
index d18b1a073d..0000000000
--- a/qpid/java/management/eclipse-plugin/src/main/resources/sasl/MANIFEST.MF
+++ /dev/null
@@ -1,8 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: jmx sasl Plug-in
-Bundle-SymbolicName: jmxremote.sasl
-Bundle-Version: 1.0.1
-Bundle-ClassPath: .
-Bundle-Vendor:
-Bundle-Localization: plugin
diff --git a/qpid/java/management/eclipse-plugin/src/main/resources/startup.jar b/qpid/java/management/eclipse-plugin/src/main/resources/startup.jar
deleted file mode 100644
index 2f26eceece..0000000000
--- a/qpid/java/management/eclipse-plugin/src/main/resources/startup.jar
+++ /dev/null
diff --git a/qpid/java/management/eclipse-plugin/src/main/resources/unix/configuration/config.ini b/qpid/java/management/eclipse-plugin/src/main/resources/unix/configuration/config.ini
deleted file mode 100644
index b5186ef073..0000000000
--- a/qpid/java/management/eclipse-plugin/src/main/resources/unix/configuration/config.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-###############################################################################

-#  Licensed to the Apache Software Foundation (ASF) under one

-#  or more contributor license agreements. See the NOTICE file

-#  distributed with this work for additional information

-#  regarding copyright ownership. The ASF licenses this file

-#  to you under the Apache License, Version 2.0 (the

-#  "License"); you may not use this file except in compliance

-#  with the License. You may obtain a copy of the License at

-# 

-#    http://www.apache.org/licenses/LICENSE-2.0

-# 

-#  Unless required by applicable law or agreed to in writing,

-#  software distributed under the License is distributed on an

-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-#  KIND, either express or implied. See the License for the

-#  specific language governing permissions and limitations

-#  under the License.

-###############################################################################

-

-#Product Runtime Configuration File

-

-osgi.splashPath=platform:/base/plugins/org.apache.qpid.management.ui

-eclipse.product=org.apache.qpid.management.ui.product

-eclipse.application=org.apache.qpid.management.ui.application

-osgi.bundles=org.eclipse.equinox.common@2:start,org.eclipse.core.runtime@start,com.ibm.icu,org.apache.qpid.management.ui,org.eclipse.core.commands,org.eclipse.core.contenttype,org.eclipse.core.expressions,org.eclipse.core.jobs,org.eclipse.core.runtime.compatibility.auth,org.eclipse.core.runtime.compatibility.registry,org.eclipse.equinox.preferences,org.eclipse.equinox.registry,org.eclipse.help,org.eclipse.jface,org.eclipse.swt,org.eclipse.swt.motif.linux.x86,org.eclipse.swt.gtk.linux.x86_64,org.eclipse.swt.gtk.linux.x86,org.eclipse.swt.gtk.linux.ppc,org.eclipse.swt.motif.hpux.PA_RISC,org.eclipse.swt.gtk.solaris.sparc,org.eclipse.swt.motif.solaris.sparc,org.eclipse.swt.carbon.macocx,org.eclipse.ui,org.eclipse.ui.forms,org.eclipse.ui.workbench,org.apache.commons.codec

-osgi.bundles.defaultStartLevel=4

-eof=eof

diff --git a/qpid/java/management/eclipse-plugin/src/main/resources/win32/configuration/config.ini b/qpid/java/management/eclipse-plugin/src/main/resources/win32/configuration/config.ini
deleted file mode 100644
index e287f0f4a9..0000000000
--- a/qpid/java/management/eclipse-plugin/src/main/resources/win32/configuration/config.ini
+++ /dev/null
@@ -1,26 +0,0 @@
-###############################################################################

-#  Licensed to the Apache Software Foundation (ASF) under one

-#  or more contributor license agreements. See the NOTICE file

-#  distributed with this work for additional information

-#  regarding copyright ownership. The ASF licenses this file

-#  to you under the Apache License, Version 2.0 (the

-#  "License"); you may not use this file except in compliance

-#  with the License. You may obtain a copy of the License at

-# 

-#    http://www.apache.org/licenses/LICENSE-2.0

-# 

-#  Unless required by applicable law or agreed to in writing,

-#  software distributed under the License is distributed on an

-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-#  KIND, either express or implied. See the License for the

-#  specific language governing permissions and limitations

-#  under the License.

-###############################################################################

-

-#Product Runtime Configuration File

-

-osgi.splashPath=platform:/base/plugins/org.apache.qpid.management.ui

-eclipse.product=org.apache.qpid.management.ui.product

-eclipse.application=org.apache.qpid.management.ui.application

-osgi.bundles=org.eclipse.equinox.common@2:start,org.eclipse.core.runtime@start,com.ibm.icu,org.apache.qpid.management.ui,org.eclipse.core.commands,org.eclipse.core.contenttype,org.eclipse.core.expressions,org.eclipse.core.jobs,org.eclipse.core.runtime.compatibility.auth,org.eclipse.core.runtime.compatibility.registry,org.eclipse.equinox.preferences,org.eclipse.equinox.registry,org.eclipse.help,org.eclipse.jface,org.eclipse.swt,org.eclipse.swt.win32.win32.x86,org.eclipse.ui,org.eclipse.ui.forms,jmxremote.sasl,org.eclipse.ui.workbench,org.apache.commons.codec

-osgi.bundles.defaultStartLevel=4

diff --git a/qpid/java/management/eclipse-plugin/src/test/java/org/apache/qpid/management/ui/ManagementConsoleTest.java b/qpid/java/management/eclipse-plugin/src/test/java/org/apache/qpid/management/ui/ManagementConsoleTest.java
deleted file mode 100644
index 64a5843953..0000000000
--- a/qpid/java/management/eclipse-plugin/src/test/java/org/apache/qpid/management/ui/ManagementConsoleTest.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.management.ui;
-
-import junit.framework.TestCase;
-import org.apache.qpid.exchange.ExchangeDefaults;
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.server.exchange.DestNameExchange;
-import org.apache.qpid.server.management.AMQManagedObject;
-import org.apache.qpid.server.queue.AMQQueue;
-import org.apache.qpid.server.queue.AMQQueueMBean;
-import org.apache.qpid.server.registry.ApplicationRegistry;
-import org.apache.qpid.server.registry.IApplicationRegistry;
-import org.apache.qpid.server.virtualhost.VirtualHost;
-
-import javax.management.MBeanFeatureInfo;
-import javax.management.MBeanInfo;
-import java.util.ArrayList;
-import java.util.List;
-
-
-/**
- * Test class to test if any change in the broker JMX code is affesting the management console
- * There are some hardcoding of management feature names and parameter names to create a customized
- * look in the console.
- */
-public class ManagementConsoleTest extends TestCase
-{
-    private VirtualHost _virtualHost;
-
-    @Override
-    protected void setUp() throws Exception
-    {
-        super.setUp();
-        IApplicationRegistry applicationRegistry = ApplicationRegistry.getInstance();
-        _virtualHost = applicationRegistry.getVirtualHostRegistry().getVirtualHost("test");
-    }
-
-    /**
-     * Test for AMQQueueMBean attribute and operation names, which are used in the management console
-     * @throws Exception
-     */
-    public void testAMQQueueMBeanInfo() throws Exception
-    {
-        // If this test fails due to changes in the broker code,
-        // then the constants in the Constants.java shoule be updated accordingly
-        AMQQueue queue = new AMQQueue(new AMQShortString("testQueueForManagement"), false, null, false, _virtualHost);
-        AMQManagedObject mbean = new AMQQueueMBean(queue);
-        MBeanInfo mbeanInfo = mbean.getMBeanInfo();
-
-        List<String> operationNames = getNamesList(mbeanInfo.getOperations());
-        assertTrue(operationNames.contains(Constants.OPERATION_MOVE_MESSAGES));
-
-        List<String> attributesList = getNamesList(mbeanInfo.getAttributes());
-        assertTrue(attributesList.contains(Constants.ATTRIBUTE_QUEUE_CONSUMERCOUNT));
-        assertTrue(attributesList.contains(Constants.ATTRIBUTE_QUEUE_DEPTH));
-    }
-
-    /**
-     * Test for Exchange MBean attribute and operation names, which are used in the management console
-     * @throws Exception
-     */
-    public void testExchangeMBeanInfo() throws Exception
-    {
-        // If this test fails due to changes in the broker code,
-        // then the constants in the Constants.java shoule be updated accordingly 
-        DestNameExchange exchange = new DestNameExchange();
-        exchange.initialise(_virtualHost, ExchangeDefaults.DIRECT_EXCHANGE_NAME, false, true);
-        AMQManagedObject mbean = (AMQManagedObject)exchange.getManagedObject();
-        MBeanInfo mbeanInfo = mbean.getMBeanInfo();
-
-        // Check for the Exchange Type property in the ObjectName
-        assertNotNull(mbean.getObjectName().getKeyProperty(Constants.EXCHANGE_TYPE));
-
-        // Check for operation names
-        List<String> operationNames = getNamesList(mbeanInfo.getOperations());
-        assertTrue(operationNames.contains(Constants.OPERATION_CREATE_BINDING));
-    }
-
-    /**
-     * Test for VirtualHostManagerMBean features used in Management console for customizing the GUI
-     * @throws Exception
-     */
-    public void testVirtualHostManagerMBeanInfo() throws Exception
-    {
-        AMQManagedObject mbean = (AMQManagedObject)_virtualHost.getManagedObject();
-        assertTrue(mbean.getType().equals(Constants.VIRTUAL_HOST));
-    }
-
-    private List<String> getNamesList(MBeanFeatureInfo[] features)
-    {
-        List<String> names = new ArrayList<String>();
-        for (MBeanFeatureInfo feature : features)
-        {
-            names.add(feature.getName());
-        }
-
-        return names;
-    }
-}
diff --git a/qpid/java/perftests/RunningPerformanceTests.txt b/qpid/java/perftests/RunningPerformanceTests.txt
deleted file mode 100644
index 54291483bf..0000000000
--- a/qpid/java/perftests/RunningPerformanceTests.txt
+++ /dev/null
@@ -1,141 +0,0 @@
-The Performance Tests
--------------------------
-
-Building the Tests (Only develoeprs need to know how to do this).
------------------------------------------------------------------
-
-The performance tests are compiled as part of the Maven build by default, but the performance test scripts are not. There is also an additional step to perform, that generates a convenient Jar file containing all of the test dependencies, to simplify invoking Java with a very long command line. The steps to build the performance test suite are:
-
-   1. Cd to the /java/perftests directory.
-   2. Execute: mvn uk.co.thebadgerset:junit-toolkit-maven-plugin:tkscriptgen (this generates the scripts).
-   3. Execute: mvn assembly:assembly
-
-The assembly:assembly step generates a Jar with all the dependecies in it in a file name ending with -all-test-deps.jar, which contains the client code and all its dependencies, plus JUnit and the toolkit test runners. The generated scripts expect to find the jar in the current directory. You can Cd to the /target directory and run the scripts from there. The assembly:assembly step also outputs some archives that contain all the scripts and required Jar for convenient shipping of the test suite. Unpack this anywhere you like and run the tests from there.
-
-Running the Tests
------------------
-
-All the performance tests are run through shell scripts, that have been configured with parameters set up in the pom.xml file. You can override any of these parameters on the command line. It is also possible to pass parameters through the script to the JVM that is running the test. For example to change the heap size you might do:
-
-./Ping-Once.sh -java:Xmx1024M
-
-The tests have all been set up to accept a single integer 'size' parameter, passed to the JUnit TestCase for the test, through the JUnit Toolkit asymptotic test case extension. The 'size' parameter is always interpreted in the performance tests as standing for the number of messages to send per test method invocation. Therefore, in the results of the test the throughput of messages is equal to the number of test method invocations times the 'size' divided by the time taken.
-
-** TODO: Change this, use seconds not millis.
-
-Test timing results are output to .csv files, which can easily be imported into a spreadsheet for graphing and analysis. The timings in this file are always given in milliseconds, which may be a bit confusing and should really be changed to seconds.
-
-The JUnit Toolkit provides a framework for controlling how long tests are run for, how many are run at once and what the 'size' parameter is, which is general enough to handle a wide variety of performance tests. Here is the documentation from the TKTestRunner class that explains what its command line parameters are:
-
- ...
- * TKTestRunner extends {@link junit.textui.TestRunner} with the ability to run tests multiple times, to execute a test
- * simultaneously using many threads, to put a delay between test runs and adds support for tests that take integer
- * parameters that can be 'stepped' through on multiple test runs. These features can be accessed by using this class
- * as an entry point and passing command line arguments to specify which features to use:
- *
- * <pre>
- * -w ms       The number of milliseconds between invocations of test cases.
- * -c pattern  The number of tests to run concurrently.
- * -r num      The number of times to repeat each test.
- * -d duration The length of time to run the tests for.
- * -t name     The name of the test case to execute.
- * -s pattern  The size parameter to run tests with.
- * -o dir      The name of the directory to output test timings to.
- * -v          Verbose mode.
- * </pre>
- *
- * <p/>The pattern arguments are of the form [lowest(, ...)(, highest)](,sample=s)(,exp), where round brackets
- * enclose optional values. Using this pattern form it is possible to specify a single value, a range of values divided
- * into s samples, a range of values divided into s samples but distributed exponentially, or a fixed set of samples.
- *
- * <p/>The duration arguments are of the form dD(:hH)(:mM)(:sS), where round brackets enclose optional values.
- *
- * <p/>Here are some examples:
- *
- * <p/><table>
- * <tr><td><pre> -c [10,20,30,40,50] </pre><td> Runs the test with 10,20,...,50 threads.
- * <tr><td><pre> -s [1,100],samples=10 </pre>
- *     <td> Runs the test with ten different size parameters evenly spaced between 1 and 100.
- * <tr><td><pre> -s [1,1000000],samples=10,exp </pre>
- *     <td> Runs the test with ten different size parameters exponentially spaced between 1 and 1000000.
- * <tr><td><pre> -r 10 </pre><td> Runs each test ten times.
- * <tr><td><pre> -d 10H </pre><td> Runs the test repeatedly for 10 hours.
- * <tr><td><pre> -d 1M, -r 10 </pre>
- *     <td> Runs the test repeatedly for 1 minute but only takes a timing sample every 10 test runs.
- * <tr><td><pre> -r 10, -c [1, 5, 10, 50], -s [100, 1000, 10000] </pre>
- *     <td> Runs 12 test cycles (4 concurrency samples * 3 size sample), with 10 repeats each. In total the test
- *          will be run 199 times (3 + 15 + 30 + 150)
- * </table>
- ...
-
-The specific performance test cases for QPid are implemented as extensions to JUnit TestCase (asymptotic test cases), and also accept a large number of different parameters to control the characteristics of the test. The are passed into the test scripts as name=value pairs. Here is the documentation from the PingPongProducer class that explains what the available parameters and default values are:
-
- ...
- * <p/>This ping tool accepts a vast number of configuration options, all of which are passed in to the constructor. It
- * can ping topics or queues; ping multiple destinations; do persistent pings; send messages of any size; do pings within
- * transactions; control the number of pings to send in each transaction; limit its sending rate; and perform failover
- * testing. A complete list of accepted parameters, default values and comments on their usage is provided here:
- *
- * <p/><table><caption>Parameters</caption>
- * <tr><th> Parameter        <th> Default  <th> Comments
- * <tr><td> messageSize      <td> 0        <td> Message size in bytes. Not including any headers.
- * <tr><td> destinationName  <td> ping     <td> The root name to use to generate destination names to ping.
- * <tr><td> persistent       <td> false    <td> Determines whether peristent delivery is used.
- * <tr><td> transacted       <td> false    <td> Determines whether messages are sent/received in transactions.
- * <tr><td> broker           <td> tcp://localhost:5672 <td> Determines the broker to connect to.
- * <tr><td> virtualHost      <td> test     <td> Determines the virtual host to send all ping over.
- * <tr><td> rate             <td> 0        <td> The maximum rate (in hertz) to send messages at. 0 means no limit.
- * <tr><td> verbose          <td> false    <td> The verbose flag for debugging. Prints to console on every message.
- * <tr><td> pubsub           <td> false    <td> Whether to ping topics or queues. Uses p2p by default.
- * <tr><td> failAfterCommit  <td> false    <td> Whether to prompt user to kill broker after a commit batch.
- * <tr><td> failBeforeCommit <td> false    <td> Whether to prompt user to kill broker before a commit batch.
- * <tr><td> failAfterSend    <td> false    <td> Whether to prompt user to kill broker after a send.
- * <tr><td> failBeforeSend   <td> false    <td> Whether to prompt user to kill broker before a send.
- * <tr><td> failOnce         <td> true     <td> Whether to prompt for failover only once.
- * <tr><td> username         <td> guest    <td> The username to access the broker with.
- * <tr><td> password         <td> guest    <td> The password to access the broker with.
- * <tr><td> selector         <td> null     <td> Not used. Defines a message selector to filter pings with.
- * <tr><td> destinationCount <td> 1        <td> The number of receivers listening to the pings.
- * <tr><td> timeout          <td> 30000    <td> In milliseconds. The timeout to stop waiting for replies.
- * <tr><td> commitBatchSize  <td> 1        <td> The number of messages per transaction in transactional mode.
- * <tr><td> uniqueDests      <td> true     <td> Whether each receiver only listens to one ping destination or all.
- * <tr><td> durableDests     <td> false    <td> Whether or not durable destinations are used.
- * <tr><td> ackMode          <td> AUTO_ACK <td> The message acknowledgement mode. Possible values are:
- *                                               0 - SESSION_TRANSACTED
- *                                               1 - AUTO_ACKNOWLEDGE
- *                                               2 - CLIENT_ACKNOWLEDGE
- *                                               3 - DUPS_OK_ACKNOWLEDGE
- *                                               257 - NO_ACKNOWLEDGE
- *                                               258 - PRE_ACKNOWLEDGE
- * <tr><td> maxPending       <td> 0        <td> The maximum size in bytes, of messages sent but not yet received.
- *                                              Limits the volume of messages currently buffered on the client
- *                                              or broker. Can help scale test clients by limiting amount of buffered
- *                                              data to avoid out of memory errors.
- * </table>
- ...
-
-The most common test case to run is implemented in the class PingAsyncTestPerf, which sends and recieves messages simultaneously. This class uses a PingPongProdicer to do its sending and receiving, and wraps it in a suitable way to make it callable through the extended JUnit test runner. This class also accpets another parameter "batchSize" with a default of "1000". This tells the test how many messages to send before stopping sending and waiting for them all to come back. The actual value entered does not matter too much, but typically values larger than 1000 are used to ensure that there is a reasonable opportunity for simultaneous sending and receiving, and less than 10000 to ensure that each test method invocation does not go on for too long.
-
-The test script parameters can all be seen in the pom.xml file. A three letter code is used on the test scripts, first letter P or T for persistent or transient, second letter Q or T for queue (p2p) or topic (pub/sub), third letter R for reliability tests, C for client scaling tests, M for message size tests.Typically tests run and sample their results for 10 minutes, to get a reasonable measurement of a broker running under a steady load. The tests as configured do not measure 'burst' performance.
-
-The reliability/burn in tests, test the broker running at slightly below its maximum throughput for a period of 24 hours. Their purpose is to check that the broker remains stable under load for a reasonable duration, in order to provide some confidence in the long-term stability of its process. These tests are intended to be run as a two step process. The first two tests run for 10 minutes and are used to asses the broker throughput for the test. The output from these tests are to be fed into the rate limiter for the second set of tests, so that the broker may be set up to run at slightly below its maximum throughput for the 24 hour duration. It is suggested that 90% of the rate achieved by the first two tests should be used for this.
-
-The client scaling tests are split into two sub-sections. The first section tests the performance of increasing numbers of client connections, each sending at a fixed rate. The purpose of this is to determine the brokers saturation load, and to evaluate how its performance degrades uder higher loads. The second section varies the fan-out or fan-in ratio of the number of sending clients to receving clients. This is primarily intended to test the pubsub messaging model, but the tests are also run in p2p mode (with each message being received by one consumer), for completeness and to provide a comparison with the pubsub performance.
-
-The message size scaling tests, examine the brokers performance with different message payload sizes. The purpose of these tests is to evaluate where the broker process switches from being an io-bound to a cpu-bound process (if at all). The expected model is that the amount of CPU processing the broker has to carry out depends largely on the number of messages, and not on their size, because it carries out de-framing and routing for each message header but just copies payloads in-place or in a tight instruction loop. Therefore large message should be io-bound and a constant data rate through the broker should be seen for messages larger than the io/cpu threshold. Small messages require more processing so a constant message rate should be seen for message smaller than the io/cpu threshold. If the broker implementation is extremely efficient the threshold may dissapear altogether and the broker will be purely io-bound.
-The final variation, which is applied to all tests, is to run a transactional and non-transactional version of each. Messages are always batched into transactions of 100 messages each.
-
-Running the entire test suite can take some time, in particular their are about 4 24 hour burn-in tests. There are also 8 30 minute client scaling ramp up tests. If you want to run the test for a short time, to skim test that they work on your environment a command line like the following is usefull:
-
-> find . -name '*.sh' -exec {} -d10S \;
-
-If you want to run just a sub-set of the tests, you can use variations of the above command line. For example, to run just the message size tests using persistent p2p messaging do:
-
-> find . -name 'PPM-*.sh' -exec {} \;
-
-and so on.
-
-Interpreting the Results
-------------------------
-
-TODO: Explain what the results are expected to show and how to look for it. What should be graphed to get a visualization of the broker performance. How to turn the measurements into a description of the performance 'envelope'.
\ No newline at end of file
diff --git a/qpid/java/perftests/build.xml b/qpid/java/perftests/build.xml
deleted file mode 100644
index 670351886d..0000000000
--- a/qpid/java/perftests/build.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<!--
- -
- - Licensed to the Apache Software Foundation (ASF) under one
- - or more contributor license agreements.  See the NOTICE file
- - distributed with this work for additional information
- - regarding copyright ownership.  The ASF licenses this file
- - to you under the Apache License, Version 2.0 (the
- - "License"); you may not use this file except in compliance
- - with the License.  You may obtain a copy of the License at
- - 
- -   http://www.apache.org/licenses/LICENSE-2.0
- - 
- - Unless required by applicable law or agreed to in writing,
- - software distributed under the License is distributed on an
- - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- - KIND, either express or implied.  See the License for the
- - specific language governing permissions and limitations
- - under the License.
- -
- -->
-<project name="Performance Tests" default="build">
-
-    <property name="module.depends" value="systests client broker common"/>
-    <property name="module.dist" value="false"/>
-
-    <import file="../module.xml"/>
-
-</project>
diff --git a/qpid/java/perftests/dist-zip.xml b/qpid/java/perftests/dist-zip.xml
deleted file mode 100644
index 0039bfb157..0000000000
--- a/qpid/java/perftests/dist-zip.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<!--

-    Licensed to the Apache Software Foundation (ASF) under one

-    or more contributor license agreements. See the NOTICE file

-    distributed with this work for additional information

-    regarding copyright ownership. The ASF licenses this file

-    to you under the Apache License, Version 2.0 (the

-    "License"); you may not use this file except in compliance

-    with the License. You may obtain a copy of the License at

-

-    http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing,

-    software distributed under the License is distributed on an

-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    KIND, either express or implied. See the License for the

-    specific language governing permissions and limitations

-    under the License.

--->

-<!-- This is an assembly descriptor that produces a zip containing all the test scripts and

-     the all dependencies jar. -->

-<assembly>

-  <id>perftests</id>

-  <formats>

-    <format>zip</format>

-    <format>tar.gz</format>

-  </formats>

-  <includeBaseDirectory>false</includeBaseDirectory>

-  <fileSets>

-    <fileSet>

-      <directory>target</directory>

-      <outputDirectory>PerformanceTests</outputDirectory>

-      <includes>

-          <include>qpid-perftests-${qpid.version}-all-test-deps.jar</include>

-          <include>*.sh</include>

-      </includes>

-    </fileSet>

-    <fileSet>

-      <directory>etc/scripts</directory>

-      <outputDirectory>PerformanceTests</outputDirectory>

-      <includes>

-          <include>*.sh</include>

-      </includes>

-    </fileSet>

-  </fileSets>

-</assembly>

diff --git a/qpid/java/perftests/distribution/pom.xml b/qpid/java/perftests/distribution/pom.xml
deleted file mode 100644
index 7de50d5a6e..0000000000
--- a/qpid/java/perftests/distribution/pom.xml
+++ /dev/null
@@ -1,133 +0,0 @@
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements. See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership. The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License. You may obtain a copy of the License at
-    
-    http://www.apache.org/licenses/LICENSE-2.0
-    
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied. See the License for the
-    specific language governing permissions and limitations
-    under the License.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.apache.qpid</groupId>
-    <artifactId>qpid-perftests-distribution</artifactId>
-    <packaging>jar</packaging>
-    <version>1.0-incubating-M3-SNAPSHOT</version>
-    <name>Qpid Performance Tests Distribution</name>
-    <url>http://cwiki.apache.org/confluence/display/qpid</url>
-
-    <parent>
-        <groupId>org.apache.qpid</groupId>
-        <artifactId>qpid</artifactId>
-        <version>1.0-incubating-M3-SNAPSHOT</version>
-    </parent>
-
-    <properties>
-        <topDirectoryLocation>..</topDirectoryLocation>
-        <java.source.version>1.5</java.source.version>
-        <qpid.version>${pom.version}</qpid.version>
-        <qpid.targetDir>${project.build.directory}</qpid.targetDir>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.qpid</groupId>
-            <artifactId>qpid-perftests</artifactId>
-            <type>jar</type>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.qpid</groupId>
-            <artifactId>qpid-perftests</artifactId>
-            <type>test-jar</type>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>uk.co.thebadgerset</groupId>
-            <artifactId>junit-toolkit</artifactId>
-            <version>0.6-SNAPSHOT</version>
-            <scope>runtime</scope>
-            </dependency>
-        <dependency>
-            <groupId>uk.co.thebadgerset</groupId>
-            <artifactId>junit-toolkit-maven-plugin</artifactId>
-            <version>0.6-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-compiler-plugin</artifactId>
-                    <configuration>
-                        <source>${java.source.version}</source>
-                        <target>${java.source.version}</target>
-                    </configuration>
-                </plugin>
-
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-assembly-plugin</artifactId>
-                    <version>${assembly.version}</version>
-                    <configuration>
-                        <descriptors>
-                            <descriptor>src/main/assembly/performance.xml</descriptor>
-                        </descriptors>
-                        <finalName>qpid-${pom.version}</finalName>
-                        <outputDirectory>${qpid.targetDir}</outputDirectory>
-                        <tarLongFileMode>gnu</tarLongFileMode>
-                    </configuration>
-                </plugin>
-
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-jar-plugin</artifactId>
-                 <configuration>
-                        <finalName>qpid-performance</finalName>
-                        <archive>
-                            <manifest>
-                                <addClasspath>true</addClasspath>
-                            </manifest>
-                        </archive>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-
-        <plugins>
-            <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>distribution-package</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                        <configuration>
-                            <descriptors>
-                                <descriptor>src/main/assembly/performance.xml</descriptor>
-                            </descriptors>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-
-    </build>
-
-</project>
diff --git a/qpid/java/perftests/distribution/src/main/assembly/performance.xml b/qpid/java/perftests/distribution/src/main/assembly/performance.xml
deleted file mode 100644
index a564261a24..0000000000
--- a/qpid/java/perftests/distribution/src/main/assembly/performance.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<assembly>
-  <id>performance-test-java</id>
-  <includeBaseDirectory>false</includeBaseDirectory>
-  <formats>
-    <format>tar.gz</format>
-    <format>zip</format>
-  </formats>
-
-  <fileSets>
-  <!-- Apache Licensing -->
-    <fileSet>
-      <directory>../../resources</directory>
-      <outputDirectory>qpid-${qpid.version}</outputDirectory>
-      <includes>
-          <include>DISCLAIMER</include>
-          <include>LICENSE.txt</include>
-          <include>NOTICE.txt</include>
-          <include>README.txt</include>
-      </includes>
-    </fileSet>
-
-    <fileSet>
-      <directory>../../release-docs</directory>
-      <outputDirectory>qpid-${qpid.version}/docs</outputDirectory>
-      <includes>
-          <include>RELEASE_NOTES.txt</include>
-      </includes>
-    </fileSet>
-
-    <!-- Performance txt files-->
-    <fileSet>
-      <directory>..</directory>
-      <outputDirectory>qpid-${qpid.version}</outputDirectory>
-      <includes>
-          <include>*.txt</include>
-      </includes>
-    </fileSet>
-
-    <!-- Execution Scripts -->
-    <fileSet>
-      <directory>../bin</directory>
-      <outputDirectory>qpid-${qpid.version}/bin</outputDirectory>
-      <includes>
-          <include>*</include>
-      </includes>
-      <fileMode>777</fileMode>
-    </fileSet>
-
-    <!-- Provide Source in easy access location -->
-    <fileSet>
-      <directory>../src/main</directory>
-      <outputDirectory>qpid-${qpid.version}/src</outputDirectory>
-      <includes>
-          <include>**/*.java</include>
-          <include>**/*.log4j</include>
-      </includes>
-    </fileSet>
-	<fileSet>
-      <directory>../src/test</directory>
-      <outputDirectory>qpid-${qpid.version}/src</outputDirectory>
-      <includes>
-          <include>**/*.java</include>          
-      </includes>
-    </fileSet>
-
-    <!-- Metadata Jar -->
-    <fileSet>
-          <directory>target</directory>
-          <outputDirectory>qpid-${qpid.version}/lib</outputDirectory>
-          <includes>
-              <include>qpid-performance.jar</include>
-          </includes>
-    </fileSet>
-  </fileSets>
-  <dependencySets>
-    <dependencySet>
-      <outputDirectory>qpid-${qpid.version}/lib</outputDirectory>
-      <unpack>false</unpack>
-      <excludes>
-        <exclude>org.apache.qpid:qpid-perftests-distribution</exclude>
-      </excludes>
-    </dependencySet>
-  </dependencySets>
-</assembly>
diff --git a/qpid/java/perftests/etc/jndi/activemq.properties b/qpid/java/perftests/etc/jndi/activemq.properties
deleted file mode 100644
index 0616bee2e0..0000000000
--- a/qpid/java/perftests/etc/jndi/activemq.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-java.naming.factory.initial = org.apache.activemq.jndi.ActiveMQInitialContextFactory

-java.naming.provider.url= tcp://localhost:61616

-

diff --git a/qpid/java/perftests/etc/jndi/perftests.properties b/qpid/java/perftests/etc/jndi/perftests.properties
deleted file mode 100644
index 6cc16203e9..0000000000
--- a/qpid/java/perftests/etc/jndi/perftests.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-java.naming.factory.initial = org.apache.qpid.jndi.PropertiesFileInitialContextFactory

-connectionfactory.local = amqp://guest:guest@clientid/test?brokerlist='tcp://localhost:5672'

diff --git a/qpid/java/perftests/etc/jndi/swiftmq.properties b/qpid/java/perftests/etc/jndi/swiftmq.properties
deleted file mode 100644
index 5a3b3ea7ec..0000000000
--- a/qpid/java/perftests/etc/jndi/swiftmq.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-java.naming.factory.initial = com.swiftmq.jndi.InitialContextFactoryImpl

-java.naming.provider.url=smqp://localhost:4001/timeout=10000

-#connectionfactory.local = amqp://guest:guest@clientid/test?brokerlist='tcp://localhost:5672'

diff --git a/qpid/java/perftests/etc/scripts/CTQ-Qpid-1.sh b/qpid/java/perftests/etc/scripts/CTQ-Qpid-1.sh
deleted file mode 100755
index 057dec5c63..0000000000
--- a/qpid/java/perftests/etc/scripts/CTQ-Qpid-1.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-./PQ-Qpid-1.sh $@ & ./PQ-Qpid-1-P.sh $@
diff --git a/qpid/java/perftests/etc/scripts/CTQ-Qpid-2.sh b/qpid/java/perftests/etc/scripts/CTQ-Qpid-2.sh
deleted file mode 100755
index 08057cbf44..0000000000
--- a/qpid/java/perftests/etc/scripts/CTQ-Qpid-2.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-./PQ-Qpid-2.sh $@ & ./PQ-Qpid-2-P.sh $@
diff --git a/qpid/java/perftests/etc/scripts/CTQ-Qpid-3.sh b/qpid/java/perftests/etc/scripts/CTQ-Qpid-3.sh
deleted file mode 100755
index 0bb7e25197..0000000000
--- a/qpid/java/perftests/etc/scripts/CTQ-Qpid-3.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-./PQ-Qpid-3.sh $@ & ./PQ-Qpid-3-P.sh $@
diff --git a/qpid/java/perftests/etc/scripts/CTQ-Qpid-4.sh b/qpid/java/perftests/etc/scripts/CTQ-Qpid-4.sh
deleted file mode 100755
index 278e44d12b..0000000000
--- a/qpid/java/perftests/etc/scripts/CTQ-Qpid-4.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-./PQ-Qpid-4.sh $@ & ./PQ-Qpid-4-P.sh $@
diff --git a/qpid/java/perftests/etc/scripts/CTQ-Qpid-5.sh b/qpid/java/perftests/etc/scripts/CTQ-Qpid-5.sh
deleted file mode 100755
index 5dee0176b2..0000000000
--- a/qpid/java/perftests/etc/scripts/CTQ-Qpid-5.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-./PQ-Qpid-5.sh $@ & ./PQ-Qpid-5-P.sh $@
diff --git a/qpid/java/perftests/etc/scripts/CTQ-Qpid-6.sh b/qpid/java/perftests/etc/scripts/CTQ-Qpid-6.sh
deleted file mode 100755
index b9996da77d..0000000000
--- a/qpid/java/perftests/etc/scripts/CTQ-Qpid-6.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-./PQ-Qpid-6.sh $@ & ./PQ-Qpid-6-P.sh $@
diff --git a/qpid/java/perftests/etc/scripts/PT-Qpid-13.sh b/qpid/java/perftests/etc/scripts/PT-Qpid-13.sh
deleted file mode 100755
index c2c6d6fd81..0000000000
--- a/qpid/java/perftests/etc/scripts/PT-Qpid-13.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/bash
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-# Parse arguements taking all - prefixed args as JAVA_OPTS
-for arg in "$@"; do
-    if [[ $arg == -java:* ]]; then
-        JAVA_OPTS="${JAVA_OPTS}-`echo $arg|cut -d ':' -f 2`  "
-    else
-        ARGS="${ARGS}$arg "
-    fi
-done
-
-echo "Starting 6 parallel tests"
-java -Xms256m -Dlog4j.configuration=perftests.log4j -Xmx3072m -Dbadger.level=warn -Damqj.test.logging.level=info -Damqj.logging.level=warn ${JAVA_OPTS} -cp qpid-perftests-1.0-incubating-M2-SNAPSHOT-all-test-deps.jar uk.co.thebadgerset.junit.extensions.TKTestRunner -n PT-Qpid-13.1 -s [250] -c[200] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true messageSize=256 destinationName=newd1 uniqueDests=true batchSize=250 transacted=true commitBatchSize=50 -o $QPID_WORK/results ${ARGS} &
-
-java -Xms256m -Dlog4j.configuration=perftests.log4j -Xmx3072m -Dbadger.level=warn -Damqj.test.logging.level=info -Damqj.logging.level=warn ${JAVA_OPTS} -cp qpid-perftests-1.0-incubating-M2-SNAPSHOT-all-test-deps.jar uk.co.thebadgerset.junit.extensions.TKTestRunner -n PT-Qpid-13.2 -s [250] -c[200] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true messageSize=256 destinationName=newd2 uniqueDests=true batchSize=250 transacted=true commitBatchSize=50 -o $QPID_WORK/results ${ARGS} &
-
-java -Xms256m -Dlog4j.configuration=perftests.log4j -Xmx3072m -Dbadger.level=warn -Damqj.test.logging.level=info -Damqj.logging.level=warn ${JAVA_OPTS} -cp qpid-perftests-1.0-incubating-M2-SNAPSHOT-all-test-deps.jar uk.co.thebadgerset.junit.extensions.TKTestRunner -n PT-Qpid-13.3 -s [250] -c[200] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true messageSize=256 destinationName=newd3 uniqueDests=true batchSize=250 transacted=true commitBatchSize=50 -o $QPID_WORK/results ${ARGS} &
-
-java -Xms256m -Dlog4j.configuration=perftests.log4j -Xmx3072m -Dbadger.level=warn -Damqj.test.logging.level=info -Damqj.logging.level=warn ${JAVA_OPTS} -cp qpid-perftests-1.0-incubating-M2-SNAPSHOT-all-test-deps.jar uk.co.thebadgerset.junit.extensions.TKTestRunner -n PT-Qpid-13.4 -s [250] -c[200] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true messageSize=256 destinatioNname=newd4 uniqueDests=true batchSize=250 transacted=true commitBatchSize=50 -o $QPID_WORK/results ${ARGS} &
-
-java -Xms256m -Dlog4j.configuration=perftests.log4j -Xmx3072m -Dbadger.level=warn -Damqj.test.logging.level=info -Damqj.logging.level=warn ${JAVA_OPTS} -cp qpid-perftests-1.0-incubating-M2-SNAPSHOT-all-test-deps.jar uk.co.thebadgerset.junit.extensions.TKTestRunner -n PT-Qpid-13.5 -s [250] -c[100] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true messageSize=256 destinationName=newd5 uniqueDests=true batchSize=250 transacted=true commitBatchSize=50 -o $QPID_WORK/results ${ARGS} &
-
-java -Xms256m -Dlog4j.configuration=perftests.log4j -Xmx3072m -Dbadger.level=warn -Damqj.test.logging.level=info -Damqj.logging.level=warn ${JAVA_OPTS} -cp qpid-perftests-1.0-incubating-M2-SNAPSHOT-all-test-deps.jar uk.co.thebadgerset.junit.extensions.TKTestRunner -n PT-Qpid-13.6 -s [250] -c[100] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true messageSize=256 destinationName=newd6 uniqueDests=true batchSize=250 transacted=true commitBatchSize=50 -o $QPID_WORK/results ${ARGS}
-
diff --git a/qpid/java/perftests/etc/scripts/PT-Qpid-14.sh b/qpid/java/perftests/etc/scripts/PT-Qpid-14.sh
deleted file mode 100755
index f0adaa1c30..0000000000
--- a/qpid/java/perftests/etc/scripts/PT-Qpid-14.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-# Parse arguements taking all - prefixed args as JAVA_OPTS
-for arg in "$@"; do
-    if [[ $arg == -java:* ]]; then
-        JAVA_OPTS="${JAVA_OPTS}-`echo $arg|cut -d ':' -f 2`  "
-    else
-        ARGS="${ARGS}$arg "
-    fi
-done
-echo "Starting 6 parallel tests"
-
-java -Xms256m -Dlog4j.configuration=perftests.log4j -Xmx3072m -Dbadger.level=warn -Damqj.test.logging.level=info -Damqj.logging.level=warn ${JAVA_OPTS} -cp qpid-perftests-1.0-incubating-M2-SNAPSHOT-all-test-deps.jar uk.co.thebadgerset.junit.extensions.TKTestRunner -n PT-Qpid-14 -s [250] -c[200] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true messageSize=256 destinationName=ping1 batchSize=250 -o $QPID_WORK/results ${ARGS} &
-
-java -Xms256m -Dlog4j.configuration=perftests.log4j -Xmx3072m -Dbadger.level=warn -Damqj.test.logging.level=info -Damqj.logging.level=warn ${JAVA_OPTS} -cp qpid-perftests-1.0-incubating-M2-SNAPSHOT-all-test-deps.jar uk.co.thebadgerset.junit.extensions.TKTestRunner -n PT-Qpid-14 -s [250] -c[200] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true messageSize=256 destinationName=ping2 batchSize=250 -o $QPID_WORK/results ${ARGS} &
-
-java -Xms256m -Dlog4j.configuration=perftests.log4j -Xmx3072m -Dbadger.level=warn -Damqj.test.logging.level=info -Damqj.logging.level=warn ${JAVA_OPTS} -cp qpid-perftests-1.0-incubating-M2-SNAPSHOT-all-test-deps.jar uk.co.thebadgerset.junit.extensions.TKTestRunner -n PT-Qpid-14 -s [250] -c[200] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true messageSize=256 destinationName=ping3 batchSize=250 -o $QPID_WORK/results ${ARGS} &
-
-java -Xms256m -Dlog4j.configuration=perftests.log4j -Xmx3072m -Dbadger.level=warn -Damqj.test.logging.level=info -Damqj.logging.level=warn ${JAVA_OPTS} -cp qpid-perftests-1.0-incubating-M2-SNAPSHOT-all-test-deps.jar uk.co.thebadgerset.junit.extensions.TKTestRunner -n PT-Qpid-14 -s [250] -c[200] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true messageSize=256destinationname=ping4  batchSize=250 -o $QPID_WORK/results ${ARGS} &
-
-java -Xms256m -Dlog4j.configuration=perftests.log4j -Xmx3072m -Dbadger.level=warn -Damqj.test.logging.level=info -Damqj.logging.level=warn ${JAVA_OPTS} -cp qpid-perftests-1.0-incubating-M2-SNAPSHOT-all-test-deps.jar uk.co.thebadgerset.junit.extensions.TKTestRunner -n PT-Qpid-14 -s [250] -c[100] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true messageSize=256 destinationName=ping5 batchSize=250 -o $QPID_WORK/results ${ARGS} &
-
-java -Xms256m -Dlog4j.configuration=perftests.log4j -Xmx3072m -Dbadger.level=warn -Damqj.test.logging.level=info -Damqj.logging.level=warn ${JAVA_OPTS} -cp qpid-perftests-1.0-incubating-M2-SNAPSHOT-all-test-deps.jar uk.co.thebadgerset.junit.extensions.TKTestRunner -n PT-Qpid-14 -s [250] -c[100] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true messageSize=256 destinationName=ping6 batchSize=250 -o $QPID_WORK/results ${ARGS}
diff --git a/qpid/java/perftests/etc/scripts/Test-ActiveMQ.sh b/qpid/java/perftests/etc/scripts/Test-ActiveMQ.sh
deleted file mode 100644
index 099259de3d..0000000000
--- a/qpid/java/perftests/etc/scripts/Test-ActiveMQ.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash

-

-# Parse arguements taking all - prefixed args as JAVA_OPTS

-for arg in "$@"; do

-    if [[ $arg == -java:* ]]; then

-        JAVA_OPTS="${JAVA_OPTS}-`echo $arg|cut -d ':' -f 2`  "

-    else

-        ARGS="${ARGS}$arg "

-    fi

-done

-

-java -Xms256m -Dlog4j.configuration=perftests.log4j -Xmx1024m -Dbadger.level=warn -Damqj.test.logging.level=info -Damqj.logging.level=warn ${JAVA_OPTS} -cp "qpid-perftests-1.0-incubating-M2.1-SNAPSHOT.jar;activemq-jars/apache-activemq-4.1.1.jar" uk.co.thebadgerset.junit.extensions.TKTestRunner -n Test-ActiveMQ -s[1] -r 1 -t testAsyncPingOk -o . org.apache.qpid.ping.PingAsyncTestPerf properties=activemq.properties factoryName=ConnectionFactory ${ARGS}

-

-#  queueNamePostfix=@router1 overrideClientId=true 
\ No newline at end of file
diff --git a/qpid/java/perftests/etc/scripts/Test-SwiftMQ.sh b/qpid/java/perftests/etc/scripts/Test-SwiftMQ.sh
deleted file mode 100644
index e9ee85aca7..0000000000
--- a/qpid/java/perftests/etc/scripts/Test-SwiftMQ.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash

-

-# Parse arguements taking all - prefixed args as JAVA_OPTS

-for arg in "$@"; do

-    if [[ $arg == -java:* ]]; then

-        JAVA_OPTS="${JAVA_OPTS}-`echo $arg|cut -d ':' -f 2`  "

-    else

-        ARGS="${ARGS}$arg "

-    fi

-done

-

-java -Xms256m -Dlog4j.configuration=perftests.log4j -Xmx1024m -Dbadger.level=warn -Damqj.test.logging.level=info -Damqj.logging.level=warn ${JAVA_OPTS} -cp "qpid-perftests-1.0-incubating-M2.1-SNAPSHOT.jar;swiftmqjars/swiftmq.jar" uk.co.thebadgerset.junit.extensions.TKTestRunner -n Test-SwiftMQ -s[1] -r 1 -t testAsyncPingOk -o . org.apache.qpid.ping.PingAsyncTestPerf properties=swiftmq.properties factoryName=ConnectionFactory queueNamePostfix=@router1 overrideClientId=true ${ARGS}
\ No newline at end of file
diff --git a/qpid/java/perftests/etc/scripts/run_consumer.sh b/qpid/java/perftests/etc/scripts/run_consumer.sh
deleted file mode 100755
index 26585ff930..0000000000
--- a/qpid/java/perftests/etc/scripts/run_consumer.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-java -Xms256m -Xmx1024m -Ddestinations="test" -Dduration=15M -DlogFrequency=1000 -DlogFilePath="/home/rajith/qpid" -Dmax_prefetch=1000 -Djava.naming.provider.url="/home/rajith/tests.properties" -Djava.naming.factory.initial=org.apache.qpid.jndi.PropertiesFileInitialContextFactory -Djms_timeout=2000 -cp qpid-perftests-1.0-incubating-M2-SNAPSHOT.jar org.apache.qpid.client.perf.MessageConsumerTest
-
diff --git a/qpid/java/perftests/etc/scripts/run_producer.sh b/qpid/java/perftests/etc/scripts/run_producer.sh
deleted file mode 100755
index f27c1f7469..0000000000
--- a/qpid/java/perftests/etc/scripts/run_producer.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-java -Xms256m -Xmx1024m -Ddestinations="test" -Dduration=15M -DlogFrequency=1000 -DlogFilePath="/home/rajith/qpid" -Dmessage_size_before_sync=25000 -Dmessage_size_before_flush=10000 -Djava.naming.provider.url="/home/rajith/tests.properties" -Djava.naming.factory.initial=org.apache.qpid.jndi.PropertiesFileInitialContextFactory -cp qpid-perftests-1.0-incubating-M2-SNAPSHOT.jar org.apache.qpid.client.perf.MessageProducerTest
-
diff --git a/qpid/java/perftests/etc/scripts/sendAndWaitClient.sh b/qpid/java/perftests/etc/scripts/sendAndWaitClient.sh
deleted file mode 100755
index af4b788658..0000000000
--- a/qpid/java/perftests/etc/scripts/sendAndWaitClient.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#
-
-$JAVA_HOME/bin/java -Dlog4j.configuration=backup-log4j.xml -cp qpid-perftests-1.0-incubating-M2-SNAPSHOT-all-test-deps.jar org.apache.qpid.ping.PingSendOnlyClient messageSize=512
diff --git a/qpid/java/perftests/jar-with-dependencies.xml b/qpid/java/perftests/jar-with-dependencies.xml
deleted file mode 100644
index c1e3717ddf..0000000000
--- a/qpid/java/perftests/jar-with-dependencies.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<!--

-    Licensed to the Apache Software Foundation (ASF) under one

-    or more contributor license agreements. See the NOTICE file

-    distributed with this work for additional information

-    regarding copyright ownership. The ASF licenses this file

-    to you under the Apache License, Version 2.0 (the

-    "License"); you may not use this file except in compliance

-    with the License. You may obtain a copy of the License at

-    -

-    http://www.apache.org/licenses/LICENSE-2.0

-    -

-    Unless required by applicable law or agreed to in writing,

-    software distributed under the License is distributed on an

-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    KIND, either express or implied. See the License for the

-    specific language governing permissions and limitations

-    under the License.

--->

-<!-- This is an assembly descriptor that produces a distribution that contains all the

-     dependencies, with a manifest only jar that references them, required to run the 

-     tests of a maven project. 

--->

-<assembly>

-    <id>all-test-deps</id>

-    <formats>

-        <format>tar.gz</format>

-        <format>zip</format>

-    </formats>

-    <includeBaseDirectory>false</includeBaseDirectory>

-    <dependencySets>

-        <dependencySet>

-            <outputDirectory>/</outputDirectory>

-            <unpack>false</unpack>

-            <scope>test</scope>

-        </dependencySet>

-    </dependencySets>

-    <fileSets>

-        <fileSet>

-            <directory>target/classes</directory>

-            <outputDirectory></outputDirectory>

-        </fileSet>

-        <fileSet>

-            <directory>target/test-classes</directory>

-            <outputDirectory></outputDirectory>

-        </fileSet>

-

-        <!-- Include all the test scripts, both generated and hand-written. -->

-        <fileSet>

-            <directory>target</directory>

-            <outputDirectory></outputDirectory>

-            <includes>

-                <include>*.sh</include>

-            </includes>

-        </fileSet>

-        <fileSet>

-            <directory>etc/scripts</directory>

-            <outputDirectory></outputDirectory>

-            <includes>

-                <include>*.sh</include>

-            </includes>

-        </fileSet>

-

-        <!-- Include all jndi configurations needed to run the tests. -->

-        <fileSet>

-            <directory>etc/jndi</directory>

-            <outputDirectory></outputDirectory>

-            <includes>

-                <include>*.properties</include>

-            </includes>

-        </fileSet>

-

-        <!-- Include the build artifact. -->

-        <fileSet>

-            <directory>target</directory>

-            <outputDirectory></outputDirectory>

-            <includes>

-                <include>qpid-perftests-1.0-incubating-M3-SNAPSHOT.jar</include>

-            </includes>

-        </fileSet>

-

-        <!-- Include the manifest with classpath jar. -->

-        <fileSet>

-            <directory>target</directory>

-            <outputDirectory></outputDirectory>

-            <includes>

-                <include>qpid-perftests-${qpid.version}.jar</include>

-            </includes>

-        </fileSet>

-        

-    </fileSets>

-</assembly>

diff --git a/qpid/java/perftests/pom.xml b/qpid/java/perftests/pom.xml
deleted file mode 100644
index 2e13f1fae6..0000000000
--- a/qpid/java/perftests/pom.xml
+++ /dev/null
@@ -1,714 +0,0 @@
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements. See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership. The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License. You may obtain a copy of the License at
-    
-    http://www.apache.org/licenses/LICENSE-2.0
-    
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied. See the License for the
-    specific language governing permissions and limitations
-    under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.apache.qpid</groupId>
-    <artifactId>qpid-perftests</artifactId>
-    <packaging>jar</packaging>
-    <version>1.0-incubating-M3-SNAPSHOT</version>
-    <name>Qpid Performance Tests</name>
-    <url>http://cwiki.apache.org/confluence/display/qpid</url>
-
-    <parent>
-        <groupId>org.apache.qpid</groupId>
-        <artifactId>qpid</artifactId>
-        <version>1.0-incubating-M3-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <properties>
-        <topDirectoryLocation>..</topDirectoryLocation>
-        <log4j.perftests>perftests.log4j</log4j.perftests>
-    </properties>
-
-    <!-- Temporary local maven repo, whilst JUnit Toolkit is still reaching stable version to add to central maven repository. -->
-    <repositories>
-        <repository>
-            <id>junit-toolkit.snapshots</id>
-            <name>JUnit Toolkit SNAPSHOT Repository</name>
-            <url>http://junit-toolkit.svn.sourceforge.net/svnroot/junit-toolkit/snapshots/</url>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
-
-    <!-- Temporary local maven repo, whilst JUnit Toolkit is still reaching stable version to add to central maven repository. -->
-    <pluginRepositories>
-        <pluginRepository>
-            <id>junit-toolkit-plugin.snapshots</id>
-            <name>JUnit Toolkit SNAPSHOT Repository</name>
-            <url>http://junit-toolkit.svn.sourceforge.net/svnroot/junit-toolkit/snapshots/</url>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </pluginRepository>
-    </pluginRepositories>
-
-    <dependencies>
-
-        <dependency>
-            <groupId>org.apache.qpid</groupId>
-            <artifactId>qpid-client</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.qpid</groupId>
-            <artifactId>qpid-systests</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>uk.co.thebadgerset</groupId>
-            <artifactId>junit-toolkit</artifactId>
-        </dependency>
-
-        <!-- Test dependencies. -->
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.slf4j</groupId> 
-            <artifactId>slf4j-log4j12</artifactId>  
-            <version>1.4.0</version>  
-        </dependency>
-
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-            </plugin>
-
-            <!-- The JUnit Toolkit maven2 plugin is in the process of being added to the maven repository.
-                 
-                 Configures the toolkit test runner for performance testing. These can be run from within maven, or by using the generated
-                 scripts.
-                 
-                 To run from within maven:
-                 
-                 mvn uk.co.thebadgerset:junit-toolkit-maven-plugin:tktest
-                 
-                 To run from the command line (after doing assembly:assembly goal):
-                 
-                 java -cp target/test_jar-jar-with-dependencies.jar uk.co.thebadgerset.junit.extensions.TKTestRunner -s 1 -r 100000 
-                 -o target org.apache.qpid.requestreply.PingPongTestPerf
-                 
-                 To generate the scripts do:
-                 
-                 mvn uk.co.thebadgerset:junit-toolkit-maven-plugin:tkscriptgen
-                 
-                 Then to run the scripts, in the target directory do (after doing assembly:assembly goal):
-                 
-                 ./script_name.sh
-                 
-                 These scripts can find everything in the 'all test dependencies' jar created by the assembly:assembly goal.
-            -->
-            <plugin>
-                <groupId>uk.co.thebadgerset</groupId>
-                <artifactId>junit-toolkit-maven-plugin</artifactId>
-
-                <configuration>
-                    <scriptOutDirectory>target</scriptOutDirectory>
-                    <testJar>${project.build.finalName}.jar</testJar>
-                    <systemproperties>
-                        <property>
-                            <name>-Xms</name>
-                            <value>256m</value>
-                        </property>
-                        <property>
-                            <name>-Xmx</name>
-                            <value>1024m</value>
-                        </property>
-                        <property>
-                            <name>log4j.configuration</name>
-                            <value>${log4j.perftests}</value>
-                        </property>
-                        <property>
-                            <name>amqj.logging.level</name>
-                            <value>warn</value>
-                        </property>
-                        <property><!-- Turn off most logging messages from the junit-toolkit test tool itself. -->
-                            <name>badger.level</name>
-                            <value>warn</value>
-                        </property>
-                        <property>
-                            <name>amqj.test.logging.level</name>
-                            <value>info</value>
-                        </property>
-                    </systemproperties>
-
-                    <commands>
-                        <!-- Single pings. These can be scaled up by overriding the parameters when calling the test script. -->
-                        <Ping-Once>-n Ping-Once -s[1] -r 1 -t testPingOk -o . org.apache.qpid.ping.PingTestPerf</Ping-Once>
-                        <Ping-Once-Async>-n Ping-Once-Async -s[1] -r 1 -t testAsyncPingOk -o . org.apache.qpid.ping.PingAsyncTestPerf</Ping-Once-Async>
-                        <Ping-Latency>-n Ping-Latency -s[1000] -d10S -t testPingLatency -o . org.apache.qpid.ping.PingLatencyTestPerf rate=100 batchSize=100</Ping-Latency>
-
-                        <!-- More example Tests. These are examples to exercise all the features of the test harness. Can scale up with option overrides. -->
-                        <Ping-Tx>-n Ping-Tx -s[100] -o . -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf transacted=true</Ping-Tx>
-                        <Ping-Size>-n Ping-Size -s[100] -o . -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf messageSize=512</Ping-Size>
-                        <Ping-Concurrent>-n Ping-Concurrent -s[100] -c [4] -o . -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf</Ping-Concurrent>
-                        <Ping-Many-Queues>-n Ping-Many-Queues -s[100] -o . -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf destinationCount=4</Ping-Many-Queues>
-                        <Ping-Duration>-n Ping-Duration -s[100] -d10S -o . -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf</Ping-Duration>
-                        <Ping-Rate>-n Ping-Rate -s[100] -d10S -o . -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf rate=500</Ping-Rate>
-                        <Ping-PubSub>-n Ping-PubSub -s[100] -o . -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true</Ping-PubSub>
-                        <Ping-Many-Topics>-n Ping-Many-Topics -s[100] -o . -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true destinationCount=4</Ping-Many-Topics>
-                        <Ping-Persistent>-n Ping-Persistent -s[100] -o . -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true</Ping-Persistent>
-                        <Ping-Batch-Logging>-n Ping-Batch-Logging -s[100] -o . -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf batchSize=10</Ping-Batch-Logging>
-                        <Ping-Failover-Before-Send>-n Ping-Failover-Before-Send -s[100] -o . -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf commitBatchSize=10 failBeforeSend=true</Ping-Failover-Before-Send>
-                        <Ping-Failover-After-Send>-n Ping-Failover-After-Send -s[100] -o . -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf commitBatchSize=10 failAfterSend=true</Ping-Failover-After-Send>
-                        <Ping-Failover-Before-Commit>-n Ping-Failover-Before-Commit -s[100] -o . -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf commitBatchSize=10 failBeforeCommit=true</Ping-Failover-Before-Commit>
-                        <Ping-Failover-After-Commit>-n Ping-Failover-After-Commit -s[100] -o . -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf commitBatchSize=10 failAfterCommit=true</Ping-Failover-After-Commit>
-                        
-                        <!--  
-                             ***** If editing below, please use a non line wrapping mode and keep in columns, makes it easier to check for consistent
-                             ***** parameter setting accross all of the tests.
-                        -->
-
-                        <!-- 
-                             Reliability tests. The longer these tests can be run, the better.
-                             Tests 01 and 02 run for a short time. Use these to get an idea of the expected throughput.
-                             Tests 03 to 08 test all ack modes, transient/persistent, p2p/pubsub. There are 24 tests in total running for 1 hour each.
-                             This can be shortened or lengthened for the desired burn-in test time.
-                        -->
-                        <TQR-Qpid-01>-n TQR-Qpid-01           -d1M  -s[1000]   -c[16]                   -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=false uniqueDests=true  numConsumers=1   transacted=true  consTransacted=true  consAckMode=0   commitBatchSize=10  batchSize=1000   messageSize=256     destinationCount=1  rate=0     maxPending=500000  </TQR-Qpid-01>
-                        <TQR-Qpid-02>-n TQR-Qpid-02           -d1M  -s[1000]   -c[16]                   -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=false uniqueDests=true  numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=10  batchSize=1000   messageSize=256     destinationCount=1  rate=0     maxPending=500000  </TQR-Qpid-02>
-                        <TTR-Qpid-01>-n TTR-Qpid-01           -d1M  -s[100]    -c[2]                    -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=true  uniqueDests=false numConsumers=8   transacted=true  consTransacted=true  consAckMode=0   commitBatchSize=10  batchSize=1000   messageSize=256     destinationCount=1  rate=0     maxPending=500000  </TTR-Qpid-01>
-                        <TTR-Qpid-02>-n TTR-Qpid-02           -d1M  -s[100]    -c[2]                    -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=true  uniqueDests=false numConsumers=8   transacted=false consTransacted=false consAckMode=1   commitBatchSize=10  batchSize=1000   messageSize=256     destinationCount=1  rate=0     maxPending=500000  </TTR-Qpid-02>
-                        <PQR-Qpid-01>-n PQR-Qpid-01           -d1M  -s[1000]   -c[16]                   -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=true  pubsub=false uniqueDests=true  numConsumers=1   transacted=true  consTransacted=true  consAckMode=0   commitBatchSize=10  batchSize=1000   messageSize=256     destinationCount=1  rate=0     maxPending=500000  </PQR-Qpid-01>
-                        <PQR-Qpid-02>-n PQR-Qpid-02           -d1M  -s[1000]   -c[16]                   -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=true  pubsub=false uniqueDests=true  numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=10  batchSize=1000   messageSize=256     destinationCount=1  rate=0     maxPending=500000  </PQR-Qpid-02>
-                        <PTR-Qpid-01>-n PTR-Qpid-01           -d1M  -s[100]    -c[2]                    -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=true  pubsub=true  uniqueDests=false numConsumers=8   transacted=true  consTransacted=true  consAckMode=0   commitBatchSize=10  batchSize=1000   messageSize=256     destinationCount=1  rate=0     maxPending=500000  </PTR-Qpid-01>
-                        <PTR-Qpid-02>-n PTR-Qpid-02           -d1M  -s[100]    -c[2]                    -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=true  pubsub=true  uniqueDests=false numConsumers=8   transacted=false consTransacted=false consAckMode=1   commitBatchSize=10  batchSize=1000   messageSize=256     destinationCount=1  rate=0     maxPending=500000  </PTR-Qpid-02>
-
-                        <TQR-Qpid-03-TX>-n TQR-Qpid-03        -d1H  -s[10000]  -c[16]                   -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=false uniqueDests=true  numConsumers=1   transacted=true  consTransacted=true  consAckMode=0   commitBatchSize=10  batchSize=100000 messageSize=256     destinationCount=1  rate=0     maxPending=500000  </TQR-Qpid-03-TX>
-                        <TQR-Qpid-04-AUTOACK>-n TQR-Qpid-04   -d1H  -s[10000]  -c[16]                   -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=false uniqueDests=true  numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=10  batchSize=100000 messageSize=256     destinationCount=1  rate=0     maxPending=500000  </TQR-Qpid-04-AUTOACK>
-                        <TQR-Qpid-05-CLIENTACK>-n TQR-Qpid-05 -d1H  -s[10000]  -c[16]                   -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=false uniqueDests=true  numConsumers=1   transacted=false consTransacted=false consAckMode=2   commitBatchSize=10  batchSize=100000 messageSize=256     destinationCount=1  rate=0     maxPending=500000  </TQR-Qpid-05-CLIENTACK>
-                        <TQR-Qpid-06-DUPSOKACK>-n TQR-Qpid-06 -d1H  -s[10000]  -c[16]                   -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=false uniqueDests=true  numConsumers=1   transacted=false consTransacted=false consAckMode=3   commitBatchSize=10  batchSize=100000 messageSize=256     destinationCount=1  rate=0     maxPending=500000  </TQR-Qpid-06-DUPSOKACK>
-                        <TQR-Qpid-07-NOACK>-n TQR-Qpid-07     -d1H  -s[10000]  -c[16]                   -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=false uniqueDests=true  numConsumers=1   transacted=false consTransacted=false consAckMode=257 commitBatchSize=10  batchSize=100000 messageSize=256     destinationCount=1  rate=0     maxPending=500000  </TQR-Qpid-07-NOACK>
-                        <TQR-Qpid-08-PREACK>-n TQR-Qpid-08    -d1H  -s[10000]  -c[16]                   -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=false uniqueDests=true  numConsumers=1   transacted=false consTransacted=false consAckMode=258 commitBatchSize=10  batchSize=100000 messageSize=256     destinationCount=1  rate=0     maxPending=500000  </TQR-Qpid-08-PREACK>
-
-                        <TTR-Qpid-03-TX>-n TTR-Qpid-03        -d1H  -s[1000]   -c[2]                    -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=true  uniqueDests=false numConsumers=8   transacted=true  consTransacted=true  consAckMode=0   commitBatchSize=10  batchSize=100000 messageSize=256     destinationCount=1  rate=0     maxPending=500000  </TTR-Qpid-03-TX>
-                        <TTR-Qpid-04-AUTOACK>-n TTR-Qpid-04   -d1H  -s[1000]   -c[2]                    -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=true  uniqueDests=false numConsumers=8   transacted=false consTransacted=false consAckMode=1   commitBatchSize=10  batchSize=100000 messageSize=256     destinationCount=1  rate=0     maxPending=500000  </TTR-Qpid-04-AUTOACK>
-                        <TTR-Qpid-05-CLIENTACK>-n TTR-Qpid-05 -d1H  -s[1000]   -c[2]                    -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=true  uniqueDests=false numConsumers=8   transacted=false consTransacted=false consAckMode=2   commitBatchSize=10  batchSize=100000 messageSize=256     destinationCount=1  rate=0     maxPending=500000  </TTR-Qpid-05-CLIENTACK>
-                        <TTR-Qpid-06-DUPSOKACK>-n TTR-Qpid-06 -d1H  -s[1000]   -c[2]                    -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=true  uniqueDests=false numConsumers=8   transacted=false consTransacted=false consAckMode=3   commitBatchSize=10  batchSize=100000 messageSize=256     destinationCount=1  rate=0     maxPending=500000  </TTR-Qpid-06-DUPSOKACK>
-                        <TTR-Qpid-07-NOACK>-n TTR-Qpid-07     -d1H  -s[1000]   -c[2]                    -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=true  uniqueDests=false numConsumers=8   transacted=false consTransacted=false consAckMode=257 commitBatchSize=10  batchSize=100000 messageSize=256     destinationCount=1  rate=0     maxPending=500000  </TTR-Qpid-07-NOACK>
-                        <TTR-Qpid-08-PREACK>-n TTR-Qpid-08    -d1H  -s[1000]   -c[2]                    -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=true  uniqueDests=false numConsumers=8   transacted=false consTransacted=false consAckMode=258 commitBatchSize=10  batchSize=100000 messageSize=256     destinationCount=1  rate=0     maxPending=500000  </TTR-Qpid-08-PREACK>
-
-                        <PQR-Qpid-03-TX>-n PQR-Qpid-03        -d1H  -s[1000]   -c[16]                   -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=true  pubsub=false uniqueDests=true  numConsumers=1   transacted=true  consTransacted=true  consAckMode=0   commitBatchSize=10  batchSize=100000 messageSize=256     destinationCount=1  rate=0     maxPending=500000  </PQR-Qpid-03-TX>
-                        <PQR-Qpid-04-AUTOACK>-n PQR-Qpid-04   -d1H  -s[1000]   -c[16]                   -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=true  pubsub=false uniqueDests=true  numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=10  batchSize=100000 messageSize=256     destinationCount=1  rate=0     maxPending=500000  </PQR-Qpid-04-AUTOACK>
-                        <PQR-Qpid-05-CLIENTACK>-n PQR-Qpid-05 -d1H  -s[1000]   -c[16]                   -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=true  pubsub=false uniqueDests=true  numConsumers=1   transacted=false consTransacted=false consAckMode=2   commitBatchSize=10  batchSize=100000 messageSize=256     destinationCount=1  rate=0     maxPending=500000  </PQR-Qpid-05-CLIENTACK>
-                        <PQR-Qpid-06-DUPSOKACK>-n PQR-Qpid-06 -d1H  -s[1000]   -c[16]                   -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=true  pubsub=false uniqueDests=true  numConsumers=1   transacted=false consTransacted=false consAckMode=3   commitBatchSize=10  batchSize=100000 messageSize=256     destinationCount=1  rate=0     maxPending=500000  </PQR-Qpid-06-DUPSOKACK>
-                        <PQR-Qpid-07-NOACK>-n PQR-Qpid-07     -d1H  -s[1000]   -c[16]                   -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=true  pubsub=false uniqueDests=true  numConsumers=1   transacted=false consTransacted=false consAckMode=257 commitBatchSize=10  batchSize=100000 messageSize=256     destinationCount=1  rate=0     maxPending=500000  </PQR-Qpid-07-NOACK>
-                        <PQR-Qpid-08-PREACK>-n PQR-Qpid-08    -d1H  -s[1000]   -c[16]                   -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=true  pubsub=false uniqueDests=true  numConsumers=1   transacted=false consTransacted=false consAckMode=258 commitBatchSize=10  batchSize=100000 messageSize=256     destinationCount=1  rate=0     maxPending=500000  </PQR-Qpid-08-PREACK>
-
-                        <PTR-Qpid-03-TX>-n PTR-Qpid-03        -d1H  -s[100]    -c[2]                    -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=true  pubsub=true  uniqueDests=false numConsumers=8   transacted=true  consTransacted=true  consAckMode=0   commitBatchSize=10  batchSize=100000 messageSize=256     destinationCount=1  rate=0     maxPending=500000  </PTR-Qpid-03-TX>
-                        <PTR-Qpid-04-AUTOACK>-n PTR-Qpid-04   -d1H  -s[100]    -c[2]                    -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=true  pubsub=true  uniqueDests=false numConsumers=8   transacted=false consTransacted=false consAckMode=1   commitBatchSize=10  batchSize=100000 messageSize=256     destinationCount=1  rate=0     maxPending=500000  </PTR-Qpid-04-AUTOACK>
-                        <PTR-Qpid-05-CLIENTACK>-n PTR-Qpid-05 -d1H  -s[100]    -c[2]                    -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=true  pubsub=true  uniqueDests=false numConsumers=8   transacted=false consTransacted=false consAckMode=2   commitBatchSize=10  batchSize=100000 messageSize=256     destinationCount=1  rate=0     maxPending=500000  </PTR-Qpid-05-CLIENTACK>
-                        <PTR-Qpid-06-DUPSOKACK>-n PTR-Qpid-06 -d1H  -s[100]    -c[2]                    -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=true  pubsub=true  uniqueDests=false numConsumers=8   transacted=false consTransacted=false consAckMode=3   commitBatchSize=10  batchSize=100000 messageSize=256     destinationCount=1  rate=0     maxPending=500000  </PTR-Qpid-06-DUPSOKACK>
-                        <PTR-Qpid-07-NOACK>-n PTR-Qpid-07     -d1H  -s[100]    -c[2]                    -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=true  pubsub=true  uniqueDests=false numConsumers=8   transacted=false consTransacted=false consAckMode=257 commitBatchSize=10  batchSize=100000 messageSize=256     destinationCount=1  rate=0     maxPending=500000  </PTR-Qpid-07-NOACK>
-                        <PTR-Qpid-08-PREACK>-n PTR-Qpid-08    -d1H  -s[100]    -c[2]                    -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=true  pubsub=true  uniqueDests=false numConsumers=8   transacted=false consTransacted=false consAckMode=258 commitBatchSize=10  batchSize=100000 messageSize=256     destinationCount=1  rate=0     maxPending=500000  </PTR-Qpid-08-PREACK>
-                        
-                        <!-- Performance Tests. -->
-
-                        <!-- Transient, P2P Tests -->
-                        <TQCT-Qpid-01>-n TQCT-Qpid-01         -d1M  -s[1000]   -c[1,30],samples=30      -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=false uniqueDests=true  numConsumers=1   transacted=true  consTransacted=true  consAckMode=0   commitBatchSize=10  batchSize=1000   messageSize=256     destinationCount=1  rate=2000  maxPending=2000000 </TQCT-Qpid-01>
-                        <TQCT-Qpid-02>-n TQCT-Qpid-02         -d1M  -s[1000]   -c[1,30],samples=30      -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=false uniqueDests=true  numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=10  batchSize=1000   messageSize=256     destinationCount=1  rate=2000  maxPending=2000000 </TQCT-Qpid-02>
-                        <TQCL-Qpid-01>-n TQCL-Qpid-01         -d1M  -s[1000]   -c[1,30],samples=30      -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=false pubsub=false uniqueDests=true  numConsumers=1   transacted=true  consTransacted=true  consAckMode=0   commitBatchSize=10  batchSize=1000   messageSize=256     destinationCount=1  rate=2000  maxPending=2000000 </TQCL-Qpid-01>
-                        <TQCL-Qpid-02>-n TQCL-Qpid-02         -d1M  -s[1000]   -c[1,30],samples=30      -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=false pubsub=false uniqueDests=true  numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=10  batchSize=1000   messageSize=256     destinationCount=1  rate=2000  maxPending=2000000 </TQCL-Qpid-02>
-
-                        <!-- <TQC-Qpid-05>-n TQC-Qpid-05           -d10M -s[10]     -c[100]                  -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=false uniqueDests=true  numConsumers=1   transacted=true  consTransacted=true  consAckMode=0   commitBatchSize=10  batchSize=1000   messageSize=256     destinationCount=10 rate=0     maxPending=100000  </TQC-Qpid-05> -->
-                        <!-- <TQC-Qpid-06>-n TQC-Qpid-06           -d10M -s[10]     -c[100]                  -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=false uniqueDests=true  numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=10  batchSize=1000   messageSize=256     destinationCount=10 rate=0     maxPending=100000  </TQC-Qpid-06> -->
-
-                        <TQM-Qpid-01-512b>-n TQM-Qpid-01-512b -d10M -s[1000]   -c[8]                    -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=false uniqueDests=true  numConsumers=1   transacted=true  consTransacted=true  consAckMode=0   commitBatchSize=10  batchSize=1000   messageSize=512     destinationCount=1  rate=0     maxPending=2000000 </TQM-Qpid-01-512b>
-                        <TQM-Qpid-02-512b>-n TQM-Qpid-02-512b -d10M -s[1000]   -c[8]                    -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=false uniqueDests=true  numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=10  batchSize=1000   messageSize=512     destinationCount=1  rate=0     maxPending=2000000 </TQM-Qpid-02-512b>
-                        <TQM-Qpid-01-1K>-n TQM-Qpid-01-1K     -d10M -s[1000]   -c[8]                    -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=false uniqueDests=true  numConsumers=1   transacted=true  consTransacted=true  consAckMode=0   commitBatchSize=10  batchSize=1000   messageSize=1024    destinationCount=1  rate=0     maxPending=2000000 </TQM-Qpid-01-1K>
-                        <TQM-Qpid-02-1K>-n TQM-Qpid-02-1K     -d10M -s[1000]   -c[8]                    -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=false uniqueDests=true  numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=10  batchSize=1000   messageSize=1024    destinationCount=1  rate=0     maxPending=2000000 </TQM-Qpid-02-1K>
-                        <TQM-Qpid-01-5K>-n TQM-Qpid-01-5K     -d10M -s[1000]   -c[8]                    -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=false uniqueDests=true  numConsumers=1   transacted=true  consTransacted=true  consAckMode=0   commitBatchSize=10  batchSize=1000   messageSize=5120    destinationCount=1  rate=0     maxPending=2000000 </TQM-Qpid-01-5K>
-                        <TQM-Qpid-02-5K>-n TQM-Qpid-02-5K     -d10M -s[1000]   -c[8]                    -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=false uniqueDests=true  numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=10  batchSize=1000   messageSize=5120    destinationCount=1  rate=0     maxPending=2000000 </TQM-Qpid-02-5K>
-                        <TQM-Qpid-01-10K>-n TQM-Qpid-01-10K   -d10M -s[100]    -c[8]                    -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=false uniqueDests=true  numConsumers=1   transacted=true  consTransacted=true  consAckMode=0   commitBatchSize=10  batchSize=1000   messageSize=10240   destinationCount=1  rate=0     maxPending=2000000 </TQM-Qpid-01-10K>
-                        <TQM-Qpid-02-10K>-n TQM-Qpid-02-10K   -d10M -s[100]    -c[8]                    -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=false uniqueDests=true  numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=10  batchSize=1000   messageSize=10240   destinationCount=1  rate=0     maxPending=2000000 </TQM-Qpid-02-10K>
-                        <TQM-Qpid-01-50K>-n TQM-Qpid-01-50K   -d10M -s[100]    -c[8]                    -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=false uniqueDests=true  numConsumers=1   transacted=true  consTransacted=true  consAckMode=0   commitBatchSize=10  batchSize=1000   messageSize=51200   destinationCount=1  rate=0     maxPending=100000000</TQM-Qpid-01-50K>
-                        <TQM-Qpid-02-50K>-n TQM-Qpid-02-50K   -d10M -s[100]    -c[8]                    -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=false uniqueDests=true  numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=10  batchSize=1000   messageSize=51200   destinationCount=1  rate=0     maxPending=100000000</TQM-Qpid-02-50K>
-                        <TQM-Qpid-01-100K>-n TQM-Qpid-01-100K -d10M -s[100]    -c[8]                    -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=false uniqueDests=true  numConsumers=1   transacted=true  consTransacted=true  consAckMode=0   commitBatchSize=10  batchSize=1000   messageSize=102400  destinationCount=1  rate=0     maxPending=100000000</TQM-Qpid-01-100K>
-                        <TQM-Qpid-02-100K>-n TQM-Qpid-02-100K -d10M -s[100]    -c[8]                    -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=false uniqueDests=true  numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=10  batchSize=1000   messageSize=102400  destinationCount=1  rate=0     maxPending=100000000</TQM-Qpid-02-100K>
-                        <TQM-Qpid-01-500K>-n TQM-Qpid-01-500K -d10M -s[100]    -c[8]                    -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=false uniqueDests=true  numConsumers=1   transacted=true  consTransacted=true  consAckMode=0   commitBatchSize=10  batchSize=1000   messageSize=512000  destinationCount=1  rate=0     maxPending=100000000</TQM-Qpid-01-500K>
-                        <TQM-Qpid-02-500K>-n TQM-Qpid-02-500K -d10M -s[100]    -c[8]                    -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=false uniqueDests=true  numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=10  batchSize=1000   messageSize=512000  destinationCount=1  rate=0     maxPending=100000000</TQM-Qpid-02-500K>
-                        <TQM-Qpid-01-1M>-n TQM-Qpid-01-1M     -d10M -s[100]    -c[8]                    -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=false uniqueDests=true  numConsumers=1   transacted=true  consTransacted=true  consAckMode=0   commitBatchSize=10  batchSize=1000   messageSize=1048576 destinationCount=1  rate=0     maxPending=100000000</TQM-Qpid-01-1M>
-                        <TQM-Qpid-02-1M>-n TQM-Qpid-02-1M     -d10M -s[100]    -c[8]                    -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=false uniqueDests=true  numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=10  batchSize=1000   messageSize=1048576 destinationCount=1  rate=0     maxPending=100000000</TQM-Qpid-02-1M>
-
-                        <!-- Transient, Pub/Sub Tests -->
-                        <TTCT-Qpid-01>-n TTCT-Qpid-01         -d1M  -s[10]     -c[1,30],samples=30      -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=true  uniqueDests=false numConsumers=1   transacted=true  consTransacted=true  consAckMode=0   commitBatchSize=10  batchSize=1000   messageSize=256     destinationCount=1  rate=40    maxPending=2000000 </TTCT-Qpid-01>
-                        <TTCT-Qpid-02>-n TTCT-Qpid-02         -d1M  -s[10]     -c[1,30],samples=30      -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=true  uniqueDests=false numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=10  batchSize=1000   messageSize=256     destinationCount=1  rate=40    maxPending=2000000 </TTCT-Qpid-02>
-                        <TTCL-Qpid-01>-n TTCL-Qpid-01         -d1M  -s[10]     -c[1,30],samples=30      -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=false pubsub=true  uniqueDests=false numConsumers=1   transacted=true  consTransacted=true  consAckMode=0   commitBatchSize=10  batchSize=1000   messageSize=256     destinationCount=1  rate=40    maxPending=2000000 </TTCL-Qpid-01>
-                        <TTCL-Qpid-02>-n TTCL-Qpid-02         -d1M  -s[10]     -c[1,30],samples=30      -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=false pubsub=true  uniqueDests=false numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=10  batchSize=1000   messageSize=256     destinationCount=1  rate=40    maxPending=2000000 </TTCL-Qpid-02>
-
-                        <!-- <TTC-Qpid-05>-n TTC-Qpid-05           -d10M -s[10]     -c[100]                  -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=true  uniqueDests=false numConsumers=1   transacted=true  consTransacted=true  consAckMode=0   commitBatchSize=10  batchSize=1000   messageSize=256     destinationCount=10 rate=0     maxPending=100000  </TTC-Qpid-05> -->
-                        <!-- <TTC-Qpid-06>-n TTC-Qpid-06           -d10M -s[10]     -c[100]                  -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=true  uniqueDests=false numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=10  batchSize=1000   messageSize=256     destinationCount=10 rate=0     maxPending=100000  </TTC-Qpid-06> -->
-
-                        <TTM-Qpid-01-512b>-n TTM-Qpid-01-512b -d10M -s[1000]   -c[8]                    -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=true  uniqueDests=false numConsumers=1   transacted=true  consTransacted=true  consAckMode=0   commitBatchSize=10  batchSize=1000   messageSize=512     destinationCount=1  rate=0     maxPending=2000000 </TTM-Qpid-01-512b>
-                        <TTM-Qpid-02-512b>-n TTM-Qpid-02-512b -d10M -s[1000]   -c[8]                    -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=true  uniqueDests=false numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=10  batchSize=1000   messageSize=512     destinationCount=1  rate=0     maxPending=2000000 </TTM-Qpid-02-512b>
-                        <TTM-Qpid-01-1K>-n TTM-Qpid-01-1K     -d10M -s[1000]   -c[8]                    -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=true  uniqueDests=false numConsumers=1   transacted=true  consTransacted=true  consAckMode=0   commitBatchSize=10  batchSize=1000   messageSize=1024    destinationCount=1  rate=0     maxPending=2000000 </TTM-Qpid-01-1K>
-                        <TTM-Qpid-02-1K>-n TTM-Qpid-02-1K     -d10M -s[1000]   -c[8]                    -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=true  uniqueDests=false numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=10  batchSize=1000   messageSize=1024    destinationCount=1  rate=0     maxPending=2000000 </TTM-Qpid-02-1K>
-                        <TTM-Qpid-01-5K>-n TTM-Qpid-01-5K     -d10M -s[1000]   -c[8]                    -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=true  uniqueDests=false numConsumers=1   transacted=true  consTransacted=true  consAckMode=0   commitBatchSize=10  batchSize=1000   messageSize=5120    destinationCount=1  rate=0     maxPending=2000000 </TTM-Qpid-01-5K>
-                        <TTM-Qpid-02-5K>-n TTM-Qpid-02-5K     -d10M -s[1000]   -c[8]                    -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=true  uniqueDests=false numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=10  batchSize=1000   messageSize=5120    destinationCount=1  rate=0     maxPending=2000000 </TTM-Qpid-02-5K>
-                        <TTM-Qpid-01-10K>-n TTM-Qpid-01-10K   -d10M -s[100]    -c[8]                    -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=true  uniqueDests=false numConsumers=1   transacted=true  consTransacted=true  consAckMode=0   commitBatchSize=10  batchSize=1000   messageSize=10240   destinationCount=1  rate=0     maxPending=2000000 </TTM-Qpid-01-10K>
-                        <TTM-Qpid-02-10K>-n TTM-Qpid-02-10K   -d10M -s[100]    -c[8]                    -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=true  uniqueDests=false numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=10  batchSize=1000   messageSize=10240   destinationCount=1  rate=0     maxPending=2000000 </TTM-Qpid-02-10K>
-                        <TTM-Qpid-01-50K>-n TTM-Qpid-01-50K   -d10M -s[100]    -c[8]                    -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=true  uniqueDests=false numConsumers=1   transacted=true  consTransacted=true  consAckMode=0   commitBatchSize=10  batchSize=1000   messageSize=51200   destinationCount=1  rate=0     maxPending=20000000</TTM-Qpid-01-50K>
-                        <TTM-Qpid-02-50K>-n TTM-Qpid-02-50K   -d10M -s[100]    -c[8]                    -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=true  uniqueDests=false numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=10  batchSize=1000   messageSize=51200   destinationCount=1  rate=0     maxPending=20000000</TTM-Qpid-02-50K>
-                        <TTM-Qpid-01-100K>-n TTM-Qpid-01-100K -d10M -s[40]     -c[8]                    -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=true  uniqueDests=false numConsumers=1   transacted=true  consTransacted=true  consAckMode=0   commitBatchSize=10  batchSize=1000   messageSize=102400  destinationCount=1  rate=0     maxPending=20000000</TTM-Qpid-01-100K>
-                        <TTM-Qpid-02-100K>-n TTM-Qpid-02-100K -d10M -s[40]     -c[8]                    -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=true  uniqueDests=false numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=10  batchSize=1000   messageSize=102400  destinationCount=1  rate=0     maxPending=20000000</TTM-Qpid-02-100K>
-                        <TTM-Qpid-01-500K>-n TTM-Qpid-01-500K -d10M -s[8]      -c[8]                    -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=true  uniqueDests=false numConsumers=1   transacted=true  consTransacted=true  consAckMode=0   commitBatchSize=10  batchSize=1000   messageSize=512000  destinationCount=1  rate=0     maxPending=20000000</TTM-Qpid-01-500K>
-                        <TTM-Qpid-02-500K>-n TTM-Qpid-02-500K -d10M -s[8]      -c[8]                    -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=true  uniqueDests=false numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=10  batchSize=1000   messageSize=512000  destinationCount=1  rate=0     maxPending=20000000</TTM-Qpid-02-500K>
-                        <TTM-Qpid-01-1M>-n TTM-Qpid-01-1M     -d10M -s[4]      -c[8]                    -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=true  uniqueDests=false numConsumers=1   transacted=true  consTransacted=true  consAckMode=0   commitBatchSize=10  batchSize=1000   messageSize=1048576 destinationCount=1  rate=0     maxPending=20000000</TTM-Qpid-01-1M>
-                        <TTM-Qpid-02-1M>-n TTM-Qpid-02-1M     -d10M -s[4]      -c[8]                    -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=true  uniqueDests=false numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=10  batchSize=1000   messageSize=1048476 destinationCount=1  rate=0     maxPending=20000000</TTM-Qpid-02-1M>
-
-                        <!-- Persistent, P2P Tests -->
-                        <PQCT-Qpid-01>-n PQCT-Qpid-01         -d1M  -s[1000]   -c[1,30],samples=30      -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=true  pubsub=false uniqueDests=true  numConsumers=1   transacted=true  consTransacted=true  consAckMode=0   commitBatchSize=10  batchSize=1000   messageSize=256     destinationCount=1  rate=600   maxPending=2000000 </PQCT-Qpid-01>
-                        <PQCT-Qpid-02>-n PQCT-Qpid-02         -d1M  -s[1000]   -c[1,30],samples=30      -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=true  pubsub=false uniqueDests=true  numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=10  batchSize=1000   messageSize=256     destinationCount=1  rate=100   maxPending=2000000 </PQCT-Qpid-02>
-                        <PQCL-Qpid-01>-n PQCL-Qpid-01         -d1M  -s[1000]   -c[1,30],samples=30      -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=true  pubsub=false uniqueDests=true  numConsumers=1   transacted=true  consTransacted=true  consAckMode=0   commitBatchSize=10  batchSize=1000   messageSize=256     destinationCount=1  rate=600   maxPending=2000000 </PQCL-Qpid-01>
-                        <PQCL-Qpid-02>-n PQCL-Qpid-02         -d1M  -s[1000]   -c[1,30],samples=30      -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=true  pubsub=false uniqueDests=true  numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=10  batchSize=1000   messageSize=256     destinationCount=1  rate=100   maxPending=2000000 </PQCL-Qpid-02>
-
-                        <!-- <PQC-Qpid-05>-n PQC-Qpid-05           -d10M -s[10]     -c[100]                  -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=true  pubsub=false uniqueDests=true  numConsumers=1   transacted=true  consTransacted=true  consAckMode=0   commitBatchSize=10  batchSize=1000   messageSize=256     destinationCount=10 rate=0     maxPending=100000  </PQC-Qpid-05> -->
-                        <!-- <PQC-Qpid-06>-n PQC-Qpid-06           -d10M -s[10]     -c[100]                  -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=true  pubsub=false uniqueDests=true  numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=10  batchSize=1000   messageSize=256     destinationCount=10 rate=0     maxPending=100000  </PQC-Qpid-06> -->
-
-                        <PQM-Qpid-01-512b>-n PQM-Qpid-01-512b -d10M -s[1000]   -c[8]                    -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=true  pubsub=false uniqueDests=true  numConsumers=1   transacted=true  consTransacted=true  consAckMode=0   commitBatchSize=10  batchSize=1000   messageSize=512     destinationCount=1  rate=0     maxPending=2000000 </PQM-Qpid-01-512b>
-                        <PQM-Qpid-02-512b>-n PQM-Qpid-02-512b -d10M -s[1000]   -c[8]                    -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=true  pubsub=false uniqueDests=true  numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=10  batchSize=1000   messageSize=512     destinationCount=1  rate=0     maxPending=2000000 </PQM-Qpid-02-512b>
-                        <PQM-Qpid-01-1K>-n PQM-Qpid-01-1K     -d10M -s[1000]   -c[8]                    -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=true  pubsub=false uniqueDests=true  numConsumers=1   transacted=true  consTransacted=true  consAckMode=0   commitBatchSize=10  batchSize=1000   messageSize=1024    destinationCount=1  rate=0     maxPending=2000000 </PQM-Qpid-01-1K>
-                        <PQM-Qpid-02-1K>-n PQM-Qpid-02-1K     -d10M -s[1000]   -c[8]                    -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=true  pubsub=false uniqueDests=true  numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=10  batchSize=1000   messageSize=1024    destinationCount=1  rate=0     maxPending=2000000 </PQM-Qpid-02-1K>
-                        <PQM-Qpid-01-5K>-n PQM-Qpid-01-5K     -d10M -s[1000]   -c[8]                    -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=true  pubsub=false uniqueDests=true  numConsumers=1   transacted=true  consTransacted=true  consAckMode=0   commitBatchSize=10  batchSize=1000   messageSize=5120    destinationCount=1  rate=0     maxPending=2000000 </PQM-Qpid-01-5K>
-                        <PQM-Qpid-02-5K>-n PQM-Qpid-02-5K     -d10M -s[1000]   -c[8]                    -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=true  pubsub=false uniqueDests=true  numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=10  batchSize=1000   messageSize=5120    destinationCount=1  rate=0     maxPending=2000000 </PQM-Qpid-02-5K>
-                        <PQM-Qpid-01-10K>-n PQM-Qpid-01-10K   -d10M -s[100]    -c[8]                    -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=true  pubsub=false uniqueDests=true  numConsumers=1   transacted=true  consTransacted=true  consAckMode=0   commitBatchSize=10  batchSize=1000   messageSize=10240   destinationCount=1  rate=0     maxPending=2000000 </PQM-Qpid-01-10K>
-                        <PQM-Qpid-02-10K>-n PQM-Qpid-02-10K   -d10M -s[100]    -c[8]                    -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=true  pubsub=false uniqueDests=true  numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=10  batchSize=1000   messageSize=10240   destinationCount=1  rate=0     maxPending=2000000 </PQM-Qpid-02-10K>
-                        <PQM-Qpid-01-50K>-n PQM-Qpid-01-50K   -d10M -s[100]    -c[8]                    -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=true  pubsub=false uniqueDests=true  numConsumers=1   transacted=true  consTransacted=true  consAckMode=0   commitBatchSize=10  batchSize=1000   messageSize=51200   destinationCount=1  rate=0     maxPending=20000000</PQM-Qpid-01-50K>
-                        <PQM-Qpid-02-50K>-n PQM-Qpid-02-50K   -d10M -s[100]    -c[8]                    -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=true  pubsub=false uniqueDests=true  numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=10  batchSize=1000   messageSize=51200   destinationCount=1  rate=0     maxPending=20000000</PQM-Qpid-02-50K>
-                        <PQM-Qpid-01-100K>-n PQM-Qpid-01-100K -d10M -s[40]     -c[8]                    -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=true  pubsub=false uniqueDests=true  numConsumers=1   transacted=true  consTransacted=true  consAckMode=0   commitBatchSize=10  batchSize=1000   messageSize=102400  destinationCount=1  rate=0     maxPending=20000000</PQM-Qpid-01-100K>
-                        <PQM-Qpid-02-100K>-n PQM-Qpid-02-100K -d10M -s[40]     -c[8]                    -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=true  pubsub=false uniqueDests=true  numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=10  batchSize=1000   messageSize=102400  destinationCount=1  rate=0     maxPending=20000000</PQM-Qpid-02-100K>
-                        <PQM-Qpid-01-500K>-n PQM-Qpid-01-500K -d10M -s[8]      -c[8]                    -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=true  pubsub=false uniqueDests=true  numConsumers=1   transacted=true  consTransacted=true  consAckMode=0   commitBatchSize=10  batchSize=1000   messageSize=512000  destinationCount=1  rate=0     maxPending=20000000</PQM-Qpid-01-500K>
-                        <PQM-Qpid-02-500K>-n PQM-Qpid-02-500K -d10M -s[8]      -c[8]                    -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=true  pubsub=false uniqueDests=true  numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=10  batchSize=1000   messageSize=512000  destinationCount=1  rate=0     maxPending=20000000</PQM-Qpid-02-500K>
-                        <PQM-Qpid-01-1M>-n PQM-Qpid-01-1M     -d10M -s[4]      -c[8]                    -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=true  pubsub=false uniqueDests=true  numConsumers=1   transacted=true  consTransacted=true  consAckMode=0   commitBatchSize=10  batchSize=1000   messageSize=1048576 destinationCount=1  rate=0     maxPending=20000000</PQM-Qpid-01-1M>
-                        <PQM-Qpid-02-1M>-n PQM-Qpid-02-1M     -d10M -s[4]      -c[8]                    -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=true  pubsub=false uniqueDests=true  numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=10  batchSize=1000   messageSize=1048576 destinationCount=1  rate=0     maxPending=20000000</PQM-Qpid-02-1M>
-
-                        <!-- Persistent, Pub/Sub Tests -->
-                        <PTCT-Qpid-01>-n PTCT-Qpid-01         -d1M  -s[1]      -c[1,30],samples=30      -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=true  pubsub=true  uniqueDests=false numConsumers=1   transacted=true  consTransacted=true  consAckMode=0   commitBatchSize=10  batchSize=1000   messageSize=256     destinationCount=1  rate=1     maxPending=2000000 </PTCT-Qpid-01>
-                        <PTCT-Qpid-02>-n PTCT-Qpid-02         -d1M  -s[1]      -c[1,30],samples=30      -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=true  pubsub=true  uniqueDests=false numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=10  batchSize=1000   messageSize=256     destinationCount=1  rate=1     maxPending=2000000 </PTCT-Qpid-02>
-                        <PTCL-Qpid-01>-n PTCL-Qpid-01         -d1M  -s[1]      -c[1,30],samples=30      -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=true  pubsub=true  uniqueDests=false numConsumers=1   transacted=true  consTransacted=true  consAckMode=0   commitBatchSize=10  batchSize=1000   messageSize=256     destinationCount=1  rate=1     maxPending=2000000 </PTCL-Qpid-01>
-                        <PTCL-Qpid-02>-n PTCL-Qpid-02         -d1M  -s[1]      -c[1,30],samples=30      -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=true  pubsub=true  uniqueDests=false numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=10  batchSize=1000   messageSize=256     destinationCount=1  rate=1     maxPending=2000000 </PTCL-Qpid-02>
-
-                        <!-- <PTC-Qpid-05>-n PTC-Qpid-05           -d10M -s[10]     -c[100]                  -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=true  pubsub=true  uniqueDests=false numConsumers=1   transacted=true  consTransacted=true  consAckMode=0   commitBatchSize=10  batchSize=1000   messageSize=256     destinationCount=10 rate=0     maxPending=100000  </PTC-Qpid-05> -->
-                        <!-- <PTC-Qpid-06>-n PTC-Qpid-06           -d10M -s[10]     -c[100]                  -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=true  pubsub=true  uniqueDests=false numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=10  batchSize=1000   messageSize=256     destinationCount=10 rate=0     maxPending=100000  </PTC-Qpid-06> -->
-
-                        <PTM-Qpid-01-512b>-n PTM-Qpid-01-512b -d10M -s[1000]   -c[8]                    -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=true  pubsub=true  uniqueDests=false numConsumers=1   transacted=true  consTransacted=true  consAckMode=0   commitBatchSize=10  batchSize=1000   messageSize=512     destinationCount=1  rate=0     maxPending=2000000 </PTM-Qpid-01-512b>
-                        <PTM-Qpid-02-512b>-n PTM-Qpid-02-512b -d10M -s[1000]   -c[8]                    -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=true  pubsub=true  uniqueDests=false numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=10  batchSize=1000   messageSize=512     destinationCount=1  rate=0     maxPending=2000000 </PTM-Qpid-02-512b>
-                        <PTM-Qpid-01-1K>-n PTM-Qpid-01-1K     -d10M -s[1000]   -c[8]                    -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=true  pubsub=true  uniqueDests=false numConsumers=1   transacted=true  consTransacted=true  consAckMode=0   commitBatchSize=10  batchSize=1000   messageSize=1024    destinationCount=1  rate=0     maxPending=2000000 </PTM-Qpid-01-1K>
-                        <PTM-Qpid-02-1K>-n PTM-Qpid-02-1K     -d10M -s[1000]   -c[8]                    -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=true  pubsub=true  uniqueDests=false numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=10  batchSize=1000   messageSize=1024    destinationCount=1  rate=0     maxPending=2000000 </PTM-Qpid-02-1K>
-                        <PTM-Qpid-01-5K>-n PTM-Qpid-01-5K     -d10M -s[1000]   -c[8]                    -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=true  pubsub=true  uniqueDests=false numConsumers=1   transacted=true  consTransacted=true  consAckMode=0   commitBatchSize=10  batchSize=1000   messageSize=5120    destinationCount=1  rate=0     maxPending=2000000 </PTM-Qpid-01-5K>
-                        <PTM-Qpid-02-5K>-n PTM-Qpid-02-5K     -d10M -s[1000]   -c[8]                    -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=true  pubsub=true  uniqueDests=false numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=10  batchSize=1000   messageSize=5120    destinationCount=1  rate=0     maxPending=2000000 </PTM-Qpid-02-5K>
-                        <PTM-Qpid-01-10K>-n PTM-Qpid-01-10K   -d10M -s[100]    -c[8]                    -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=true  pubsub=true  uniqueDests=false numConsumers=1   transacted=true  consTransacted=true  consAckMode=0   commitBatchSize=10  batchSize=1000   messageSize=10240   destinationCount=1  rate=0     maxPending=2000000 </PTM-Qpid-01-10K>
-                        <PTM-Qpid-02-10K>-n PTM-Qpid-02-10K   -d10M -s[100]    -c[8]                    -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=true  pubsub=true  uniqueDests=false numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=10  batchSize=1000   messageSize=10240   destinationCount=1  rate=0     maxPending=2000000 </PTM-Qpid-02-10K>
-                        <PTM-Qpid-01-50K>-n PTM-Qpid-01-50K   -d10M -s[100]    -c[8]                    -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=true  pubsub=true  uniqueDests=false numConsumers=1   transacted=true  consTransacted=true  consAckMode=0   commitBatchSize=10  batchSize=1000   messageSize=51200   destinationCount=1  rate=0     maxPending=20000000</PTM-Qpid-01-50K>
-                        <PTM-Qpid-02-50K>-n PTM-Qpid-02-50K   -d10M -s[100]    -c[8]                    -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=true  pubsub=true  uniqueDests=false numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=10  batchSize=1000   messageSize=51200   destinationCount=1  rate=0     maxPending=20000000</PTM-Qpid-02-50K>
-                        <PTM-Qpid-01-100K>-n PTM-Qpid-01-100K -d10M -s[40]     -c[8]                    -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=true  pubsub=true  uniqueDests=false numConsumers=1   transacted=true  consTransacted=true  consAckMode=0   commitBatchSize=10  batchSize=1000   messageSize=102400  destinationCount=1  rate=0     maxPending=20000000</PTM-Qpid-01-100K>
-                        <PTM-Qpid-02-100K>-n PTM-Qpid-02-100K -d10M -s[40]     -c[8]                    -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=true  pubsub=true  uniqueDests=false numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=10  batchSize=1000   messageSize=102400  destinationCount=1  rate=0     maxPending=20000000</PTM-Qpid-02-100K>
-                        <PTM-Qpid-01-500K>-n PTM-Qpid-01-500K -d10M -s[8]      -c[8]                    -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=true  pubsub=true  uniqueDests=false numConsumers=1   transacted=true  consTransacted=true  consAckMode=0   commitBatchSize=10  batchSize=1000   messageSize=512000  destinationCount=1  rate=0     maxPending=20000000</PTM-Qpid-01-500K>
-                        <PTM-Qpid-02-500K>-n PTM-Qpid-02-500K -d10M -s[8]      -c[8]                    -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=true  pubsub=true  uniqueDests=false numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=10  batchSize=1000   messageSize=512000  destinationCount=1  rate=0     maxPending=20000000</PTM-Qpid-02-500K>
-                        <PTM-Qpid-01-1M>-n PTM-Qpid-01-1M     -d10M -s[4]      -c[8]                    -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=true  pubsub=true  uniqueDests=false numConsumers=1   transacted=true  consTransacted=true  consAckMode=0   commitBatchSize=10  batchSize=1000   messageSize=1048576 destinationCount=1  rate=0     maxPending=20000000</PTM-Qpid-01-1M>
-                        <PTM-Qpid-02-1M>-n PTM-Qpid-02-1M     -d10M -s[4]      -c[8]                    -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=true  pubsub=true  uniqueDests=false numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=10  batchSize=1000   messageSize=1048476 destinationCount=1  rate=0     maxPending=20000000</PTM-Qpid-02-1M>
-
-                        <!-- Benchmarking tests. -->
-                        <!-- Throughput. -->
-                        <TQBT-TX-Qpid-01>-n TQBT-TX-Qpid-01   -d10M -s[1000]   -c[16]                   -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=false uniqueDests=true  numConsumers=1   transacted=true  consTransacted=true  consAckMode=0   commitBatchSize=1   batchSize=1000   messageSize=256     destinationCount=1  rate=0     maxPending=2000000 </TQBT-TX-Qpid-01>
-                        <TQBT-AA-Qpid-01>-n TQBT-AA-Qpid-01   -d10M -s[1000]   -c[16]                   -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=false uniqueDests=true  numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=1000   messageSize=256     destinationCount=1  rate=0     maxPending=2000000 </TQBT-AA-Qpid-01>
-                        <TQBT-NA-Qpid-01>-n TQBT-NA-Qpid-01   -d10M -s[1000]   -c[16]                   -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=false uniqueDests=true  numConsumers=1   transacted=false consTransacted=false consAckMode=257 commitBatchSize=1   batchSize=1000   messageSize=256     destinationCount=1  rate=0     maxPending=2000000 </TQBT-NA-Qpid-01>
-                        <TTBT-TX-Qpid-01>-n TTBT-TX-Qpid-01   -d10M -s[1000]   -c[2]                    -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=true  uniqueDests=false numConsumers=8   transacted=true  consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=1000   messageSize=256     destinationCount=1  rate=0     maxPending=2000000 </TTBT-TX-Qpid-01>
-                        <TTBT-AA-Qpid-01>-n TTBT-AA-Qpid-01   -d10M -s[1000]   -c[2]                    -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=true  uniqueDests=false numConsumers=8   transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=1000   messageSize=256     destinationCount=1  rate=0     maxPending=2000000 </TTBT-AA-Qpid-01>
-                        <TTBT-NA-Qpid-01>-n TTBT-NA-Qpid-01   -d10M -s[1000]   -c[2]                    -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=true  uniqueDests=false numConsumers=8   transacted=false consTransacted=false consAckMode=257 commitBatchSize=1   batchSize=1000   messageSize=256     destinationCount=1  rate=0     maxPending=2000000 </TTBT-NA-Qpid-01>
-
-                        <PQBT-TX-Qpid-01>-n PQBT-TX-Qpid-01   -d10M -s[1000]   -c[16]                   -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=true  pubsub=false uniqueDests=true  numConsumers=1   transacted=true  consTransacted=true  consAckMode=0   commitBatchSize=1   batchSize=1000   messageSize=256     destinationCount=1  rate=0     maxPending=2000000 </PQBT-TX-Qpid-01>
-                        <PQBT-AA-Qpid-01>-n PQBT-AA-Qpid-01   -d10M -s[1000]   -c[16]                   -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=true  pubsub=false uniqueDests=true  numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=1000   messageSize=256     destinationCount=1  rate=0     maxPending=2000000 </PQBT-AA-Qpid-01>
-                        <PTBT-TX-Qpid-01>-n PTBT-TX-Qpid-01   -d10M -s[1000]   -c[2]                    -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=true  pubsub=true  uniqueDests=false numConsumers=8   transacted=true  consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=1000   messageSize=256     destinationCount=1  rate=0     maxPending=2000000 </PTBT-TX-Qpid-01>
-                        <PTBT-AA-Qpid-01>-n PTBT-AA-Qpid-01   -d10M -s[1000]   -c[2]                    -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=true  pubsub=true  uniqueDests=false numConsumers=8   transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=1000   messageSize=256     destinationCount=1  rate=0     maxPending=2000000 </PTBT-AA-Qpid-01>
-
-                        <!-- Job Queueing. 1:10 -->
-                        <TQBL-AA-Qpid-02-01>-n TQBL-AA-Qpid-02 -d1M -s[1000]   -c[1]                    -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=false pubsub=false uniqueDests=true  numConsumers=10  transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=1000   messageSize=5120    destinationCount=1  rate=1000  maxPending=2000000 </TQBL-AA-Qpid-02-01>
-                        <TQBL-AA-Qpid-02-02>-n TQBL-AA-Qpid-02 -d1M -s[1000]   -c[1]                    -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=false pubsub=false uniqueDests=true  numConsumers=10  transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=1000   messageSize=5120    destinationCount=1  rate=2000  maxPending=2000000 </TQBL-AA-Qpid-02-02>
-                        <TQBL-AA-Qpid-02-03>-n TQBL-AA-Qpid-02 -d1M -s[1000]   -c[1]                    -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=false pubsub=false uniqueDests=true  numConsumers=10  transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=1000   messageSize=5120    destinationCount=1  rate=3000  maxPending=2000000 </TQBL-AA-Qpid-02-03>
-                        <TQBL-AA-Qpid-02-04>-n TQBL-AA-Qpid-02 -d1M -s[1000]   -c[1]                    -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=false pubsub=false uniqueDests=true  numConsumers=10  transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=1000   messageSize=5120    destinationCount=1  rate=4000  maxPending=2000000 </TQBL-AA-Qpid-02-04>
-                        <TQBL-AA-Qpid-02-05>-n TQBL-AA-Qpid-02 -d1M -s[1000]   -c[1]                    -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=false pubsub=false uniqueDests=true  numConsumers=10  transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=1000   messageSize=5120    destinationCount=1  rate=5000  maxPending=2000000 </TQBL-AA-Qpid-02-05>
-                        <TQBL-AA-Qpid-02-06>-n TQBL-AA-Qpid-02 -d1M -s[1000]   -c[1]                    -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=false pubsub=false uniqueDests=true  numConsumers=10  transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=1000   messageSize=5120    destinationCount=1  rate=6000  maxPending=2000000 </TQBL-AA-Qpid-02-06>
-                        <TQBL-AA-Qpid-02-07>-n TQBL-AA-Qpid-02 -d1M -s[1000]   -c[1]                    -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=false pubsub=false uniqueDests=true  numConsumers=10  transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=1000   messageSize=5120    destinationCount=1  rate=7000  maxPending=2000000 </TQBL-AA-Qpid-02-07>
-                        <TQBL-AA-Qpid-02-08>-n TQBL-AA-Qpid-02 -d1M -s[1000]   -c[1]                    -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=false pubsub=false uniqueDests=true  numConsumers=10  transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=1000   messageSize=5120    destinationCount=1  rate=8000  maxPending=2000000 </TQBL-AA-Qpid-02-08>
-                        <TQBL-AA-Qpid-02-09>-n TQBL-AA-Qpid-02 -d1M -s[1000]   -c[1]                    -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=false pubsub=false uniqueDests=true  numConsumers=10  transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=1000   messageSize=5120    destinationCount=1  rate=9000  maxPending=2000000 </TQBL-AA-Qpid-02-09>
-                        <TQBL-AA-Qpid-02-10>-n TQBL-AA-Qpid-02 -d1M -s[1000]   -c[1]                    -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=false pubsub=false uniqueDests=true  numConsumers=10  transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=1000   messageSize=5120    destinationCount=1  rate=10000 maxPending=2000000 </TQBL-AA-Qpid-02-10>
-
-                        <PQBL-AA-Qpid-02-01>-n PQBL-AA-Qpid-02 -d1M -s[1000]   -c[1]                    -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=true  pubsub=false uniqueDests=true  numConsumers=10  transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=1000   messageSize=5120    destinationCount=1  rate=100   maxPending=2000000 </PQBL-AA-Qpid-02-01>
-                        <PQBL-AA-Qpid-02-02>-n PQBL-AA-Qpid-02 -d1M -s[1000]   -c[1]                    -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=true  pubsub=false uniqueDests=true  numConsumers=10  transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=1000   messageSize=5120    destinationCount=1  rate=200   maxPending=2000000 </PQBL-AA-Qpid-02-02>
-                        <PQBL-AA-Qpid-02-03>-n PQBL-AA-Qpid-02 -d1M -s[1000]   -c[1]                    -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=true  pubsub=false uniqueDests=true  numConsumers=10  transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=1000   messageSize=5120    destinationCount=1  rate=300   maxPending=2000000 </PQBL-AA-Qpid-02-03>
-                        <PQBL-AA-Qpid-02-04>-n PQBL-AA-Qpid-02 -d1M -s[1000]   -c[1]                    -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=true  pubsub=false uniqueDests=true  numConsumers=10  transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=1000   messageSize=5120    destinationCount=1  rate=400   maxPending=2000000 </PQBL-AA-Qpid-02-04>
-                        <PQBL-AA-Qpid-02-05>-n PQBL-AA-Qpid-02 -d1M -s[1000]   -c[1]                    -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=true  pubsub=false uniqueDests=true  numConsumers=10  transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=1000   messageSize=5120    destinationCount=1  rate=500   maxPending=2000000 </PQBL-AA-Qpid-02-05>
-                        <PQBL-AA-Qpid-02-06>-n PQBL-AA-Qpid-02 -d1M -s[1000]   -c[1]                    -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=true  pubsub=false uniqueDests=true  numConsumers=10  transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=1000   messageSize=5120    destinationCount=1  rate=600   maxPending=2000000 </PQBL-AA-Qpid-02-06>
-                        <PQBL-AA-Qpid-02-07>-n PQBL-AA-Qpid-02 -d1M -s[1000]   -c[1]                    -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=true  pubsub=false uniqueDests=true  numConsumers=10  transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=1000   messageSize=5120    destinationCount=1  rate=700   maxPending=2000000 </PQBL-AA-Qpid-02-07>
-                        <PQBL-AA-Qpid-02-08>-n PQBL-AA-Qpid-02 -d1M -s[1000]   -c[1]                    -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=true  pubsub=false uniqueDests=true  numConsumers=10  transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=1000   messageSize=5120    destinationCount=1  rate=800   maxPending=2000000 </PQBL-AA-Qpid-02-08>
-                        <PQBL-AA-Qpid-02-09>-n PQBL-AA-Qpid-02 -d1M -s[1000]   -c[1]                    -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=true  pubsub=false uniqueDests=true  numConsumers=10  transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=1000   messageSize=5120    destinationCount=1  rate=900   maxPending=2000000 </PQBL-AA-Qpid-02-09>
-                        <PQBL-AA-Qpid-02-10>-n PQBL-AA-Qpid-02 -d1M -s[1000]   -c[1]                    -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=true  pubsub=false uniqueDests=true  numConsumers=10  transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=1000   messageSize=5120    destinationCount=1  rate=1000  maxPending=2000000 </PQBL-AA-Qpid-02-10>
-
-                        <!-- Broadcast of small sized time critical messages. Lowish rates. Transient/Persistent. 1:100, auto ack. -->
-                        <TTBL-AA-Qpid-03-01>-n TTBL-AA-Qpid-03 -d1M -s[1000]    -c[1]                   -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=false pubsub=true  uniqueDests=false numConsumers=50  transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=1001   messageSize=256     destinationCount=1  rate=200   maxPending=2000000 </TTBL-AA-Qpid-03-01>
-                        <TTBL-AA-Qpid-03-02>-n TTBL-AA-Qpid-03 -d1M -s[1000]    -c[1]                   -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=false pubsub=true  uniqueDests=false numConsumers=50  transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=1001   messageSize=256     destinationCount=1  rate=400   maxPending=2000000 </TTBL-AA-Qpid-03-02>
-                        <TTBL-AA-Qpid-03-03>-n TTBL-AA-Qpid-03 -d1M -s[1000]    -c[1]                   -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=false pubsub=true  uniqueDests=false numConsumers=50  transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=1001   messageSize=256     destinationCount=1  rate=600   maxPending=2000000 </TTBL-AA-Qpid-03-03>
-                        <TTBL-AA-Qpid-03-04>-n TTBL-AA-Qpid-03 -d1M -s[1000]    -c[1]                   -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=false pubsub=true  uniqueDests=false numConsumers=50  transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=1001   messageSize=256     destinationCount=1  rate=800   maxPending=2000000 </TTBL-AA-Qpid-03-04>
-                        <TTBL-AA-Qpid-03-05>-n TTBL-AA-Qpid-03 -d1M -s[1000]    -c[1]                   -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=false pubsub=true  uniqueDests=false numConsumers=50  transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=1001   messageSize=256     destinationCount=1  rate=1000  maxPending=2000000 </TTBL-AA-Qpid-03-05>
-                        <TTBL-AA-Qpid-03-06>-n TTBL-AA-Qpid-03 -d1M -s[1000]    -c[1]                   -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=false pubsub=true  uniqueDests=false numConsumers=50  transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=1001   messageSize=256     destinationCount=1  rate=1200  maxPending=2000000 </TTBL-AA-Qpid-03-06>
-                        <TTBL-AA-Qpid-03-07>-n TTBL-AA-Qpid-03 -d1M -s[1000]    -c[1]                   -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=false pubsub=true  uniqueDests=false numConsumers=50  transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=1001   messageSize=256     destinationCount=1  rate=1400  maxPending=2000000 </TTBL-AA-Qpid-03-07>
-                        <TTBL-AA-Qpid-03-08>-n TTBL-AA-Qpid-03 -d1M -s[1000]    -c[1]                   -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=false pubsub=true  uniqueDests=false numConsumers=50  transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=1001   messageSize=256     destinationCount=1  rate=1600  maxPending=2000000 </TTBL-AA-Qpid-03-08>
-                        <TTBL-AA-Qpid-03-09>-n TTBL-AA-Qpid-03 -d1M -s[1000]    -c[1]                   -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=false pubsub=true  uniqueDests=false numConsumers=50  transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=1001   messageSize=256     destinationCount=1  rate=1800  maxPending=2000000 </TTBL-AA-Qpid-03-09>
-                        <TTBL-AA-Qpid-03-10>-n TTBL-AA-Qpid-03 -d1M -s[1000]    -c[1]                   -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=false pubsub=true  uniqueDests=false numConsumers=50  transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=1001   messageSize=256     destinationCount=1  rate=2000  maxPending=2000000 </TTBL-AA-Qpid-03-10>
-
-                        <PTBL-AA-Qpid-03-01>-n PTBL-AA-Qpid-03 -d1M -s[100]     -c[1]                   -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=true  pubsub=true  uniqueDests=false numConsumers=50  transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=101    messageSize=256     destinationCount=1  rate=10    maxPending=2000000 </PTBL-AA-Qpid-03-01>
-                        <PTBL-AA-Qpid-03-02>-n PTBL-AA-Qpid-03 -d1M -s[100]     -c[1]                   -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=true  pubsub=true  uniqueDests=false numConsumers=50  transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=101    messageSize=256     destinationCount=1  rate=20    maxPending=2000000 </PTBL-AA-Qpid-03-02>
-                        <PTBL-AA-Qpid-03-03>-n PTBL-AA-Qpid-03 -d1M -s[100]     -c[1]                   -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=true  pubsub=true  uniqueDests=false numConsumers=50  transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=101    messageSize=256     destinationCount=1  rate=30    maxPending=2000000 </PTBL-AA-Qpid-03-03>
-                        <PTBL-AA-Qpid-03-04>-n PTBL-AA-Qpid-03 -d1M -s[100]     -c[1]                   -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=true  pubsub=true  uniqueDests=false numConsumers=50  transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=101    messageSize=256     destinationCount=1  rate=40    maxPending=2000000 </PTBL-AA-Qpid-03-04>
-                        <PTBL-AA-Qpid-03-05>-n PTBL-AA-Qpid-03 -d1M -s[100]     -c[1]                   -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=true  pubsub=true  uniqueDests=false numConsumers=50  transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=101    messageSize=256     destinationCount=1  rate=50    maxPending=2000000 </PTBL-AA-Qpid-03-05>
-                        <PTBL-AA-Qpid-03-06>-n PTBL-AA-Qpid-03 -d1M -s[100]     -c[1]                   -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=true  pubsub=true  uniqueDests=false numConsumers=50  transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=101    messageSize=256     destinationCount=1  rate=60    maxPending=2000000 </PTBL-AA-Qpid-03-06>
-                        <PTBL-AA-Qpid-03-07>-n PTBL-AA-Qpid-03 -d1M -s[100]     -c[1]                   -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=true  pubsub=true  uniqueDests=false numConsumers=50  transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=101    messageSize=256     destinationCount=1  rate=70    maxPending=2000000 </PTBL-AA-Qpid-03-07>
-                        <PTBL-AA-Qpid-03-08>-n PTBL-AA-Qpid-03 -d1M -s[100]     -c[1]                   -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=true  pubsub=true  uniqueDests=false numConsumers=50  transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=101    messageSize=256     destinationCount=1  rate=80    maxPending=2000000 </PTBL-AA-Qpid-03-08>
-                        <PTBL-AA-Qpid-03-09>-n PTBL-AA-Qpid-03 -d1M -s[100]     -c[1]                   -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=true  pubsub=true  uniqueDests=false numConsumers=50  transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=101    messageSize=256     destinationCount=1  rate=90    maxPending=2000000 </PTBL-AA-Qpid-03-09>
-                        <PTBL-AA-Qpid-03-10>-n PTBL-AA-Qpid-03 -d1M -s[100]     -c[1]                   -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=true  pubsub=true  uniqueDests=false numConsumers=50  transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=101    messageSize=256     destinationCount=1  rate=100   maxPending=2000000 </PTBL-AA-Qpid-03-10>
-
-                        <!-- Broadcast of medium sized time critical messages. Lowish rates. Transient/Persistent. 1:100, auto ack. -->
-                        <TTBL-AA-Qpid-04-01>-n TTBL-AA-Qpid-04 -d1M -s[1000]    -c[1]                   -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=false pubsub=true  uniqueDests=false numConsumers=50  transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=1001   messageSize=5120    destinationCount=1  rate=100   maxPending=2000000 </TTBL-AA-Qpid-04-01>
-                        <TTBL-AA-Qpid-04-02>-n TTBL-AA-Qpid-04 -d1M -s[1000]    -c[1]                   -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=false pubsub=true  uniqueDests=false numConsumers=50  transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=1001   messageSize=5120    destinationCount=1  rate=200   maxPending=2000000 </TTBL-AA-Qpid-04-02>
-                        <TTBL-AA-Qpid-04-03>-n TTBL-AA-Qpid-04 -d1M -s[1000]    -c[1]                   -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=false pubsub=true  uniqueDests=false numConsumers=50  transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=1001   messageSize=5120    destinationCount=1  rate=300   maxPending=2000000 </TTBL-AA-Qpid-04-03>
-                        <TTBL-AA-Qpid-04-04>-n TTBL-AA-Qpid-04 -d1M -s[1000]    -c[1]                   -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=false pubsub=true  uniqueDests=false numConsumers=50  transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=1001   messageSize=5120    destinationCount=1  rate=400   maxPending=2000000 </TTBL-AA-Qpid-04-04>
-                        <TTBL-AA-Qpid-04-05>-n TTBL-AA-Qpid-04 -d1M -s[1000]    -c[1]                   -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=false pubsub=true  uniqueDests=false numConsumers=50  transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=1001   messageSize=5120    destinationCount=1  rate=500   maxPending=2000000 </TTBL-AA-Qpid-04-05>
-                        <TTBL-AA-Qpid-04-06>-n TTBL-AA-Qpid-04 -d1M -s[1000]    -c[1]                   -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=false pubsub=true  uniqueDests=false numConsumers=50  transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=1001   messageSize=5120    destinationCount=1  rate=600   maxPending=2000000 </TTBL-AA-Qpid-04-06>
-                        <TTBL-AA-Qpid-04-07>-n TTBL-AA-Qpid-04 -d1M -s[1000]    -c[1]                   -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=false pubsub=true  uniqueDests=false numConsumers=50  transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=1001   messageSize=5120    destinationCount=1  rate=700   maxPending=2000000 </TTBL-AA-Qpid-04-07>
-                        <TTBL-AA-Qpid-04-08>-n TTBL-AA-Qpid-04 -d1M -s[1000]    -c[1]                   -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=false pubsub=true  uniqueDests=false numConsumers=50  transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=1001   messageSize=5120    destinationCount=1  rate=800   maxPending=2000000 </TTBL-AA-Qpid-04-08>
-                        <TTBL-AA-Qpid-04-09>-n TTBL-AA-Qpid-04 -d1M -s[1000]    -c[1]                   -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=false pubsub=true  uniqueDests=false numConsumers=50  transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=1001   messageSize=5120    destinationCount=1  rate=900   maxPending=2000000 </TTBL-AA-Qpid-04-09>
-                        <TTBL-AA-Qpid-04-10>-n TTBL-AA-Qpid-04 -d1M -s[1000]    -c[1]                   -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=false pubsub=true  uniqueDests=false numConsumers=50  transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=1001   messageSize=5120    destinationCount=1  rate=1000  maxPending=2000000 </TTBL-AA-Qpid-04-10>
-
-                        <PTBL-AA-Qpid-04-01>-n PTBL-AA-Qpid-04 -d1M -s[100]     -c[1]                   -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=true  pubsub=true  uniqueDests=false numConsumers=50  transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=101    messageSize=5120    destinationCount=1  rate=10    maxPending=2000000 </PTBL-AA-Qpid-04-01>
-                        <PTBL-AA-Qpid-04-02>-n PTBL-AA-Qpid-04 -d1M -s[100]     -c[1]                   -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=true  pubsub=true  uniqueDests=false numConsumers=50  transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=101    messageSize=5120    destinationCount=1  rate=20    maxPending=2000000 </PTBL-AA-Qpid-04-02>
-                        <PTBL-AA-Qpid-04-03>-n PTBL-AA-Qpid-04 -d1M -s[100]     -c[1]                   -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=true  pubsub=true  uniqueDests=false numConsumers=50  transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=101    messageSize=5120    destinationCount=1  rate=30    maxPending=2000000 </PTBL-AA-Qpid-04-03>
-                        <PTBL-AA-Qpid-04-04>-n PTBL-AA-Qpid-04 -d1M -s[100]     -c[1]                   -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=true  pubsub=true  uniqueDests=false numConsumers=50  transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=101    messageSize=5120    destinationCount=1  rate=40    maxPending=2000000 </PTBL-AA-Qpid-04-04>
-                        <PTBL-AA-Qpid-04-05>-n PTBL-AA-Qpid-04 -d1M -s[100]     -c[1]                   -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=true  pubsub=true  uniqueDests=false numConsumers=50  transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=101    messageSize=5120    destinationCount=1  rate=50    maxPending=2000000 </PTBL-AA-Qpid-04-05>
-                        <PTBL-AA-Qpid-04-06>-n PTBL-AA-Qpid-04 -d1M -s[100]     -c[1]                   -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=true  pubsub=true  uniqueDests=false numConsumers=50  transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=101    messageSize=5120    destinationCount=1  rate=60    maxPending=2000000 </PTBL-AA-Qpid-04-06>
-                        <PTBL-AA-Qpid-04-07>-n PTBL-AA-Qpid-04 -d1M -s[100]     -c[1]                   -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=true  pubsub=true  uniqueDests=false numConsumers=50  transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=101    messageSize=5120    destinationCount=1  rate=70    maxPending=2000000 </PTBL-AA-Qpid-04-07>
-                        <PTBL-AA-Qpid-04-08>-n PTBL-AA-Qpid-04 -d1M -s[100]     -c[1]                   -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=true  pubsub=true  uniqueDests=false numConsumers=50  transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=101    messageSize=5120    destinationCount=1  rate=80    maxPending=2000000 </PTBL-AA-Qpid-04-08>
-                        <PTBL-AA-Qpid-04-09>-n PTBL-AA-Qpid-04 -d1M -s[100]     -c[1]                   -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=true  pubsub=true  uniqueDests=false numConsumers=50  transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=101    messageSize=5120    destinationCount=1  rate=90    maxPending=2000000 </PTBL-AA-Qpid-04-09>
-                        <PTBL-AA-Qpid-04-10>-n PTBL-AA-Qpid-04 -d1M -s[100]     -c[1]                   -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=true  pubsub=true  uniqueDests=false numConsumers=50  transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=101    messageSize=5120    destinationCount=1  rate=100   maxPending=2000000 </PTBL-AA-Qpid-04-10>
-
-                        <!-- Low-latency broadcast of time sensitive events. Transient, no_ack. -->
-                        <TTBL-NA-Qpid-05-01>-n TTBL-NA-Qpid-05 -d1M -s[1000]    -c[1]                   -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=false pubsub=true  uniqueDests=false numConsumers=50  transacted=false consTransacted=false consAckMode=257 commitBatchSize=1   batchSize=1001   messageSize=256     destinationCount=1  rate=400   maxPending=2000000 </TTBL-NA-Qpid-05-01>
-                        <TTBL-NA-Qpid-05-02>-n TTBL-NA-Qpid-05 -d1M -s[1000]    -c[1]                   -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=false pubsub=true  uniqueDests=false numConsumers=50  transacted=false consTransacted=false consAckMode=257 commitBatchSize=1   batchSize=1001   messageSize=256     destinationCount=1  rate=800   maxPending=2000000 </TTBL-NA-Qpid-05-02>
-                        <TTBL-NA-Qpid-05-03>-n TTBL-NA-Qpid-05 -d1M -s[1000]    -c[1]                   -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=false pubsub=true  uniqueDests=false numConsumers=50  transacted=false consTransacted=false consAckMode=257 commitBatchSize=1   batchSize=1001   messageSize=256     destinationCount=1  rate=1200  maxPending=2000000 </TTBL-NA-Qpid-05-03>
-                        <TTBL-NA-Qpid-05-04>-n TTBL-NA-Qpid-05 -d1M -s[1000]    -c[1]                   -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=false pubsub=true  uniqueDests=false numConsumers=50  transacted=false consTransacted=false consAckMode=257 commitBatchSize=1   batchSize=1001   messageSize=256     destinationCount=1  rate=1600  maxPending=2000000 </TTBL-NA-Qpid-05-04>
-                        <TTBL-NA-Qpid-05-05>-n TTBL-NA-Qpid-05 -d1M -s[1000]    -c[1]                   -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=false pubsub=true  uniqueDests=false numConsumers=50  transacted=false consTransacted=false consAckMode=257 commitBatchSize=1   batchSize=1001   messageSize=256     destinationCount=1  rate=2000  maxPending=2000000 </TTBL-NA-Qpid-05-05>
-                        <TTBL-NA-Qpid-05-06>-n TTBL-NA-Qpid-05 -d1M -s[1000]    -c[1]                   -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=false pubsub=true  uniqueDests=false numConsumers=50  transacted=false consTransacted=false consAckMode=257 commitBatchSize=1   batchSize=1001   messageSize=256     destinationCount=1  rate=2400  maxPending=2000000 </TTBL-NA-Qpid-05-06>
-                        <TTBL-NA-Qpid-05-07>-n TTBL-NA-Qpid-05 -d1M -s[1000]    -c[1]                   -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=false pubsub=true  uniqueDests=false numConsumers=50  transacted=false consTransacted=false consAckMode=257 commitBatchSize=1   batchSize=1001   messageSize=256     destinationCount=1  rate=2800  maxPending=2000000 </TTBL-NA-Qpid-05-07>
-                        <TTBL-NA-Qpid-05-08>-n TTBL-NA-Qpid-05 -d1M -s[1000]    -c[1]                   -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=false pubsub=true  uniqueDests=false numConsumers=50  transacted=false consTransacted=false consAckMode=257 commitBatchSize=1   batchSize=1001   messageSize=256     destinationCount=1  rate=3200  maxPending=2000000 </TTBL-NA-Qpid-05-08>
-                        <TTBL-NA-Qpid-05-09>-n TTBL-NA-Qpid-05 -d1M -s[1000]    -c[1]                   -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=false pubsub=true  uniqueDests=false numConsumers=50  transacted=false consTransacted=false consAckMode=257 commitBatchSize=1   batchSize=1001   messageSize=256     destinationCount=1  rate=3600  maxPending=2000000 </TTBL-NA-Qpid-05-09>
-                        <TTBL-NA-Qpid-05-10>-n TTBL-NA-Qpid-05 -d1M -s[1000]    -c[1]                   -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=false pubsub=true  uniqueDests=false numConsumers=50  transacted=false consTransacted=false consAckMode=257 commitBatchSize=1   batchSize=1001   messageSize=256     destinationCount=1  rate=4000  maxPending=2000000 </TTBL-NA-Qpid-05-10>
-
-                        <!-- Low-latency broadcast of medium sized time sensitive events. Transient, no_ack. -->
-                        <TTBL-NA-Qpid-06-01>-n TTBL-NA-Qpid-06 -d1M -s[1000]    -c[1]                   -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=false pubsub=true  uniqueDests=false numConsumers=50  transacted=false consTransacted=false consAckMode=257 commitBatchSize=1   batchSize=1001   messageSize=5120    destinationCount=1  rate=100   maxPending=2000000 </TTBL-NA-Qpid-06-01>
-                        <TTBL-NA-Qpid-06-02>-n TTBL-NA-Qpid-06 -d1M -s[1000]    -c[1]                   -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=false pubsub=true  uniqueDests=false numConsumers=50  transacted=false consTransacted=false consAckMode=257 commitBatchSize=1   batchSize=1001   messageSize=5120    destinationCount=1  rate=200   maxPending=2000000 </TTBL-NA-Qpid-06-02>
-                        <TTBL-NA-Qpid-06-03>-n TTBL-NA-Qpid-06 -d1M -s[1000]    -c[1]                   -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=false pubsub=true  uniqueDests=false numConsumers=50  transacted=false consTransacted=false consAckMode=257 commitBatchSize=1   batchSize=1001   messageSize=5120    destinationCount=1  rate=300   maxPending=2000000 </TTBL-NA-Qpid-06-03>
-                        <TTBL-NA-Qpid-06-04>-n TTBL-NA-Qpid-06 -d1M -s[1000]    -c[1]                   -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=false pubsub=true  uniqueDests=false numConsumers=50  transacted=false consTransacted=false consAckMode=257 commitBatchSize=1   batchSize=1001   messageSize=5120    destinationCount=1  rate=400   maxPending=2000000 </TTBL-NA-Qpid-06-04>
-                        <TTBL-NA-Qpid-06-05>-n TTBL-NA-Qpid-06 -d1M -s[1000]    -c[1]                   -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=false pubsub=true  uniqueDests=false numConsumers=50  transacted=false consTransacted=false consAckMode=257 commitBatchSize=1   batchSize=1001   messageSize=5120    destinationCount=1  rate=500   maxPending=2000000 </TTBL-NA-Qpid-06-05>
-                        <TTBL-NA-Qpid-06-06>-n TTBL-NA-Qpid-06 -d1M -s[1000]    -c[1]                   -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=false pubsub=true  uniqueDests=false numConsumers=50  transacted=false consTransacted=false consAckMode=257 commitBatchSize=1   batchSize=1001   messageSize=5120    destinationCount=1  rate=600   maxPending=2000000 </TTBL-NA-Qpid-06-06>
-                        <TTBL-NA-Qpid-06-07>-n TTBL-NA-Qpid-06 -d1M -s[1000]    -c[1]                   -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=false pubsub=true  uniqueDests=false numConsumers=50  transacted=false consTransacted=false consAckMode=257 commitBatchSize=1   batchSize=1001   messageSize=5120    destinationCount=1  rate=700   maxPending=2000000 </TTBL-NA-Qpid-06-07>
-                        <TTBL-NA-Qpid-06-08>-n TTBL-NA-Qpid-06 -d1M -s[1000]    -c[1]                   -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=false pubsub=true  uniqueDests=false numConsumers=50  transacted=false consTransacted=false consAckMode=257 commitBatchSize=1   batchSize=1001   messageSize=5120    destinationCount=1  rate=800   maxPending=2000000 </TTBL-NA-Qpid-06-08>
-                        <TTBL-NA-Qpid-06-09>-n TTBL-NA-Qpid-06 -d1M -s[1000]    -c[1]                   -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=false pubsub=true  uniqueDests=false numConsumers=50  transacted=false consTransacted=false consAckMode=257 commitBatchSize=1   batchSize=1001   messageSize=5120    destinationCount=1  rate=900   maxPending=2000000 </TTBL-NA-Qpid-06-09>
-                        <TTBL-NA-Qpid-06-10>-n TTBL-NA-Qpid-06 -d1M -s[1000]    -c[1]                   -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=false pubsub=true  uniqueDests=false numConsumers=50  transacted=false consTransacted=false consAckMode=257 commitBatchSize=1   batchSize=1001   messageSize=5120    destinationCount=1  rate=1000  maxPending=2000000 </TTBL-NA-Qpid-06-10>
-
-                        <!-- Benchmarking Tests for P2P. -->
-                        <!-- 
-                             Bench mark 1. P2P messaging from 1:1 to 1:32, shared queue, load balancing scenario.
-                             Non-tx, and 1 msg per tx.
-                             Persistent and non-persistent.
-                             No rate limiting.
-                             Message size 256 bytes.
-                        -->
-                        <!--
-                        <TQBT-Qpid-01-1C> -n TQBT-Qpid-01-1C    -d1M  -s[1000]   -c[1]                  -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=false uniqueDests=true  numConsumers=1   transacted=true  consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=1000   messageSize=256     destinationCount=1  rate=0     maxPending=2000000 </TQBT-Qpid-01-1C>
-                        <TQBT-Qpid-01-2C> -n TQBT-Qpid-01-2C    -d1M  -s[1000]   -c[1]                  -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=false uniqueDests=true  numConsumers=2   transacted=true  consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=1000   messageSize=256     destinationCount=1  rate=0     maxPending=2000000 </TQBT-Qpid-01-2C>
-                        <TQBT-Qpid-01-4C> -n TQBT-Qpid-01-4C    -d1M  -s[1000]   -c[1]                  -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=false uniqueDests=true  numConsumers=4   transacted=true  consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=1000   messageSize=256     destinationCount=1  rate=0     maxPending=2000000 </TQBT-Qpid-01-4C>
-                        <TQBT-Qpid-01-8C> -n TQBT-Qpid-01-8C    -d1M  -s[1000]   -c[1]                  -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=false uniqueDests=true  numConsumers=8   transacted=true  consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=1000   messageSize=256     destinationCount=1  rate=0     maxPending=2000000 </TQBT-Qpid-01-8C>
-                        <TQBT-Qpid-01-16C>-n TQBT-Qpid-01-16C   -d1M  -s[1000]   -c[1]                  -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=false uniqueDests=true  numConsumers=16  transacted=true  consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=1000   messageSize=256     destinationCount=1  rate=0     maxPending=2000000 </TQBT-Qpid-01-16C>
-                        <TQBT-Qpid-01-32C>-n TQBT-Qpid-01-32C   -d1M  -s[1000]   -c[1]                  -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=false uniqueDests=true  numConsumers=32  transacted=true  consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=1000   messageSize=256     destinationCount=1  rate=0     maxPending=2000000 </TQBT-Qpid-01-32C>
-
-                        <TQBT-Qpid-02-1C> -n TQBT-Qpid-02-1C    -d1M  -s[1000]   -c[1]                  -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=false uniqueDests=true  numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=1000   messageSize=256     destinationCount=1  rate=0     maxPending=2000000 </TQBT-Qpid-02-1C>
-                        <TQBT-Qpid-02-2C> -n TQBT-Qpid-02-2C    -d1M  -s[1000]   -c[1]                  -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=false uniqueDests=true  numConsumers=2   transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=1000   messageSize=256     destinationCount=1  rate=0     maxPending=2000000 </TQBT-Qpid-02-2C>
-                        <TQBT-Qpid-02-4C> -n TQBT-Qpid-02-4C    -d1M  -s[1000]   -c[1]                  -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=false uniqueDests=true  numConsumers=4   transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=1000   messageSize=256     destinationCount=1  rate=0     maxPending=2000000 </TQBT-Qpid-02-4C>
-                        <TQBT-Qpid-02-8C> -n TQBT-Qpid-02-8C    -d1M  -s[1000]   -c[1]                  -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=false uniqueDests=true  numConsumers=8   transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=1000   messageSize=256     destinationCount=1  rate=0     maxPending=2000000 </TQBT-Qpid-02-8C>
-                        <TQBT-Qpid-02-16C>-n TQBT-Qpid-02-16C   -d1M  -s[1000]   -c[1]                  -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=false uniqueDests=true  numConsumers=16  transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=1000   messageSize=256     destinationCount=1  rate=0     maxPending=2000000 </TQBT-Qpid-02-16C>
-                        <TQBT-Qpid-02-32C>-n TQBT-Qpid-02-32C   -d1M  -s[1000]   -c[1]                  -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=false uniqueDests=true  numConsumers=32  transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=1000   messageSize=256     destinationCount=1  rate=0     maxPending=2000000 </TQBT-Qpid-02-32C>
-
-                        <PQBT-Qpid-01-1C> -n PQBT-Qpid-01-1C    -d1M  -s[1000]   -c[1]                  -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=true  pubsub=false uniqueDests=true  numConsumers=1   transacted=true  consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=1000   messageSize=256     destinationCount=1  rate=0     maxPending=2000000 </PQBT-Qpid-01-1C>
-                        <PQBT-Qpid-01-2C> -n PQBT-Qpid-01-2C    -d1M  -s[1000]   -c[1]                  -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=true  pubsub=false uniqueDests=true  numConsumers=2   transacted=true  consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=1000   messageSize=256     destinationCount=1  rate=0     maxPending=2000000 </PQBT-Qpid-01-2C>
-                        <PQBT-Qpid-01-4C> -n PQBT-Qpid-01-4C    -d1M  -s[1000]   -c[1]                  -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=true  pubsub=false uniqueDests=true  numConsumers=4   transacted=true  consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=1000   messageSize=256     destinationCount=1  rate=0     maxPending=2000000 </PQBT-Qpid-01-4C>
-                        <PQBT-Qpid-01-8C> -n PQBT-Qpid-01-8C    -d1M  -s[1000]   -c[1]                  -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=true  pubsub=false uniqueDests=true  numConsumers=8   transacted=true  consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=1000   messageSize=256     destinationCount=1  rate=0     maxPending=2000000 </PQBT-Qpid-01-8C>
-                        <PQBT-Qpid-01-16C>-n PQBT-Qpid-01-16C   -d1M  -s[1000]   -c[1]                  -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=true  pubsub=false uniqueDests=true  numConsumers=16  transacted=true  consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=1000   messageSize=256     destinationCount=1  rate=0     maxPending=2000000 </PQBT-Qpid-01-16C>
-                        <PQBT-Qpid-01-32C>-n PQBT-Qpid-01-32C   -d1M  -s[1000]   -c[1]                  -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=true  pubsub=false uniqueDests=true  numConsumers=32  transacted=true  consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=1000   messageSize=256     destinationCount=1  rate=0     maxPending=2000000 </PQBT-Qpid-01-32C>
-
-                        <PQBT-Qpid-02-1C> -n PQBT-Qpid-02-1C    -d1M  -s[1000]   -c[1]                  -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=true  pubsub=false uniqueDests=true  numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=1000   messageSize=256     destinationCount=1  rate=0     maxPending=2000000 </PQBT-Qpid-02-1C>
-                        <PQBT-Qpid-02-2C> -n PQBT-Qpid-02-2C    -d1M  -s[1000]   -c[1]                  -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=true  pubsub=false uniqueDests=true  numConsumers=2   transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=1000   messageSize=256     destinationCount=1  rate=0     maxPending=2000000 </PQBT-Qpid-02-2C>
-                        <PQBT-Qpid-02-4C> -n PQBT-Qpid-02-4C    -d1M  -s[1000]   -c[1]                  -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=true  pubsub=false uniqueDests=true  numConsumers=4   transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=1000   messageSize=256     destinationCount=1  rate=0     maxPending=2000000 </PQBT-Qpid-02-4C>
-                        <PQBT-Qpid-02-8C> -n PQBT-Qpid-02-8C    -d1M  -s[1000]   -c[1]                  -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=true  pubsub=false uniqueDests=true  numConsumers=8   transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=1000   messageSize=256     destinationCount=1  rate=0     maxPending=2000000 </PQBT-Qpid-02-8C>
-                        <PQBT-Qpid-02-16C>-n PQBT-Qpid-02-16C   -d1M  -s[1000]   -c[1]                  -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=true  pubsub=false uniqueDests=true  numConsumers=16  transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=1000   messageSize=256     destinationCount=1  rate=0     maxPending=2000000 </PQBT-Qpid-02-16C>
-                        <PQBT-Qpid-02-32C>-n PQBT-Qpid-02-32C   -d1M  -s[1000]   -c[1]                  -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=true  pubsub=false uniqueDests=true  numConsumers=32  transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=1000   messageSize=256     destinationCount=1  rate=0     maxPending=2000000 </PQBT-Qpid-02-32C>
-
-                        <TQBL-Qpid-01-1C> -n TQBL-Qpid-01-1C    -d1M  -s[1000]   -c[1]                  -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=false pubsub=false uniqueDests=true  numConsumers=1   transacted=true  consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=1000   messageSize=256     destinationCount=1  rate=0     maxPending=2000000 </TQBL-Qpid-01-1C>
-                        <TQBL-Qpid-01-2C> -n TQBL-Qpid-01-2C    -d1M  -s[1000]   -c[1]                  -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=false pubsub=false uniqueDests=true  numConsumers=2   transacted=true  consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=1000   messageSize=256     destinationCount=1  rate=0     maxPending=2000000 </TQBL-Qpid-01-2C>
-                        <TQBL-Qpid-01-4C> -n TQBL-Qpid-01-4C    -d1M  -s[1000]   -c[1]                  -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=false pubsub=false uniqueDests=true  numConsumers=4   transacted=true  consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=1000   messageSize=256     destinationCount=1  rate=0     maxPending=2000000 </TQBL-Qpid-01-4C>
-                        <TQBL-Qpid-01-8C> -n TQBL-Qpid-01-8C    -d1M  -s[1000]   -c[1]                  -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=false pubsub=false uniqueDests=true  numConsumers=8   transacted=true  consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=1000   messageSize=256     destinationCount=1  rate=0     maxPending=2000000 </TQBL-Qpid-01-8C>
-                        <TQBL-Qpid-01-16C>-n TQBL-Qpid-01-16C   -d1M  -s[1000]   -c[1]                  -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=false pubsub=false uniqueDests=true  numConsumers=16  transacted=true  consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=1000   messageSize=256     destinationCount=1  rate=0     maxPending=2000000 </TQBL-Qpid-01-16C>
-                        <TQBL-Qpid-01-32C>-n TQBL-Qpid-01-32C   -d1M  -s[1000]   -c[1]                  -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=false pubsub=false uniqueDests=true  numConsumers=32  transacted=true  consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=1000   messageSize=256     destinationCount=1  rate=0     maxPending=2000000 </TQBL-Qpid-01-32C>
-
-                        <TQBL-Qpid-02-1C> -n TQBL-Qpid-02-1C    -d1M  -s[1000]   -c[1]                  -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=false pubsub=false uniqueDests=true  numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=1000   messageSize=256     destinationCount=1  rate=0     maxPending=2000000 </TQBL-Qpid-02-1C>
-                        <TQBL-Qpid-02-2C> -n TQBL-Qpid-02-2C    -d1M  -s[1000]   -c[1]                  -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=false pubsub=false uniqueDests=true  numConsumers=2   transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=1000   messageSize=256     destinationCount=1  rate=0     maxPending=2000000 </TQBL-Qpid-02-2C>
-                        <TQBL-Qpid-02-4C> -n TQBL-Qpid-02-4C    -d1M  -s[1000]   -c[1]                  -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=false pubsub=false uniqueDests=true  numConsumers=4   transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=1000   messageSize=256     destinationCount=1  rate=0     maxPending=2000000 </TQBL-Qpid-02-4C>
-                        <TQBL-Qpid-02-8C> -n TQBL-Qpid-02-8C    -d1M  -s[1000]   -c[1]                  -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=false pubsub=false uniqueDests=true  numConsumers=8   transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=1000   messageSize=256     destinationCount=1  rate=0     maxPending=2000000 </TQBL-Qpid-02-8C>
-                        <TQBL-Qpid-02-16C>-n TQBL-Qpid-02-16C   -d1M  -s[1000]   -c[1]                  -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=false pubsub=false uniqueDests=true  numConsumers=16  transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=1000   messageSize=256     destinationCount=1  rate=0     maxPending=2000000 </TQBL-Qpid-02-16C>
-                        <TQBL-Qpid-02-32C>-n TQBL-Qpid-02-32C   -d1M  -s[1000]   -c[1]                  -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=false pubsub=false uniqueDests=true  numConsumers=32  transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=1000   messageSize=256     destinationCount=1  rate=0     maxPending=2000000 </TQBL-Qpid-02-32C>
-
-                        <PQBL-Qpid-01-1C> -n PQBL-Qpid-01-1C    -d1M  -s[1000]   -c[1]                  -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=true  pubsub=false uniqueDests=true  numConsumers=1   transacted=true  consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=1000   messageSize=256     destinationCount=1  rate=0     maxPending=2000000 </PQBL-Qpid-01-1C>
-                        <PQBL-Qpid-01-2C> -n PQBL-Qpid-01-2C    -d1M  -s[1000]   -c[1]                  -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=true  pubsub=false uniqueDests=true  numConsumers=2   transacted=true  consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=1000   messageSize=256     destinationCount=1  rate=0     maxPending=2000000 </PQBL-Qpid-01-2C>
-                        <PQBL-Qpid-01-4C> -n PQBL-Qpid-01-4C    -d1M  -s[1000]   -c[1]                  -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=true  pubsub=false uniqueDests=true  numConsumers=4   transacted=true  consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=1000   messageSize=256     destinationCount=1  rate=0     maxPending=2000000 </PQBL-Qpid-01-4C>
-                        <PQBL-Qpid-01-8C> -n PQBL-Qpid-01-8C    -d1M  -s[1000]   -c[1]                  -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=true  pubsub=false uniqueDests=true  numConsumers=8   transacted=true  consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=1000   messageSize=256     destinationCount=1  rate=0     maxPending=2000000 </PQBL-Qpid-01-8C>
-                        <PQBL-Qpid-01-16C>-n PQBL-Qpid-01-16C   -d1M  -s[1000]   -c[1]                  -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=true  pubsub=false uniqueDests=true  numConsumers=16  transacted=true  consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=1000   messageSize=256     destinationCount=1  rate=0     maxPending=2000000 </PQBL-Qpid-01-16C>
-                        <PQBL-Qpid-01-32C>-n PQBL-Qpid-01-32C   -d1M  -s[1000]   -c[1]                  -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=true  pubsub=false uniqueDests=true  numConsumers=32  transacted=true  consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=1000   messageSize=256     destinationCount=1  rate=0     maxPending=2000000 </PQBL-Qpid-01-32C>
-
-                        <PQBL-Qpid-02-1C> -n PQBL-Qpid-02-1C    -d1M  -s[1000]   -c[1]                  -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=true  pubsub=false uniqueDests=true  numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=1000   messageSize=256     destinationCount=1  rate=0     maxPending=2000000 </PQBL-Qpid-02-1C>
-                        <PQBL-Qpid-02-2C> -n PQBL-Qpid-02-2C    -d1M  -s[1000]   -c[1]                  -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=true  pubsub=false uniqueDests=true  numConsumers=2   transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=1000   messageSize=256     destinationCount=1  rate=0     maxPending=2000000 </PQBL-Qpid-02-2C>
-                        <PQBL-Qpid-02-4C> -n PQBL-Qpid-02-4C    -d1M  -s[1000]   -c[1]                  -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=true  pubsub=false uniqueDests=true  numConsumers=4   transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=1000   messageSize=256     destinationCount=1  rate=0     maxPending=2000000 </PQBL-Qpid-02-4C>
-                        <PQBL-Qpid-02-8C> -n PQBL-Qpid-02-8C    -d1M  -s[1000]   -c[1]                  -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=true  pubsub=false uniqueDests=true  numConsumers=8   transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=1000   messageSize=256     destinationCount=1  rate=0     maxPending=2000000 </PQBL-Qpid-02-8C>
-                        <PQBL-Qpid-02-16C>-n PQBL-Qpid-02-16C   -d1M  -s[1000]   -c[1]                  -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=true  pubsub=false uniqueDests=true  numConsumers=16  transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=1000   messageSize=256     destinationCount=1  rate=0     maxPending=2000000 </PQBL-Qpid-02-16C>
-                        <PQBL-Qpid-02-32C>-n PQBL-Qpid-02-32C   -d1M  -s[1000]   -c[1]                  -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=true  pubsub=false uniqueDests=true  numConsumers=32  transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=1000   messageSize=256     destinationCount=1  rate=0     maxPending=2000000 </PQBL-Qpid-02-32C>
-                        -->
-
-                        <!--
-                             Bench mark 2. P2P messaging 1:1, scaled up from 1 to 32 times. Queues not shared, just one to one throughput.
-                             Non-tx, and 1 msg per tx.
-                             Persistent and non-persistent.
-                             No rate limiting.
-                             Message size from 128 bytes to 1 Meg.
-                        -->
-                        <!--
-                        <TQBT-Qpid-03-128b>-n TQBT-Qpid-03-128b -d1M  -s[100]    -c[1,32],samples=6,exp -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=false uniqueDests=true  numConsumers=1   transacted=true  consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=100    messageSize=512     destinationCount=1  rate=0     maxPending=2000000 </TQBT-Qpid-03-128b>
-                        <TQBT-Qpid-03-256b>-n TQBT-Qpid-03-256b -d1M  -s[100]    -c[1,32],samples=6,exp -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=false uniqueDests=true  numConsumers=1   transacted=true  consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=100    messageSize=512     destinationCount=1  rate=0     maxPending=2000000 </TQBT-Qpid-03-256b>
-                        <TQBT-Qpid-03-512b>-n TQBT-Qpid-03-512b -d1M  -s[100]    -c[1,32],samples=6,exp -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=false uniqueDests=true  numConsumers=1   transacted=true  consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=100    messageSize=512     destinationCount=1  rate=0     maxPending=2000000 </TQBT-Qpid-03-512b>
-                        <TQBT-Qpid-03-1K>-n TQBT-Qpid-03-1K     -d1M  -s[100]    -c[1,32],samples=6,exp -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=false uniqueDests=true  numConsumers=1   transacted=true  consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=100    messageSize=1024    destinationCount=1  rate=0     maxPending=2000000 </TQBT-Qpid-03-1K>
-                        <TQBT-Qpid-03-5K>-n TQBT-Qpid-03-5K     -d1M  -s[100]    -c[1,32],samples=6,exp -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=false uniqueDests=true  numConsumers=1   transacted=true  consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=100    messageSize=5120    destinationCount=1  rate=0     maxPending=2000000 </TQBT-Qpid-03-5K>
-                        <TQBT-Qpid-03-10K>-n TQBT-Qpid-03-10K   -d1M  -s[100]    -c[1,32],samples=6,exp -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=false uniqueDests=true  numConsumers=1   transacted=true  consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=100    messageSize=10240   destinationCount=1  rate=0     maxPending=2000000 </TQBT-Qpid-03-10K>
-                        <TQBT-Qpid-03-50K>-n TQBT-Qpid-03-50K   -d1M  -s[100]    -c[1,32],samples=6,exp -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=false uniqueDests=true  numConsumers=1   transacted=true  consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=100    messageSize=51200   destinationCount=1  rate=0     maxPending=2000000 </TQBT-Qpid-03-50K>
-                        <TQBT-Qpid-03-100K>-n TQBT-Qpid-03-100K -d1M  -s[100]    -c[1,32],samples=6,exp -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=false uniqueDests=true  numConsumers=1   transacted=true  consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=100    messageSize=102400  destinationCount=1  rate=0     maxPending=2000000 </TQBT-Qpid-03-100K>
-                        <TQBT-Qpid-03-500K>-n TQBT-Qpid-03-500K -d1M  -s[100]    -c[1,32],samples=6,exp -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=false uniqueDests=true  numConsumers=1   transacted=true  consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=100    messageSize=512000  destinationCount=1  rate=0     maxPending=2000000 </TQBT-Qpid-03-500K>
-                        <TQBT-Qpid-03-1M>-n TQBT-Qpid-03-1M     -d1M  -s[100]    -c[1,32],samples=6,exp -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=false uniqueDests=true  numConsumers=1   transacted=true  consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=100    messageSize=1048576 destinationCount=1  rate=0     maxPending=2000000 </TQBT-Qpid-03-1M>
-
-                        <TQBT-Qpid-04-128b>-n TQBT-Qpid-04-128b -d1M  -s[100]    -c[1,32],samples=6,exp -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=false uniqueDests=true  numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=100    messageSize=512     destinationCount=1  rate=0     maxPending=2000000 </TQBT-Qpid-04-128b>
-                        <TQBT-Qpid-04-256b>-n TQBT-Qpid-04-256b -d1M  -s[100]    -c[1,32],samples=6,exp -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=false uniqueDests=true  numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=100    messageSize=512     destinationCount=1  rate=0     maxPending=2000000 </TQBT-Qpid-04-256b>
-                        <TQBT-Qpid-04-512b>-n TQBT-Qpid-04-512b -d1M  -s[100]    -c[1,32],samples=6,exp -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=false uniqueDests=true  numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=100    messageSize=512     destinationCount=1  rate=0     maxPending=2000000 </TQBT-Qpid-04-512b>
-                        <TQBT-Qpid-04-1K>-n TQBT-Qpid-04-1K     -d1M  -s[100]    -c[1,32],samples=6,exp -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=false uniqueDests=true  numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=100    messageSize=1024    destinationCount=1  rate=0     maxPending=2000000 </TQBT-Qpid-04-1K>
-                        <TQBT-Qpid-04-5K>-n TQBT-Qpid-04-5K     -d1M  -s[100]    -c[1,32],samples=6,exp -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=false uniqueDests=true  numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=100    messageSize=5120    destinationCount=1  rate=0     maxPending=2000000 </TQBT-Qpid-04-5K>
-                        <TQBT-Qpid-04-10K>-n TQBT-Qpid-04-10K   -d1M  -s[100]    -c[1,32],samples=6,exp -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=false uniqueDests=true  numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=100    messageSize=10240   destinationCount=1  rate=0     maxPending=2000000 </TQBT-Qpid-04-10K>
-                        <TQBT-Qpid-04-50K>-n TQBT-Qpid-04-50K   -d1M  -s[100]    -c[1,32],samples=6,exp -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=false uniqueDests=true  numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=100    messageSize=51200   destinationCount=1  rate=0     maxPending=2000000 </TQBT-Qpid-04-50K>
-                        <TQBT-Qpid-04-100K>-n TQBT-Qpid-04-100K -d1M  -s[100]    -c[1,32],samples=6,exp -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=false uniqueDests=true  numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=100    messageSize=102400  destinationCount=1  rate=0     maxPending=2000000 </TQBT-Qpid-04-100K>
-                        <TQBT-Qpid-04-500K>-n TQBT-Qpid-04-500K -d1M  -s[100]    -c[1,32],samples=6,exp -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=false uniqueDests=true  numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=100    messageSize=512000  destinationCount=1  rate=0     maxPending=2000000 </TQBT-Qpid-04-500K>
-                        <TQBT-Qpid-04-1M>-n TQBT-Qpid-04-1M     -d1M  -s[100]    -c[1,32],samples=6,exp -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=false pubsub=false uniqueDests=true  numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=100    messageSize=1048576 destinationCount=1  rate=0     maxPending=2000000 </TQBT-Qpid-04-1M>
-
-                        <PQBT-Qpid-03-128b>-n PQBT-Qpid-03-128b -d1M  -s[100]    -c[1,32],samples=6,exp -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=true  pubsub=false uniqueDests=true  numConsumers=1   transacted=true  consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=100    messageSize=512     destinationCount=1  rate=0     maxPending=2000000 </PQBT-Qpid-03-128b>
-                        <PQBT-Qpid-03-256b>-n PQBT-Qpid-03-256b -d1M  -s[100]    -c[1,32],samples=6,exp -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=true  pubsub=false uniqueDests=true  numConsumers=1   transacted=true  consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=100    messageSize=512     destinationCount=1  rate=0     maxPending=2000000 </PQBT-Qpid-03-256b>
-                        <PQBT-Qpid-03-512b>-n PQBT-Qpid-03-512b -d1M  -s[100]    -c[1,32],samples=6,exp -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=true  pubsub=false uniqueDests=true  numConsumers=1   transacted=true  consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=100    messageSize=512     destinationCount=1  rate=0     maxPending=2000000 </PQBT-Qpid-03-512b>
-                        <PQBT-Qpid-03-1K>-n PQBT-Qpid-03-1K     -d1M  -s[100]    -c[1,32],samples=6,exp -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=true  pubsub=false uniqueDests=true  numConsumers=1   transacted=true  consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=100    messageSize=1024    destinationCount=1  rate=0     maxPending=2000000 </PQBT-Qpid-03-1K>
-                        <PQBT-Qpid-03-5K>-n PQBT-Qpid-03-5K     -d1M  -s[100]    -c[1,32],samples=6,exp -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=true  pubsub=false uniqueDests=true  numConsumers=1   transacted=true  consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=100    messageSize=5120    destinationCount=1  rate=0     maxPending=2000000 </PQBT-Qpid-03-5K>
-                        <PQBT-Qpid-03-10K>-n PQBT-Qpid-03-10K   -d1M  -s[100]    -c[1,32],samples=6,exp -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=true  pubsub=false uniqueDests=true  numConsumers=1   transacted=true  consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=100    messageSize=10240   destinationCount=1  rate=0     maxPending=2000000 </PQBT-Qpid-03-10K>
-                        <PQBT-Qpid-03-50K>-n PQBT-Qpid-03-50K   -d1M  -s[100]    -c[1,32],samples=6,exp -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=true  pubsub=false uniqueDests=true  numConsumers=1   transacted=true  consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=100    messageSize=51200   destinationCount=1  rate=0     maxPending=2000000 </PQBT-Qpid-03-50K>
-                        <PQBT-Qpid-03-100K>-n PQBT-Qpid-03-100K -d1M  -s[100]    -c[1,32],samples=6,exp -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=true  pubsub=false uniqueDests=true  numConsumers=1   transacted=true  consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=100    messageSize=102400  destinationCount=1  rate=0     maxPending=2000000 </PQBT-Qpid-03-100K>
-                        <PQBT-Qpid-03-500K>-n PQBT-Qpid-03-500K -d1M  -s[100]    -c[1,32],samples=6,exp -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=true  pubsub=false uniqueDests=true  numConsumers=1   transacted=true  consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=100    messageSize=512000  destinationCount=1  rate=0     maxPending=2000000 </PQBT-Qpid-03-500K>
-                        <PQBT-Qpid-03-1M>-n PQBT-Qpid-03-1M     -d1M  -s[100]    -c[1,32],samples=6,exp -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=true  pubsub=false uniqueDests=true  numConsumers=1   transacted=true  consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=100    messageSize=1048576 destinationCount=1  rate=0     maxPending=2000000 </PQBT-Qpid-03-1M>
-
-                        <PQBT-Qpid-04-128b>-n PQBT-Qpid-04-128b -d1M  -s[100]    -c[1,32],samples=6,exp -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=true  pubsub=false uniqueDests=true  numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=100    messageSize=512     destinationCount=1  rate=0     maxPending=2000000 </PQBT-Qpid-04-128b>
-                        <PQBT-Qpid-04-256b>-n PQBT-Qpid-04-256b -d1M  -s[100]    -c[1,32],samples=6,exp -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=true  pubsub=false uniqueDests=true  numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=100    messageSize=512     destinationCount=1  rate=0     maxPending=2000000 </PQBT-Qpid-04-256b>
-                        <PQBT-Qpid-04-512b>-n PQBT-Qpid-04-512b -d1M  -s[100]    -c[1,32],samples=6,exp -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=true  pubsub=false uniqueDests=true  numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=100    messageSize=512     destinationCount=1  rate=0     maxPending=2000000 </PQBT-Qpid-04-512b>
-                        <PQBT-Qpid-04-1K>-n PQBT-Qpid-04-1K     -d1M  -s[100]    -c[1,32],samples=6,exp -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=true  pubsub=false uniqueDests=true  numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=100    messageSize=1024    destinationCount=1  rate=0     maxPending=2000000 </PQBT-Qpid-04-1K>
-                        <PQBT-Qpid-04-5K>-n PQBT-Qpid-04-5K     -d1M  -s[100]    -c[1,32],samples=6,exp -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=true  pubsub=false uniqueDests=true  numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=100    messageSize=5120    destinationCount=1  rate=0     maxPending=2000000 </PQBT-Qpid-04-5K>
-                        <PQBT-Qpid-04-10K>-n PQBT-Qpid-04-10K   -d1M  -s[100]    -c[1,32],samples=6,exp -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=true  pubsub=false uniqueDests=true  numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=100    messageSize=10240   destinationCount=1  rate=0     maxPending=2000000 </PQBT-Qpid-04-10K>
-                        <PQBT-Qpid-04-50K>-n PQBT-Qpid-04-50K   -d1M  -s[100]    -c[1,32],samples=6,exp -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=true  pubsub=false uniqueDests=true  numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=100    messageSize=51200   destinationCount=1  rate=0     maxPending=2000000 </PQBT-Qpid-04-50K>
-                        <PQBT-Qpid-04-100K>-n PQBT-Qpid-04-100K -d1M  -s[100]    -c[1,32],samples=6,exp -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=true  pubsub=false uniqueDests=true  numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=100    messageSize=102400  destinationCount=1  rate=0     maxPending=2000000 </PQBT-Qpid-04-100K>
-                        <PQBT-Qpid-04-500K>-n PQBT-Qpid-04-500K -d1M  -s[100]    -c[1,32],samples=6,exp -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=true  pubsub=false uniqueDests=true  numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=100    messageSize=512000  destinationCount=1  rate=0     maxPending=2000000 </PQBT-Qpid-04-500K>
-                        <PQBT-Qpid-04-1M>-n PQBT-Qpid-04-1M     -d1M  -s[100]    -c[1,32],samples=6,exp -o $QPID_WORK/results -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf   persistent=true  pubsub=false uniqueDests=true  numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=100    messageSize=1048576 destinationCount=1  rate=0     maxPending=2000000 </PQBT-Qpid-04-1M>
-
-                        <TQBL-Qpid-03-128b>-n TQBL-Qpid-03-128b -d1M  -s[100]    -c[1,32],samples=6,exp -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=false pubsub=false uniqueDests=true  numConsumers=1   transacted=true  consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=100    messageSize=512     destinationCount=1  rate=0     maxPending=2000000 </TQBL-Qpid-03-128b>
-                        <TQBL-Qpid-03-256b>-n TQBL-Qpid-03-256b -d1M  -s[100]    -c[1,32],samples=6,exp -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=false pubsub=false uniqueDests=true  numConsumers=1   transacted=true  consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=100    messageSize=512     destinationCount=1  rate=0     maxPending=2000000 </TQBL-Qpid-03-256b>
-                        <TQBL-Qpid-03-512b>-n TQBL-Qpid-03-512b -d1M  -s[100]    -c[1,32],samples=6,exp -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=false pubsub=false uniqueDests=true  numConsumers=1   transacted=true  consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=100    messageSize=512     destinationCount=1  rate=0     maxPending=2000000 </TQBL-Qpid-03-512b>
-                        <TQBL-Qpid-03-1K>-n TQBL-Qpid-03-1K     -d1M  -s[100]    -c[1,32],samples=6,exp -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=false pubsub=false uniqueDests=true  numConsumers=1   transacted=true  consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=100    messageSize=1024    destinationCount=1  rate=0     maxPending=2000000 </TQBL-Qpid-03-1K>
-                        <TQBL-Qpid-03-5K>-n TQBL-Qpid-03-5K     -d1M  -s[100]    -c[1,32],samples=6,exp -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=false pubsub=false uniqueDests=true  numConsumers=1   transacted=true  consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=100    messageSize=5120    destinationCount=1  rate=0     maxPending=2000000 </TQBL-Qpid-03-5K>
-                        <TQBL-Qpid-03-10K>-n TQBL-Qpid-03-10K   -d1M  -s[100]    -c[1,32],samples=6,exp -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=false pubsub=false uniqueDests=true  numConsumers=1   transacted=true  consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=100    messageSize=10240   destinationCount=1  rate=0     maxPending=2000000 </TQBL-Qpid-03-10K>
-                        <TQBL-Qpid-03-50K>-n TQBL-Qpid-03-50K   -d1M  -s[100]    -c[1,32],samples=6,exp -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=false pubsub=false uniqueDests=true  numConsumers=1   transacted=true  consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=100    messageSize=51200   destinationCount=1  rate=0     maxPending=2000000 </TQBL-Qpid-03-50K>
-                        <TQBL-Qpid-03-100K>-n TQBL-Qpid-03-100K -d1M  -s[100]    -c[1,32],samples=6,exp -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=false pubsub=false uniqueDests=true  numConsumers=1   transacted=true  consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=100    messageSize=102400  destinationCount=1  rate=0     maxPending=2000000 </TQBL-Qpid-03-100K>
-                        <TQBL-Qpid-03-500K>-n TQBL-Qpid-03-500K -d1M  -s[100]    -c[1,32],samples=6,exp -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=false pubsub=false uniqueDests=true  numConsumers=1   transacted=true  consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=100    messageSize=512000  destinationCount=1  rate=0     maxPending=2000000 </TQBL-Qpid-03-500K>
-                        <TQBL-Qpid-03-1M>-n TQBL-Qpid-03-1M     -d1M  -s[100]    -c[1,32],samples=6,exp -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=false pubsub=false uniqueDests=true  numConsumers=1   transacted=true  consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=100    messageSize=1048576 destinationCount=1  rate=0     maxPending=2000000 </TQBL-Qpid-03-1M>
-
-                        <TQBL-Qpid-04-128b>-n TQBL-Qpid-04-128b -d1M  -s[100]    -c[1,32],samples=6,exp -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=false pubsub=false uniqueDests=true  numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=100    messageSize=512     destinationCount=1  rate=0     maxPending=2000000 </TQBL-Qpid-04-128b>
-                        <TQBL-Qpid-04-256b>-n TQBL-Qpid-04-256b -d1M  -s[100]    -c[1,32],samples=6,exp -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=false pubsub=false uniqueDests=true  numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=100    messageSize=512     destinationCount=1  rate=0     maxPending=2000000 </TQBL-Qpid-04-256b>
-                        <TQBL-Qpid-04-512b>-n TQBL-Qpid-04-512b -d1M  -s[100]    -c[1,32],samples=6,exp -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=false pubsub=false uniqueDests=true  numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=100    messageSize=512     destinationCount=1  rate=0     maxPending=2000000 </TQBL-Qpid-04-512b>
-                        <TQBL-Qpid-04-1K>-n TQBL-Qpid-04-1K     -d1M  -s[100]    -c[1,32],samples=6,exp -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=false pubsub=false uniqueDests=true  numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=100    messageSize=1024    destinationCount=1  rate=0     maxPending=2000000 </TQBL-Qpid-04-1K>
-                        <TQBL-Qpid-04-5K>-n TQBL-Qpid-04-5K     -d1M  -s[100]    -c[1,32],samples=6,exp -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=false pubsub=false uniqueDests=true  numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=100    messageSize=5120    destinationCount=1  rate=0     maxPending=2000000 </TQBL-Qpid-04-5K>
-                        <TQBL-Qpid-04-10K>-n TQBL-Qpid-04-10K   -d1M  -s[100]    -c[1,32],samples=6,exp -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=false pubsub=false uniqueDests=true  numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=100    messageSize=10240   destinationCount=1  rate=0     maxPending=2000000 </TQBL-Qpid-04-10K>
-                        <TQBL-Qpid-04-50K>-n TQBL-Qpid-04-50K   -d1M  -s[100]    -c[1,32],samples=6,exp -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=false pubsub=false uniqueDests=true  numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=100    messageSize=51200   destinationCount=1  rate=0     maxPending=2000000 </TQBL-Qpid-04-50K>
-                        <TQBL-Qpid-04-100K>-n TQBL-Qpid-04-100K -d1M  -s[100]    -c[1,32],samples=6,exp -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=false pubsub=false uniqueDests=true  numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=100    messageSize=102400  destinationCount=1  rate=0     maxPending=2000000 </TQBL-Qpid-04-100K>
-                        <TQBL-Qpid-04-500K>-n TQBL-Qpid-04-500K -d1M  -s[100]    -c[1,32],samples=6,exp -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=false pubsub=false uniqueDests=true  numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=100    messageSize=512000  destinationCount=1  rate=0     maxPending=2000000 </TQBL-Qpid-04-500K>
-                        <TQBL-Qpid-04-1M>-n TQBL-Qpid-04-1M     -d1M  -s[100]    -c[1,32],samples=6,exp -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=false pubsub=false uniqueDests=true  numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=100    messageSize=1048576 destinationCount=1  rate=0     maxPending=2000000 </TQBL-Qpid-04-1M>
-
-                        <PQBL-Qpid-03-128b>-n PQBL-Qpid-03-128b -d1M  -s[100]    -c[1,32],samples=6,exp -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=true  pubsub=false uniqueDests=true  numConsumers=1   transacted=true  consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=100    messageSize=512     destinationCount=1  rate=0     maxPending=2000000 </PQBL-Qpid-03-128b>
-                        <PQBL-Qpid-03-256b>-n PQBL-Qpid-03-256b -d1M  -s[100]    -c[1,32],samples=6,exp -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=true  pubsub=false uniqueDests=true  numConsumers=1   transacted=true  consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=100    messageSize=512     destinationCount=1  rate=0     maxPending=2000000 </PQBL-Qpid-03-256b>
-                        <PQBL-Qpid-03-512b>-n PQBL-Qpid-03-512b -d1M  -s[100]    -c[1,32],samples=6,exp -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=true  pubsub=false uniqueDests=true  numConsumers=1   transacted=true  consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=100    messageSize=512     destinationCount=1  rate=0     maxPending=2000000 </PQBL-Qpid-03-512b>
-                        <PQBL-Qpid-03-1K>-n PQBL-Qpid-03-1K     -d1M  -s[100]    -c[1,32],samples=6,exp -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=true  pubsub=false uniqueDests=true  numConsumers=1   transacted=true  consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=100    messageSize=1024    destinationCount=1  rate=0     maxPending=2000000 </PQBL-Qpid-03-1K>
-                        <PQBL-Qpid-03-5K>-n PQBL-Qpid-03-5K     -d1M  -s[100]    -c[1,32],samples=6,exp -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=true  pubsub=false uniqueDests=true  numConsumers=1   transacted=true  consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=100    messageSize=5120    destinationCount=1  rate=0     maxPending=2000000 </PQBL-Qpid-03-5K>
-                        <PQBL-Qpid-03-10K>-n PQBL-Qpid-03-10K   -d1M  -s[100]    -c[1,32],samples=6,exp -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=true  pubsub=false uniqueDests=true  numConsumers=1   transacted=true  consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=100    messageSize=10240   destinationCount=1  rate=0     maxPending=2000000 </PQBL-Qpid-03-10K>
-                        <PQBL-Qpid-03-50K>-n PQBL-Qpid-03-50K   -d1M  -s[100]    -c[1,32],samples=6,exp -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=true  pubsub=false uniqueDests=true  numConsumers=1   transacted=true  consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=100    messageSize=51200   destinationCount=1  rate=0     maxPending=2000000 </PQBL-Qpid-03-50K>
-                        <PQBL-Qpid-03-100K>-n PQBL-Qpid-03-100K -d1M  -s[100]    -c[1,32],samples=6,exp -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=true  pubsub=false uniqueDests=true  numConsumers=1   transacted=true  consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=100    messageSize=102400  destinationCount=1  rate=0     maxPending=2000000 </PQBL-Qpid-03-100K>
-                        <PQBL-Qpid-03-500K>-n PQBL-Qpid-03-500K -d1M  -s[100]    -c[1,32],samples=6,exp -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=true  pubsub=false uniqueDests=true  numConsumers=1   transacted=true  consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=100    messageSize=512000  destinationCount=1  rate=0     maxPending=2000000 </PQBL-Qpid-03-500K>
-                        <PQBL-Qpid-03-1M>-n PQBL-Qpid-03-1M     -d1M  -s[100]    -c[1,32],samples=6,exp -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=true  pubsub=false uniqueDests=true  numConsumers=1   transacted=true  consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=100    messageSize=1048576 destinationCount=1  rate=0     maxPending=2000000 </PQBL-Qpid-03-1M>
-
-                        <PQBL-Qpid-04-128b>-n PQBL-Qpid-04-128b -d1M  -s[100]    -c[1,32],samples=6,exp -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=true  pubsub=false uniqueDests=true  numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=100    messageSize=512     destinationCount=1  rate=0     maxPending=2000000 </PQBL-Qpid-04-128b>
-                        <PQBL-Qpid-04-256b>-n PQBL-Qpid-04-256b -d1M  -s[100]    -c[1,32],samples=6,exp -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=true  pubsub=false uniqueDests=true  numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=100    messageSize=512     destinationCount=1  rate=0     maxPending=2000000 </PQBL-Qpid-04-256b>
-                        <PQBL-Qpid-04-512b>-n PQBL-Qpid-04-512b -d1M  -s[100]    -c[1,32],samples=6,exp -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=true  pubsub=false uniqueDests=true  numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=100    messageSize=512     destinationCount=1  rate=0     maxPending=2000000 </PQBL-Qpid-04-512b>
-                        <PQBL-Qpid-04-1K>-n PQBL-Qpid-04-1K     -d1M  -s[100]    -c[1,32],samples=6,exp -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=true  pubsub=false uniqueDests=true  numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=100    messageSize=1024    destinationCount=1  rate=0     maxPending=2000000 </PQBL-Qpid-04-1K>
-                        <PQBL-Qpid-04-5K>-n PQBL-Qpid-04-5K     -d1M  -s[100]    -c[1,32],samples=6,exp -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=true  pubsub=false uniqueDests=true  numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=100    messageSize=5120    destinationCount=1  rate=0     maxPending=2000000 </PQBL-Qpid-04-5K>
-                        <PQBL-Qpid-04-10K>-n PQBL-Qpid-04-10K   -d1M  -s[100]    -c[1,32],samples=6,exp -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=true  pubsub=false uniqueDests=true  numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=100    messageSize=10240   destinationCount=1  rate=0     maxPending=2000000 </PQBL-Qpid-04-10K>
-                        <PQBL-Qpid-04-50K>-n PQBL-Qpid-04-50K   -d1M  -s[100]    -c[1,32],samples=6,exp -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=true  pubsub=false uniqueDests=true  numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=100    messageSize=51200   destinationCount=1  rate=0     maxPending=2000000 </PQBL-Qpid-04-50K>
-                        <PQBL-Qpid-04-100K>-n PQBL-Qpid-04-100K -d1M  -s[100]    -c[1,32],samples=6,exp -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=true  pubsub=false uniqueDests=true  numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=100    messageSize=102400  destinationCount=1  rate=0     maxPending=2000000 </PQBL-Qpid-04-100K>
-                        <PQBL-Qpid-04-500K>-n PQBL-Qpid-04-500K -d1M  -s[100]    -c[1,32],samples=6,exp -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=true  pubsub=false uniqueDests=true  numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=100    messageSize=512000  destinationCount=1  rate=0     maxPending=2000000 </PQBL-Qpid-04-500K>
-                        <PQBL-Qpid-04-1M>-n PQBL-Qpid-04-1M     -d1M  -s[100]    -c[1,32],samples=6,exp -o $QPID_WORK/results -t testPingLatency org.apache.qpid.ping.PingLatencyTestPerf persistent=true  pubsub=false uniqueDests=true  numConsumers=1   transacted=false consTransacted=false consAckMode=1   commitBatchSize=1   batchSize=100    messageSize=1048576 destinationCount=1  rate=0     maxPending=2000000 </PQBL-Qpid-04-1M>
-                        -->
-
-                        <!-- Failover Tests. -->
-                        <FT-Qpid-01>-n FT-Qpid-01 -s[2500] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf messageSize=256 batchSize=10000  transacted=true broker="tcp://127.0.0.1:5001;tcp://127.0.0.1:5002" failBeforeSend=true -o $QPID_WORK/results</FT-Qpid-01>
-                        <FT-Qpid-02>-n FT-Qpid-02 -s[2500] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf messageSize=256 batchSize=10000  transacted=true broker="tcp://127.0.0.1:5001;tcp://127.0.0.1:5002" failAfterSend=true -o $QPID_WORK/results</FT-Qpid-02>
-                        <FT-Qpid-03>-n FT-Qpid-03 -s[2500] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf messageSize=256 batchSize=1000  transacted=true broker="tcp://127.0.0.1:5001;tcp://127.0.0.1:5002" failAfterCommit=true -o $QPID_WORK/results</FT-Qpid-03>
-                        <FT-Qpid-04>-n FT-Qpid-04 -s[2500] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf messageSize=256 batchSize=1000 broker="tcp://127.0.0.1:5001;tcp://127.0.0.1:5002"  transacted=false failBeforeSend=true -o $QPID_WORK/results</FT-Qpid-04>
-                        <FT-Qpid-05>-n FT-Qpid-05 -s[2500] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf messageSize=256 batchSize=1000 broker="tcp://127.0.0.1:5001;tcp://127.0.0.1:5002"  transacted=false failAfterSend=true -o $QPID_WORK/results</FT-Qpid-05>
-                        <FT-Qpid-01-P>-n FT-Qpid-01-P -s[2500] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true messageSize=256 batchSize=1000  transacted=true broker="tcp://127.0.0.1:5001;tcp://127.0.0.1:5002" failBeforeSend=true -o $QPID_WORK/results</FT-Qpid-01-P>
-                        <FT-Qpid-02-P>-n FT-Qpid-02-P -s[2500] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true messageSize=256 batchSize=1000  transacted=true broker="tcp://127.0.0.1:5001;tcp://127.0.0.1:5002" failAfterSend=true -o $QPID_WORK/results</FT-Qpid-02-P>
-                        <FT-Qpid-03-P>-n FT-Qpid-03-P -s[2500] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true messageSize=256 batchSize=1000  transacted=true broker="tcp://127.0.0.1:5001;tcp://127.0.0.1:5002" failAfterCommit=true -o $QPID_WORK/results</FT-Qpid-03-P>
-                        <FT-Qpid-04-P>-n FT-Qpid-04-P -s[250] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true messageSize=256 batchSize=1000 broker="tcp://127.0.0.1:5001;tcp://127.0.0.1:5002"  transacted=false failBeforeSend=true -o $QPID_WORK/results</FT-Qpid-04-P>
-                        <FT-Qpid-05-P>-n FT-Qpid-05-P -s[250] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true messageSize=256 batchSize=1000 broker="tcp://127.0.0.1:5001;tcp://127.0.0.1:5002"  transacted=false failAfterSend=true -o $QPID_WORK/results</FT-Qpid-05-P>
-
-                    </commands>
-                </configuration>
-
-                <executions>
-                    <execution>
-                        <phase>test</phase>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <!-- Bundles all the dependencies, fully expanded into a single jar, required to run the tests.
-                 Also builds all thescripts and this jar into distributable .zip and .tar.gz files.
-                 
-                 Usefull when bundling system, integration or performance tests into a convenient
-                 package to hand over to testers. To use it run:
-                 
-                 java -cp target/your_app_name-all-test-deps.jar path.to.your.Class
-                 
-                 or often:
-                 
-                 java -cp target/your_app_name-all-test-deps.jar junit.framework.textui.TestRunner path.to.your.test.Class
-                 
-                 or other JUnit test runner invocations.
-            -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <version>2.2-SNAPSHOT</version>
-                <configuration>
-                    <descriptors>
-                        <descriptor>jar-with-dependencies.xml</descriptor>
-                        <!--<descriptor>dist-zip.xml</descriptor>-->
-                    </descriptors>
-                    <outputDirectory>target</outputDirectory>
-                    <workDirectory>target/assembly/work</workDirectory>
-                </configuration>
-            </plugin>
-
-            <!-- Build a manifest only jar with all the required jars for the broker in its classpath. -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <executions>                   
-                    <execution>
-                        <id>test_jar</id>
-                        <configuration>
-                            <archive>
-                                <manifest>
-                                    <addClasspath>true</addClasspath>                           
-                                </manifest>
-                            </archive>
-                        </configuration>      
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                    </execution>
-                </executions>          
-            </plugin>
-
-        </plugins>
-
-        <resources>
-            <!-- Include source files in built jar -->
-            <resource>
-                <targetPath>src/</targetPath>
-                <filtering>false</filtering>
-                <directory>src/main/java</directory>
-                <includes>
-                    <include>**/*.java</include>
-                </includes>
-            </resource>
-            <!-- Include a log4j configuration in the jar at the root level (don't name this log4j.properties though as won't be able to override it). -->
-            <resource>
-                <targetPath>/</targetPath>
-                <filtering>false</filtering>
-                <directory>src/main/java</directory>
-                <includes>
-                    <include>perftests.log4j</include>
-                </includes>
-            </resource>
-        </resources>
-    </build>
-
-</project>
diff --git a/qpid/java/perftests/src/main/java/org/apache/qpid/client/latency/MessageConsumer.java b/qpid/java/perftests/src/main/java/org/apache/qpid/client/latency/MessageConsumer.java
deleted file mode 100644
index 80f965eae5..0000000000
--- a/qpid/java/perftests/src/main/java/org/apache/qpid/client/latency/MessageConsumer.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.qpid.client.latency;
-
-import org.apache.qpid.client.AMQConnection;
-import org.apache.qpid.client.AMQQueue;
-import org.apache.qpid.client.AMQTopic;
-import org.apache.qpid.client.perf.Options;
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.requestreply.InitialContextHelper;
-
-import javax.jms.*;
-import javax.naming.Context;
-
-/**
- *
- *
- */
-public class MessageConsumer  extends Options  implements MessageListener 
-{
-    private javax.jms.MessageProducer _producer;
-    private AMQConnection _connection;
-    private final Object _lock = new Object();
-    private Session _session;
-    private int _receivedMessages = 0;
-    private long _timeFirstMessage;
-    private long _timeLastMessage;
-   private void init()
-    {
-        this.parseOptions();
-        try
-        {
-            Context context = InitialContextHelper.getInitialContext("");
-            ConnectionFactory factory = (ConnectionFactory) context.lookup("local");
-             _connection = (AMQConnection) factory.createConnection("guest","guest");
-             _session = _connection.createSession(_transacted, Session.AUTO_ACKNOWLEDGE);
-              Destination dest = Boolean.getBoolean("useQueue")? (Destination) context.lookup("testQueue") :
-            (Destination) context.lookup("testTopic");
-            Destination syncQueue   = (Destination) context.lookup("syncQueue");
-            _producer = _session.createProducer(syncQueue);
-            // this should speedup the message producer
-            _producer.setDisableMessageTimestamp(true);
-            javax.jms.MessageConsumer consumer = _session.createConsumer(dest);
-            consumer.setMessageListener(this);
-        }
-        catch (Exception e)
-        {
-            e.printStackTrace();
-        }
-    }
-
-    private void run()
-    {
-        try
-        {
-           synchronized(_lock)
-           {
-               _connection.start();
-               try
-               {
-                   _lock.wait();
-               }
-               catch (InterruptedException e)
-               {
-                   e.printStackTrace();
-               }
-           }
-            // send sync message;
-           _producer.send(_session.createMessage());
-            System.out.println("Time to receive " + _logFrequency + " messages is: " + (_timeLastMessage - _timeFirstMessage) );
-            double rate =  _logFrequency /  ((_timeLastMessage - _timeFirstMessage)  *1.0) *1000 ;
-             System.out.println("The rate is " + rate  + " msg/s" );
-            double latency =  ((_timeLastMessage - _timeFirstMessage)  *1.0) / _logFrequency;
-            System.out.println("The latency is " + latency  + " milli secs" );
-            _connection.close();
-        }
-        catch (JMSException e)
-        {
-            e.printStackTrace();
-        }
-    }
-
-   public void onMessage(Message message)
-    {
-        if( _receivedMessages == 0)
-        {
-            _timeFirstMessage = System.currentTimeMillis();
-        }
-        _receivedMessages++;      
-        if( _receivedMessages == _logFrequency)
-        {
-            _timeLastMessage = System.currentTimeMillis();
-            synchronized(_lock)
-            {
-                _lock.notify();
-            }
-        }
-    }
-
-    public static void main(String[] args)
-    {
-        try
-        {
-            MessageConsumer test = new MessageConsumer();
-            test.init();
-            test.run();
-        }
-        catch(Exception e)
-        {
-            e.printStackTrace();
-        }
-    }
-
-}
\ No newline at end of file
diff --git a/qpid/java/perftests/src/main/java/org/apache/qpid/client/latency/MessageProducer.java b/qpid/java/perftests/src/main/java/org/apache/qpid/client/latency/MessageProducer.java
deleted file mode 100644
index c084a55bcc..0000000000
--- a/qpid/java/perftests/src/main/java/org/apache/qpid/client/latency/MessageProducer.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.qpid.client.latency;
-
-import org.apache.qpid.client.AMQConnection;
-import org.apache.qpid.client.message.TestMessageFactory;
-import org.apache.qpid.client.perf.Options;
-import org.apache.qpid.requestreply.InitialContextHelper;
-import org.apache.qpidity.transport.network.nio.NioSender;
-
-import javax.jms.*;
-import javax.naming.Context;
-
-/**
- *
- *
- */
-public class MessageProducer  extends Options
-{
-    private BytesMessage _payload;
-    private javax.jms.MessageProducer _producer;
-    private javax.jms.MessageConsumer _consumer;
-    private AMQConnection _connection;
-   private void init()
-    {
-        this.parseOptions();
-        try
-        {
-            Context context = InitialContextHelper.getInitialContext("");
-            ConnectionFactory factory = (ConnectionFactory) context.lookup("local");
-            _connection = (AMQConnection) factory.createConnection("guest","guest");
-            Destination dest = Boolean.getBoolean("useQueue")? (Destination) context.lookup("testQueue") :
-                       (Destination) context.lookup("testTopic");
-             Destination syncQueue   = (Destination) context.lookup("syncQueue");
-             _connection.start();
-            Session session = _connection.createSession(_transacted, Session.AUTO_ACKNOWLEDGE);
-            _payload = TestMessageFactory.newBytesMessage(session, _messageSize);
-            _producer = session.createProducer(dest);
-            _consumer = session.createConsumer(syncQueue);
-            // this should speedup the message producer
-            _producer.setDisableMessageTimestamp(true);
-             System.out.println("Init end" );
-        }
-        catch (Exception e)
-        {
-            e.printStackTrace();
-        }
-    }
-
-    private void run()
-    {
-        try
-        {
-            System.out.println("Sending " + _logFrequency + " messages");
-
-          // NioSender.setStartBatching();
-            long startTime = System.currentTimeMillis();
-            for(int i =0; i < _logFrequency; i++ )
-            {
-                _producer.send(_payload, DeliveryMode.PERSISTENT, Message.DEFAULT_PRIORITY, 0);
-            }
-            long endProducing = System.currentTimeMillis();
-            double throughput = (_logFrequency * 1000.0) / (endProducing - startTime);
-            System.out.println("The producer throughput is: " + throughput + " msg/s");
-
-          //  startTime = System.currentTimeMillis();
-          //  NioSender.purge();
-          //  endProducing = System.currentTimeMillis();
-          //  throughput = (_logFrequency * 1000.0) / (endProducing - startTime);
-          //  System.out.println("The NIO throughput is: " + throughput + " msg/s");
-
-
-            // now wait for the sync message
-            _consumer.receive();
-            // this is done 
-            long endTime = System.currentTimeMillis();
-            System.out.println("Time to send and receive " + _logFrequency + " messages is: " + (endTime - startTime) );
-            double latency = ( (endTime - startTime)  * 1.0) /_logFrequency;
-            System.out.println("The latency is " + latency + " milli secs" );
-            _connection.close();
-        }
-        catch (JMSException e)
-        {
-            e.printStackTrace();
-        }
-    }
-
-    public static void main(String[] args)
-    {
-        try
-        {
-            MessageProducer test = new MessageProducer();
-            test.init();
-            test.run();
-        }
-        catch(Exception e)
-        {
-            e.printStackTrace();
-        }
-    }
-}
diff --git a/qpid/java/perftests/src/main/java/org/apache/qpid/client/message/TestMessageFactory.java b/qpid/java/perftests/src/main/java/org/apache/qpid/client/message/TestMessageFactory.java
deleted file mode 100644
index 4d038db0a8..0000000000
--- a/qpid/java/perftests/src/main/java/org/apache/qpid/client/message/TestMessageFactory.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.client.message;
-
-import javax.jms.JMSException;
-import javax.jms.Session;
-import javax.jms.ObjectMessage;
-import javax.jms.StreamMessage;
-import javax.jms.BytesMessage;
-import javax.jms.TextMessage;
-import javax.jms.DeliveryMode;
-import javax.jms.Destination;
-
-public class TestMessageFactory
-{
-    private static final String MESSAGE_DATA_BYTES = "-message payload-message paylaod-message payload-message paylaod";
-
-    public static TextMessage newTextMessage(Session session, int size) throws JMSException
-    {
-        return session.createTextMessage(createMessagePayload(size));
-    }
-
-    public static BytesMessage newBytesMessage(Session session, int size) throws JMSException
-    {
-        BytesMessage message = session.createBytesMessage();
-        message.writeUTF(createMessagePayload(size));
-        return message;
-    }
-
-    public static StreamMessage newStreamMessage(Session session, int size) throws JMSException
-    {
-        StreamMessage message = session.createStreamMessage();
-        message.writeString(createMessagePayload(size));
-        return message;
-    }
-
-    public static ObjectMessage newObjectMessage(Session session, int size) throws JMSException
-    {
-        if (size == 0)
-        {
-            return session.createObjectMessage();
-        }
-        else
-        {
-            return session.createObjectMessage(createMessagePayload(size));
-        }
-    }
-
-    /**
-     * Creates an ObjectMessage with given size and sets the JMS properties
-     * (JMSReplyTo and DeliveryMode)
-     * @param session
-     * @param replyDestination
-     * @param size
-     * @param persistent
-     * @return the new ObjectMessage
-     * @throws JMSException
-     */
-    public static ObjectMessage newObjectMessage(Session session, Destination replyDestination, int size, boolean persistent) throws JMSException
-    {
-        ObjectMessage msg = newObjectMessage(session, size);
-
-        // Set the messages persistent delivery flag.
-        msg.setJMSDeliveryMode(persistent ? DeliveryMode.PERSISTENT : DeliveryMode.NON_PERSISTENT);
-
-        // Ensure that the temporary reply queue is set as the reply to destination for the message.
-        if (replyDestination != null)
-        {
-            msg.setJMSReplyTo(replyDestination);
-        }
-
-        return msg;
-    }
-
-    public static String createMessagePayload(int size)
-    {
-        StringBuffer buf = new StringBuffer(size);
-        int count = 0;
-        while (count <= (size - MESSAGE_DATA_BYTES.length()))
-        {
-            buf.append(MESSAGE_DATA_BYTES);
-            count += MESSAGE_DATA_BYTES.length();
-        }
-        if (count < size)
-        {
-            buf.append(MESSAGE_DATA_BYTES, 0, size - count);
-        }
-
-        return buf.toString();
-    }
-}
diff --git a/qpid/java/perftests/src/main/java/org/apache/qpid/client/perf/ConnectionUtility.java b/qpid/java/perftests/src/main/java/org/apache/qpid/client/perf/ConnectionUtility.java
deleted file mode 100644
index 133ef5f854..0000000000
--- a/qpid/java/perftests/src/main/java/org/apache/qpid/client/perf/ConnectionUtility.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package org.apache.qpid.client.perf;
-
-import javax.naming.InitialContext;
-
-import org.apache.qpid.client.AMQConnection;
-import org.apache.qpid.client.AMQConnectionFactory;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class ConnectionUtility
-{
-    private static final Logger _logger = LoggerFactory.getLogger(ConnectionUtility.class);
-
-    private InitialContext _initialContext;
-    private AMQConnectionFactory _connectionFactory;
-
-    private static ConnectionUtility _instance = new ConnectionUtility();
-
-    public static ConnectionUtility getInstance()
-    {
-        return _instance;
-    }
-
-    private InitialContext getInitialContext() throws Exception
-    {
-        _logger.info("get InitialContext");
-        if (_initialContext == null)
-        {
-            _initialContext = new InitialContext();
-        }
-        return _initialContext;
-    }
-
-    private AMQConnectionFactory getConnectionFactory() throws Exception
-    {
-        _logger.info("get ConnectionFactory");
-        if (_connectionFactory == null)
-        {
-            _connectionFactory = (AMQConnectionFactory) getInitialContext().lookup("local");
-        }
-        return _connectionFactory;
-    }
-
-    public AMQConnection getConnection() throws Exception
-    {
-        _logger.info("get Connection");
-        return (AMQConnection)getConnectionFactory().createConnection();
-    }
-
-}
diff --git a/qpid/java/perftests/src/main/java/org/apache/qpid/client/perf/MessageConsumerTest.java b/qpid/java/perftests/src/main/java/org/apache/qpid/client/perf/MessageConsumerTest.java
deleted file mode 100644
index 1124e070a1..0000000000
--- a/qpid/java/perftests/src/main/java/org/apache/qpid/client/perf/MessageConsumerTest.java
+++ /dev/null
@@ -1,171 +0,0 @@
-package org.apache.qpid.client.perf;
-
-import java.io.FileWriter;
-import java.io.IOException;
-import java.sql.Date;
-import java.text.SimpleDateFormat;
-
-import javax.jms.Destination;
-import javax.jms.Message;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageListener;
-import javax.jms.Session;
-
-import org.apache.qpid.client.AMQConnection;
-import org.apache.qpid.client.AMQQueue;
-import org.apache.qpid.client.AMQTopic;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class MessageConsumerTest extends Options implements MessageListener
-{
-    private static final Logger _logger = LoggerFactory.getLogger(MessageConsumerTest.class);
-    private SimpleDateFormat df = new SimpleDateFormat("h:mm a");
-
-    String _logFileName;
-    long _startTime;
-    long _intervalStartTime;
-    long _totalMsgCount;
-    long _intervalCount;
-
-    private AMQConnection _connection;
-    private Session _session;
-
-    public void init() throws Exception
-    {
-       this.parseOptions();
-       _logFileName = _logFilePath + "/MessageConsumerTest_" + System.currentTimeMillis();
-       _connection = ConnectionUtility.getInstance().getConnection();
-       _connection.start();
-       Destination dest = Boolean.getBoolean("useQueue")? new AMQQueue(_connection,_destination) : new AMQTopic(_connection,_destination);
-       _session = _connection.createSession(_transacted, Session.AUTO_ACKNOWLEDGE);
-        MessageConsumer _consumer = _session.createConsumer(dest);
-        _consumer.setMessageListener(this);
-       _startTime = System.currentTimeMillis();
-       if(Boolean.getBoolean("collect_stats"))
-       {
-           printHeading();
-           runReaper();
-       }
-    }
-
-    public void onMessage(Message message)
-    {
-        try
-        {
-            /* long msgId = Integer.parseInt(message.getJMSMessageID());
-            if (_verifyOrder && _totalMsgCount+1 != msgId)
-            {
-                _logger.error("Error : Message received out of order in JMSSyncConsumer:" + _id + " message id was " + msgId + " expected: " + _currentMsgCount+1);
-            }*/
-            _totalMsgCount ++;
-            _intervalCount++;
-            if(_intervalCount >= _logFrequency)
-            {
-                _intervalCount = 0;
-                if (Boolean.getBoolean("collect_stats"))
-                {
-                    runReaper();
-                }
-                if (System.currentTimeMillis() - _startTime >= _expiry)
-                {
-                    printSummary();
-                    _session.close();
-                    _connection.stop();
-                }
-            }
-        }
-        catch(Exception e)
-        {
-            e.printStackTrace();
-        }
-    }
-
-    public void runReaper()
-    {
-        try
-        {
-           FileWriter _memoryLog = new FileWriter(_logFileName + ".csv",true);
-            StringBuffer buf = new StringBuffer();
-            Date d = new Date(System.currentTimeMillis());
-            long currentTime = d.getTime();
-            long intervalTime =  currentTime -  _intervalStartTime;
-            long totalTime = currentTime - _startTime;
-            buf.append(df.format(d)).append(",");
-            buf.append(d.getTime()).append(",");
-            buf.append(" total Msg Count: ").append(_totalMsgCount).append(",");
-            if(totalTime > 0 )
-                buf.append(" rate: ").append(_totalMsgCount * 1000 / totalTime);
-            buf.append(",");
-            buf.append(" interval Count: ").append(_intervalCount).append(",");
-            if(intervalTime > 0 )
-                buf.append(" interval rate: ").append(_intervalCount * 1000 / intervalTime).append(",");
-            buf.append(Runtime.getRuntime().totalMemory() -Runtime.getRuntime().freeMemory()).append("\n");
-            buf.append("\n");
-            _memoryLog.write(buf.toString());
-            _memoryLog.close();
-            System.out.println(buf);
-            _intervalStartTime = d.getTime();
-        }
-        catch (Exception e)
-        {
-            _logger.error("Error printing info to the log file", e);
-        }
-    }
-
-    private void printHeading()
-    {
-        try
-        {
-            FileWriter _memoryLog = new FileWriter(_logFileName + ".csv",true);
-            String s = "Date/Time,Time (ms),total msg count,total rate (msg/sec),memory";
-            _memoryLog.write(s);
-            _memoryLog.close();
-        }
-        catch (IOException e)
-        {
-            e.printStackTrace();
-        }
-    }
-
-    private void printSummary()
-    {
-        try
-        {
-
-            long current = System.currentTimeMillis();
-            double time = current - _startTime;
-            double ratio = _totalMsgCount*1000/time;
-            FileWriter _summaryLog = new FileWriter(_logFileName + "_Summary",true);
-
-            StringBuffer buf = new StringBuffer("MessageProducerTest \n Test started at : ");
-            buf.append(df.format(new Date(_startTime))).append("\n Test finished at : ");
-            Date d = new Date(current);
-            buf.append(df.format(d)).append("\n Total Time taken (ms):");
-            buf.append(time).append("\n Total messages sent:");
-            buf.append(_totalMsgCount).append("\n producer rate:");
-            buf.append(ratio).append("\n");
-            _summaryLog.write(buf.toString());
-            System.out.println("---------- Test Ended -------------");
-            _summaryLog.close();
-        }
-        catch(Exception e)
-        {
-            e.printStackTrace();
-        }
-    }
-
-    public static void main(String[] args)
-    {
-        try
-        {
-            MessageConsumerTest test = new MessageConsumerTest();
-            test.init();
-        }
-        catch (Exception e)
-        {
-            e.printStackTrace();
-        }
-    }
-
-}
diff --git a/qpid/java/perftests/src/main/java/org/apache/qpid/client/perf/MessageProducerTest.java b/qpid/java/perftests/src/main/java/org/apache/qpid/client/perf/MessageProducerTest.java
deleted file mode 100644
index 4398b28131..0000000000
--- a/qpid/java/perftests/src/main/java/org/apache/qpid/client/perf/MessageProducerTest.java
+++ /dev/null
@@ -1,182 +0,0 @@
-package org.apache.qpid.client.perf;
-
-import java.io.FileWriter;
-import java.io.IOException;
-import java.sql.Date;
-import java.text.SimpleDateFormat;
-
-import javax.jms.BytesMessage;
-import javax.jms.Destination;
-import javax.jms.MessageProducer;
-import javax.jms.Session;
-
-import org.apache.qpid.client.AMQConnection;
-import org.apache.qpid.client.AMQQueue;
-import org.apache.qpid.client.AMQTopic;
-import org.apache.qpid.client.message.TestMessageFactory;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class MessageProducerTest extends Options
-{
-    private static final Logger _logger = LoggerFactory.getLogger(MessageProducerTest.class);
-    private SimpleDateFormat df = new SimpleDateFormat("h:mm a");
-
-    String _logFileName;
-    long _startTime;
-    long _intervalStartTime;
-    long _totalMsgCount;
-    long _intervalCount;
-
-    private AMQConnection _connection;
-    private Session _session;
-    private BytesMessage _payload;
-    private MessageProducer _producer;
-
-    public void init() throws Exception
-    {
-       this.parseOptions();
-       _logFileName = _logFilePath + "/MessageProducerTest_" + System.currentTimeMillis();
-       _connection = ConnectionUtility.getInstance().getConnection();
-       _connection.start();
-       Destination dest = Boolean.getBoolean("useQueue")? new AMQQueue(_connection,_destination) : new AMQTopic(_connection,_destination);
-       _session = _connection.createSession(_transacted, Session.AUTO_ACKNOWLEDGE);
-       _payload = TestMessageFactory.newBytesMessage(_session, _messageSize);
-       _producer = _session.createProducer(dest);
-       // this should speedup the message producer
-       _producer.setDisableMessageTimestamp(true);
-    }
-
-    public void run()
-    {
-        _startTime = System.currentTimeMillis();
-        boolean run = true;
-        if(Boolean.getBoolean("collect_stats"))
-        {
-            printHeading();
-            runReaper();
-        }
-
-        try
-        {
-            while (run)
-            {
-                _payload.setJMSMessageID(String.valueOf(_totalMsgCount+1));
-                _producer.send(_payload);
-                _totalMsgCount ++;
-                _intervalCount ++;
-
-                // check every x messages to see if times up
-                if(_intervalCount >= _logFrequency)
-                {
-                    if (Boolean.getBoolean("collect_stats"))
-                    {
-                        runReaper();
-                        _intervalCount = 0;
-                    }
-                    if (System.currentTimeMillis() - _startTime >= _expiry)
-                    {
-                        // time to stop the test.
-                        _session.close();
-                        _connection.stop();
-                        run = false;
-                    }
-                }
-            }
-        }
-        catch (Exception e)
-        {
-            _logger.error("The timer thread exited", e);
-        }
-        printSummary();
-    }
-
-    public void runReaper()
-    {
-        try
-        {
-            FileWriter _memoryLog = new FileWriter(_logFileName + ".csv",true);
-            StringBuffer buf = new StringBuffer();
-            Date d = new Date(System.currentTimeMillis());
-            long currentTime = d.getTime();
-            long intervalTime =  currentTime -  _intervalStartTime;
-            long totalTime = currentTime - _startTime;
-            buf.append(df.format(d)).append(",");
-            buf.append(d.getTime()).append(",");
-            buf.append(" total Msg Count: ").append(_totalMsgCount).append(",");
-            if(totalTime > 0 )            
-            buf.append(" rate: ").append(_totalMsgCount * 1000 / totalTime);
-            buf.append(",");
-            buf.append(" interval Count: ").append(_intervalCount).append(",");
-            if(intervalTime > 0 )            
-                buf.append(" interval rate: ").append(_intervalCount * 1000 / intervalTime).append(",");
-            buf.append(Runtime.getRuntime().totalMemory() -Runtime.getRuntime().freeMemory()).append("\n");
-            buf.append("\n");
-            _memoryLog.write(buf.toString());
-            _memoryLog.close();
-            System.out.println(buf);
-            _intervalStartTime = d.getTime();
-        }
-        catch (Exception e)
-        {
-            _logger.error("Error printing info to the log file", e);
-        }
-    }
-
-    private void printHeading()
-    {
-        try
-        {
-            FileWriter _memoryLog = new FileWriter(_logFileName + ".csv",true);
-            String s = "Date/Time,Time (ms),total msg count,total rate (msg/sec),memory";
-            _memoryLog.write(s);
-            _memoryLog.close();
-        }
-        catch (IOException e)
-        {
-            e.printStackTrace();
-        }
-    }
-
-    private void printSummary()
-    {
-        try
-        {
-
-            long current = System.currentTimeMillis();
-            double time = current - _startTime;
-            double ratio = _totalMsgCount*1000/time;
-            FileWriter _summaryLog = new FileWriter(_logFileName + "_Summary",true);
-
-            StringBuffer buf = new StringBuffer("MessageProducerTest \n Test started at : ");
-            buf.append(df.format(new Date(_startTime))).append("\n Test finished at : ");
-            Date d = new Date(current);
-            buf.append(df.format(d)).append("\n Total Time taken (ms):");
-            buf.append(time).append("\n Total messages sent:");
-            buf.append(_totalMsgCount).append("\n producer rate:");
-            buf.append(ratio).append("\n");
-            _summaryLog.write(buf.toString());
-            System.out.println("---------- Test Ended -------------");
-            _summaryLog.close();
-        }
-        catch(Exception e)
-        {
-            e.printStackTrace();
-        }
-    }
-
-    public static void main(String[] args)
-    {
-        try
-        {
-            MessageProducerTest test = new MessageProducerTest();
-            test.init();
-            test.run();
-        }
-        catch(Exception e)
-        {
-            e.printStackTrace();
-        }
-    }
-
-}
diff --git a/qpid/java/perftests/src/main/java/org/apache/qpid/client/perf/Options.java b/qpid/java/perftests/src/main/java/org/apache/qpid/client/perf/Options.java
deleted file mode 100644
index c0f51738db..0000000000
--- a/qpid/java/perftests/src/main/java/org/apache/qpid/client/perf/Options.java
+++ /dev/null
@@ -1,105 +0,0 @@
-package org.apache.qpid.client.perf;
-
-public class Options
-{
-    public int _messageSize;
-    public boolean _transacted;
-    public boolean _synchronous;
-    public String _destination;
-    public long _expiry;
-    public long _logFrequency;
-    public String _logFilePath;
-
-    /**
-     * System props
-     * -DmessageSize
-     * -DuseQueue
-     * -Dtransacted
-     * -Ddestinations
-     * -DlogFilePath
-     * -Duration=1H,30M,10S
-     * -DlogDuration=10  in mins
-     */
-    public void parseOptions()
-    {
-        _messageSize = Integer.parseInt(System.getProperty("messageSize","100"));
-        _transacted = false;
-        _destination = System.getProperty("destination", "foo");
-        _logFrequency = Long.parseLong(System.getProperty("logFrequency","10000"));
-        _logFilePath = System.getProperty("logFilePath");
-        _expiry = getExpiry();
-
-        System.out.println("============= Test Data ===================");
-        System.out.println("Destination            : " + _destination);
-        System.out.println("Collect stats          : " + Boolean.getBoolean("collect_stats"));
-        System.out.println("Log Frequency in msgs  : " + _logFrequency);
-        System.out.println("Log file path          : " + _logFilePath);
-        System.out.println("Test Duration          : " + printTestDuration());
-        System.out.println("============= /Test Data ===================");
-    }
-
-    private String printTestDuration()
-    {
-        StringBuffer buf = new StringBuffer();
-        long temp = _expiry;
-        int hours = (int)temp/(60*60*1000);
-        temp = temp -hours*60*60*1000;
-
-        int mins  = (int)(temp)/(60*1000);
-        temp = temp -mins*60*1000;
-
-        int secs  = (int)temp/1000;
-
-        if (hours > 0)
-        {
-            buf.append(hours).append(" hours ");
-        }
-        if (mins > 0)
-        {
-            buf.append(mins).append(" mins ");
-        }
-        if (secs > 0)
-        {
-            buf.append(secs).append(" secs");
-        }
-
-        return buf.toString();
-    }
-
-    private long getExpiry()
-    {
-        // default is 30 mins
-        long time = 0;
-        String s = System.getProperty("duration");
-        if(s != null)
-        {
-            String[] temp = s.split(",");
-            for (String st:temp)
-            {
-                if(st.indexOf("H")>0)
-                {
-                    int hour = Integer.parseInt(st.substring(0,st.indexOf("H")));
-                    time = time + hour * 60 * 60 * 1000;
-                }
-                else if(st.indexOf("M")>0)
-                {
-                    int min = Integer.parseInt(st.substring(0,st.indexOf("M")));
-                    time = time + min * 60 * 1000;
-                }
-                else if(st.indexOf("S")>0)
-                {
-                    int sec = Integer.parseInt(st.substring(0,st.indexOf("S")));
-                    time = time + sec * 1000;
-                }
-
-            }
-        }
-        if (time == 0)
-        {
-            time = 30 * 60 * 1000;
-        }
-
-        return time;
-    }
-
-}
diff --git a/qpid/java/perftests/src/main/java/org/apache/qpid/client/topic/Client.java b/qpid/java/perftests/src/main/java/org/apache/qpid/client/topic/Client.java
deleted file mode 100644
index 4a726c19ea..0000000000
--- a/qpid/java/perftests/src/main/java/org/apache/qpid/client/topic/Client.java
+++ /dev/null
@@ -1,210 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.qpid.client.topic;
-
-import org.apache.qpid.client.message.TestMessageFactory;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.jms.*;
-import java.util.Properties;
-import java.util.Random;
-import java.util.List;
-import java.util.ArrayList;
-import java.io.FileWriter;
-
-public class Client
-{
-    /**
-     * This class logger
-     */
-    private static final Logger _logger=LoggerFactory.getLogger(Client.class);
-
-    private long _messagesProduced=0;
-    private final Object _lock=new Object();
-    private Message _message;
-    private List<Runner> _runners=new ArrayList<Runner>();
-
-
-    /**
-     * Run the message consumer example.
-     *
-     * @param args Command line arguments.
-     */
-    public static void main(String[] args)
-    {
-        Client syncConsumer=new Client();
-        int firstArg=120;
-        if (args.length > 0)
-        {
-            try
-            {
-                firstArg=Integer.parseInt(args[0]);
-            }
-            catch (NumberFormatException e)
-            {
-                _logger.warn("Argument must be an integer, running for 2 minutes");
-            }
-        }
-        syncConsumer.runClient(firstArg);
-    }
-
-
-    void runClient(long duration)
-    {
-        try
-        {
-            // Load JNDI properties
-            Properties properties=new Properties();
-            properties.load(this.getClass().getResourceAsStream("topic.properties"));
-
-            String logFilePath = System.getProperty("logFilePath", "./");
-            FileWriter file = new FileWriter(logFilePath + "client-" + System.currentTimeMillis() + ".cvs",true);
-
-            //Create the initial context
-            Context ctx=new InitialContext(properties);
-
-            // Lookup the connection factory
-            ConnectionFactory conFac=(ConnectionFactory) ctx.lookup("qpidConnectionfactory");
-            // create the connection
-            Connection connection=conFac.createConnection();
-
-            connection.setExceptionListener(new ExceptionListener()
-            {
-                public void onException(JMSException jmse)
-                {
-                    // The connection may have broken invoke reconnect code if available.
-                    // The connection may have broken invoke reconnect code if available.
-                    System.err.println("Received an exception through the ExceptionListener");
-                    System.exit(0);
-                }
-            });
-
-            // Now the messageConsumer is set up we can start the connection
-            connection.start();
-
-            // Create a session on the connection
-            // This session is a default choice of non-transacted and uses the auto acknowledge feature of a session.
-            Session session=connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
-
-            Queue queueCompleted = session.createQueue("completed");
-            Queue queueStarted = session.createQueue("started");
-            MessageProducer prod = session.createProducer(queueCompleted);
-            MessageConsumer cons = session.createConsumer(queueStarted);
-            cons.receive();
-            _logger.info("Starting producing messages");
-
-            _message=TestMessageFactory.newBytesMessage(session, 1024);
-
-            Random random=new Random();
-            long testDuration=0;
-            long totalMessagesProduced;
-            long messagesProducedLastInterval=0;
-            long intervalThroughput;
-            long totalThroughput;
-            long numProducers=1;
-            String info;
-            startNewProducer(session, random);
-            while (testDuration < duration)
-            {
-                // every 5 second creates a thread an print the throughput
-                synchronized (_lock)
-                {
-                    _lock.wait(5000);
-                    totalMessagesProduced=_messagesProduced;
-                }
-                testDuration=testDuration + 5;
-                intervalThroughput=(totalMessagesProduced - messagesProducedLastInterval) / 5;
-                totalThroughput=totalMessagesProduced / testDuration;
-                messagesProducedLastInterval=totalMessagesProduced;
-                info = "Number of producers " + numProducers + " | This interval throughput = " +
-                        intervalThroughput + " | Total throughput = " + totalThroughput;
-                _logger.info(info);
-                file.write(info + "\n");
-                startNewProducer(session, random);
-                numProducers++;
-            }
-            file.close();
-            // stop all the producers
-            for (Runner runner : _runners)
-            {
-                runner.stop();
-            }
-            _logger.info("Stopping server");
-            prod.send(session.createTextMessage("stop"));
-        }
-        catch (Exception e)
-        {
-            e.printStackTrace();
-        }
-    }
-
-    private void startNewProducer(Session session, Random random)
-            throws JMSException
-    {
-        // select a random topic
-        int topicNumber=random.nextInt(50);
-        _logger.info("creating producer for topic: topic- " + topicNumber);
-        Topic topic=session.createTopic("topic-" + topicNumber);
-        MessageProducer prod=session.createProducer(topic);
-        Runner runner=new Runner(prod);
-        _runners.add(runner);
-        Thread thread=new Thread(runner);
-        thread.setDaemon(true);
-        thread.start();
-    }
-
-    private class Runner implements Runnable
-    {
-        MessageProducer _prod;
-        boolean _produce=true;
-        private Runner(MessageProducer prod)
-        {
-            _prod=prod;
-        }
-
-        public void run()
-        {
-            while (_produce)
-            {
-                try
-                {
-                    _prod.send(_message, DeliveryMode.PERSISTENT, Message.DEFAULT_PRIORITY,
-                            Message.DEFAULT_TIME_TO_LIVE);
-                    synchronized (_lock)
-                    {
-                        _messagesProduced++;
-                    }
-                }
-                catch (Exception e)
-                {
-                    e.printStackTrace();
-                    _produce=false;
-                }
-            }
-        }
-
-        public void stop()
-        {
-            _produce=false;
-        }
-    }
-
-}
diff --git a/qpid/java/perftests/src/main/java/org/apache/qpid/client/topic/Server.java b/qpid/java/perftests/src/main/java/org/apache/qpid/client/topic/Server.java
deleted file mode 100644
index 883a7465a1..0000000000
--- a/qpid/java/perftests/src/main/java/org/apache/qpid/client/topic/Server.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.qpid.client.topic;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.naming.Context;
-import javax.naming.InitialContext;
-
-import javax.jms.*;
-import java.util.Properties;
-import java.io.FileWriter;
-
-
-public class Server
-{
-    /**
-     * This class logger
-     */
-    private static final Logger _logger=LoggerFactory.getLogger(Server.class);
-
-
-    private final Object _lock=new Object();
-    private long _numMessages=0;
-    public FileWriter _file;
-    public boolean _running=true;
-
-    public static void main(String[] args)
-    {
-        (new Server()).runServer();
-    }
-
-    void runServer()
-    {
-        try
-        {
-            // Load JNDI properties
-            Properties properties=new Properties();
-            properties.load(this.getClass().getResourceAsStream("topic.properties"));
-
-            String logFilePath=System.getProperty("logFilePath", "./");
-            _file=new FileWriter(logFilePath + "server-" + System.currentTimeMillis() + ".cvs", true);
-
-            //Create the initial context
-            Context ctx=new InitialContext(properties);
-
-            // Lookup the connection factory
-            ConnectionFactory conFac=(ConnectionFactory) ctx.lookup("qpidConnectionfactory");
-            // create the connection
-            Connection connection=conFac.createConnection();
-
-            connection.setExceptionListener(new ExceptionListener()
-            {
-                public void onException(JMSException jmse)
-                {
-                    // The connection may have broken invoke reconnect code if available.
-                    // The connection may have broken invoke reconnect code if available.
-                    _logger.warn("Received an exception through the ExceptionListener");
-                    System.exit(0);
-                }
-            });
-
-            // Create a session on the connection
-            // This session is a default choice of non-transacted and uses the auto acknowledge feature of a session.
-            // Session session=connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
-
-            for (int i=0; i < 50; i++)
-            {
-                Session session=connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
-                Topic topic=session.createTopic("topic-" + i);
-                TopicSubscriber dursub=session.createDurableSubscriber(topic, "durable-" + i);
-                dursub.setMessageListener(new MyListener());
-            }
-
-            // Now the messageConsumer is set up we can start the connection
-            connection.start();
-            _logger.info("Ready to consume messages");
-            // listen for the termination message
-            Session session=connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
-            Queue queueCompleted=session.createQueue("completed");
-            Queue queueStarted=session.createQueue("started");
-            MessageProducer prod=session.createProducer(queueStarted);
-
-            Thread logger=new Thread(new MyLogger());
-            logger.setDaemon(true);
-            logger.start();
-
-            prod.send(session.createTextMessage("start"));
-            long startTime=System.currentTimeMillis();
-            MessageConsumer cons=session.createConsumer(queueCompleted);
-            cons.receive();
-
-            _running=false;
-
-            long endTime=System.currentTimeMillis();
-            session.close();
-            _logger.info("Received " + _numMessages);
-            _file.write("Received " + _numMessages + "\n");
-            _logger.info("Throughput " + _numMessages / (endTime - startTime) * 1000 + "msg/s");
-            _file.write("Throughput " + _numMessages / (endTime - startTime) * 1000 + "msg/s");
-            _file.close();
-        }
-        catch (Exception e)
-        {
-            e.printStackTrace();
-        }
-    }
-
-    private class MyListener implements MessageListener
-    {
-        public void onMessage(Message message)
-        {
-            synchronized (_lock)
-            {
-                _numMessages++;
-                /*if(_numMessages % 1000 == 0)
-                {
-                    _logger.info("received: " + _numMessages);
-                } */
-            }
-        }
-    }
-
-    private class MyLogger implements Runnable
-    {
-        public void run()
-        {
-            long endTime=0;
-            while (_running)
-            {
-                synchronized (_lock)
-                {
-                    try
-                    {
-                        _lock.wait(5000);
-                        if (_running)
-                        {
-                            endTime=endTime + 5;
-                            String s="Throughput " + _numMessages / endTime + " msg/s";
-                            _logger.info(s);
-                            _file.write(s + "\n");
-                        }
-
-                    }
-                    catch (Exception e)
-                    {
-                        e.printStackTrace();
-                    }
-
-                }
-            }
-        }
-    }
-}
diff --git a/qpid/java/perftests/src/main/java/org/apache/qpid/client/topic/topic.properties b/qpid/java/perftests/src/main/java/org/apache/qpid/client/topic/topic.properties
deleted file mode 100644
index cff5275e36..0000000000
--- a/qpid/java/perftests/src/main/java/org/apache/qpid/client/topic/topic.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-java.naming.factory.initial = org.apache.qpid.jndi.PropertiesFileInitialContextFactory
-
-connectionfactory.qpidConnectionfactory = amqp://guest:guest@clientid/test?brokerlist='tcp://localhost:5672'
-
-# A 0.10 connection factory
-#connectionfactory.qpidConnectionfactory = qpid:password=pass;username=name@tcp:localhost:5672
diff --git a/qpid/java/perftests/src/main/java/org/apache/qpid/ping/PingAsyncTestPerf.java b/qpid/java/perftests/src/main/java/org/apache/qpid/ping/PingAsyncTestPerf.java
deleted file mode 100644
index 06081e6ebf..0000000000
--- a/qpid/java/perftests/src/main/java/org/apache/qpid/ping/PingAsyncTestPerf.java
+++ /dev/null
@@ -1,292 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.ping;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.apache.log4j.Logger;
-
-import org.apache.qpid.requestreply.PingPongProducer;
-
-import uk.co.thebadgerset.junit.extensions.TimingController;
-import uk.co.thebadgerset.junit.extensions.TimingControllerAware;
-
-import javax.jms.JMSException;
-import javax.jms.Message;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.atomic.AtomicLong;
-
-/**
- * PingAsyncTestPerf is a performance test that outputs multiple timings from its test method, using the timing controller
- * interface supplied by the test runner from a seperate listener thread. It differs from the {@link PingTestPerf} test
- * that it extends because it can output timings as replies are received, rather than waiting until all expected replies
- * are received. This is less 'blocky' than the tests in {@link PingTestPerf}, and provides a truer simulation of sending
- * and recieving clients working asynchronously.
- *
- * <p/><table id="crc"><caption>CRC Card</caption>
- * <tr><td> Responsibilities <th> Collaborations
- * <tr><td> Send many ping messages and output timings asynchronously on batches received.
- * </table>
- */
-public class PingAsyncTestPerf extends PingTestPerf implements TimingControllerAware
-{
-    private static Logger _logger = Logger.getLogger(PingAsyncTestPerf.class);
-
-    /** Holds the name of the property to get the test results logging batch size. */
-    public static final String TEST_RESULTS_BATCH_SIZE_PROPNAME = "batchSize";
-
-    /** Holds the default test results logging batch size. */
-    public static final int TEST_RESULTS_BATCH_SIZE_DEFAULT = 1000;
-
-    /** Used to hold the timing controller passed from the test runner. */
-    private TimingController _timingController;
-
-    /** Used to generate unique correlation ids for each test run. */
-    private AtomicLong corellationIdGenerator = new AtomicLong();
-
-    /** Holds test specifics by correlation id. This consists of the expected number of messages and the timing controler. */
-    private Map<String, PerCorrelationId> perCorrelationIds =
-        Collections.synchronizedMap(new HashMap<String, PerCorrelationId>());
-
-    /** Holds the batched results listener, that does logging on batch boundaries. */
-    private BatchedResultsListener batchedResultsListener = null;
-
-    /**
-     * Creates a new asynchronous ping performance test with the specified name.
-     *
-     * @param name The test name.
-     */
-    public PingAsyncTestPerf(String name)
-    {
-        super(name);
-
-        // Sets up the test parameters with defaults.
-        testParameters.setPropertyIfNull(TEST_RESULTS_BATCH_SIZE_PROPNAME,
-            Integer.toString(TEST_RESULTS_BATCH_SIZE_DEFAULT));
-    }
-
-    /**
-     * Compile all the tests into a test suite.
-     * @return The test suite to run. Should only contain testAsyncPingOk method.
-     */
-    public static Test suite()
-    {
-        // Build a new test suite
-        TestSuite suite = new TestSuite("Ping Performance Tests");
-
-        // Run performance tests in read committed mode.
-        suite.addTest(new PingAsyncTestPerf("testAsyncPingOk"));
-
-        return suite;
-    }
-
-    /**
-     * Accepts a timing controller from the test runner.
-     *
-     * @param timingController The timing controller to register mutliple timings with.
-     */
-    public void setTimingController(TimingController timingController)
-    {
-        _timingController = timingController;
-    }
-
-    /**
-     * Gets the timing controller passed in by the test runner.
-     *
-     * @return The timing controller passed in by the test runner.
-     */
-    public TimingController getTimingController()
-    {
-        return _timingController;
-    }
-
-    /**
-     * Sends the specified number of pings, asynchronously outputs timings on every batch boundary, and waits until
-     * all replies have been received or a time out occurs before exiting this method.
-     *
-     * @param numPings The number of pings to send.
-     * @throws Exception pass all errors out to the test harness
-     */
-    public void testAsyncPingOk(int numPings) throws Exception
-    {
-        // _logger.debug("public void testAsyncPingOk(int numPings): called");
-
-        // Ensure that at least one ping was requeusted.
-        if (numPings == 0)
-        {
-            _logger.error("Number of pings requested was zero.");
-            fail("Number of pings requested was zero.");
-        }
-
-        // Get the per thread test setup to run the test through.
-        PerThreadSetup perThreadSetup = threadSetup.get();
-        PingClient pingClient = perThreadSetup._pingClient;
-
-        // Advance the correlation id of messages to send, to make it unique for this run.
-        perThreadSetup._correlationId = Long.toString(corellationIdGenerator.incrementAndGet());
-        // String messageCorrelationId = perThreadSetup._correlationId;
-        // _logger.debug("messageCorrelationId = " + messageCorrelationId);
-
-        // Initialize the count and timing controller for the new correlation id.
-        PerCorrelationId perCorrelationId = new PerCorrelationId();
-        TimingController tc = getTimingController().getControllerForCurrentThread();
-        perCorrelationId._tc = tc;
-        perCorrelationId._expectedCount = pingClient.getExpectedNumPings(numPings);
-        perCorrelationIds.put(perThreadSetup._correlationId, perCorrelationId);
-
-        // Send the requested number of messages, and wait until they have all been received.
-        long timeout = Long.parseLong(testParameters.getProperty(PingPongProducer.TIMEOUT_PROPNAME));
-        int numReplies = pingClient.pingAndWaitForReply(null, numPings, timeout, perThreadSetup._correlationId);
-
-        // Check that all the replies were received and log a fail if they were not.
-        if (numReplies < perCorrelationId._expectedCount)
-        {
-            perCorrelationId._tc.completeTest(false, numPings - perCorrelationId._expectedCount);
-        }
-
-        // Remove the expected count and timing controller for the message correlation id, to ensure they are cleaned up.
-        perCorrelationIds.remove(perThreadSetup._correlationId);
-    }
-
-    /**
-     * Performs test fixture creation on a per thread basis. This will only be called once for each test thread.
-     */
-    public void threadSetUp()
-    {
-        _logger.debug("public void threadSetUp(): called");
-
-        try
-        {
-            // Call the set up method in the super class. This creates a PingClient pinger.
-            super.threadSetUp();
-
-            // Create the chained message listener, only if it has not already been created.  This is set up with the
-            // batch size property, to tell it what batch size to output results on. A synchronized block is used to
-            // ensure that only one thread creates this.
-            synchronized (this)
-            {
-                if (batchedResultsListener == null)
-                {
-                    int batchSize = Integer.parseInt(testParameters.getProperty(TEST_RESULTS_BATCH_SIZE_PROPNAME));
-                    batchedResultsListener = new BatchedResultsListener(batchSize);
-                }
-            }
-
-            // Get the set up that the super class created.
-            PerThreadSetup perThreadSetup = threadSetup.get();
-
-            // Register the chained message listener on the pinger to do its asynchronous test timings from.
-            perThreadSetup._pingClient.setChainedMessageListener(batchedResultsListener);
-        }
-        catch (Exception e)
-        {
-            _logger.warn("There was an exception during per thread setup.", e);
-        }
-    }
-
-    /**
-     * BatchedResultsListener is a {@link PingPongProducer.ChainedMessageListener} that can be attached to the
-     * pinger, in order to receive notifications about every message received and the number remaining to be
-     * received. Whenever the number remaining crosses a batch size boundary this results listener outputs
-     * a test timing for the actual number of messages received in the current batch.
-     */
-    private class BatchedResultsListener implements PingPongProducer.ChainedMessageListener
-    {
-        /** The test results logging batch size. */
-        int _batchSize;
-
-        /**
-         * Creates a results listener on the specified batch size.
-         *
-         * @param batchSize The batch size to use.
-         */
-        public BatchedResultsListener(int batchSize)
-        {
-            _batchSize = batchSize;
-        }
-
-        /**
-         * This callback method is called from all of the pingers that this test creates. It uses the correlation id
-         * from the message to identify the timing controller for the test thread that was responsible for sending those
-         * messages.
-         *
-         * @param message        The message.
-         * @param remainingCount The count of messages remaining to be received with a particular correlation id.
-         *
-         * @throws JMSException Any underlying JMSException is allowed to fall through.
-         */
-        public void onMessage(Message message, int remainingCount, long latency) throws JMSException
-        {
-            // Check if a batch boundary has been crossed.
-            if ((remainingCount % _batchSize) == 0)
-            {
-                // Extract the correlation id from the message.
-                String correlationId = message.getJMSCorrelationID();
-
-                /*_logger.debug("public void onMessage(Message message, int remainingCount = " + remainingCount
-                    + "): called on batch boundary for message id: " + correlationId + " with thread id: "
-                    + Thread.currentThread().getId());*/
-
-                // Get the details for the correlation id and check that they are not null. They can become null
-                // if a test times out.
-                PerCorrelationId perCorrelationId = perCorrelationIds.get(correlationId);
-                if (perCorrelationId != null)
-                {
-                    // Get the timing controller and expected count for this correlation id.
-                    TimingController tc = perCorrelationId._tc;
-                    int expected = perCorrelationId._expectedCount;
-
-                    // Calculate how many messages were actually received in the last batch. This will be the batch size
-                    // except where the number expected is not a multiple of the batch size and this is the first remaining
-                    // count to cross a batch size boundary, in which case it will be the number expected modulo the batch
-                    // size.
-                    int receivedInBatch = ((expected - remainingCount) < _batchSize) ? (expected % _batchSize) : _batchSize;
-
-                    // Register a test result for the correlation id.
-                    try
-                    {
-                        tc.completeTest(true, receivedInBatch);
-                    }
-                    catch (InterruptedException e)
-                    {
-                        // Ignore this. It means the test runner wants to stop as soon as possible.
-                        _logger.warn("Got InterruptedException.", e);
-                    }
-                }
-                // Else ignore, test timed out. Should log a fail here?
-            }
-        }
-    }
-
-    /**
-     * Holds state specific to each correlation id, needed to output test results. This consists of the count of
-     * the total expected number of messages, and the timing controller for the thread sending those message ids.
-     */
-    private static class PerCorrelationId
-    {
-        public int _expectedCount;
-        public TimingController _tc;
-    }
-}
diff --git a/qpid/java/perftests/src/main/java/org/apache/qpid/ping/PingClient.java b/qpid/java/perftests/src/main/java/org/apache/qpid/ping/PingClient.java
deleted file mode 100644
index b9632eee4c..0000000000
--- a/qpid/java/perftests/src/main/java/org/apache/qpid/ping/PingClient.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*

- *

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- *

- *   http://www.apache.org/licenses/LICENSE-2.0

- *

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- *

- */

-package org.apache.qpid.ping;

-

-import org.apache.log4j.Logger;

-

-import org.apache.qpid.requestreply.PingPongProducer;

-

-import javax.jms.Destination;

-

-import java.util.List;

-import java.util.Properties;

-

-/**

- * PingClient is a {@link PingPongProducer} that does not need a {@link org.apache.qpid.requestreply.PingPongBouncer}

- * to send replies to its pings. It simply listens to its own ping destinations, rather than seperate reply queues.

- * It is an all in one ping client, that produces and consumes its own pings.

- *

- * <p/>The constructor increments a count of the number of ping clients created. It is assumed that where many

- * are created they will all be run in parallel and be active in sending and consuming pings at the same time.

- * If the unique destinations flag is not set and a pub/sub ping cycle is being run, this means that they will all hear

- * pings sent by each other. The expected number of pings received will therefore be multiplied up by the number of

- * active ping clients. The {@link #getConsumersPerDestination()} method is used to supply this multiplier under these

- * conditions.

- *

- * <p/><table id="crc"><caption>CRC Card</caption>

- * <tr><th> Responsibilities <th> Collaborations

- * <tr><td> Create a ping producer that listens to its own pings <td> {@link PingPongProducer}

- * <tr><td> Count the number of ping producers and produce multiplier for scaling up messages expected over topic pings.

- * </table>

- */

-public class PingClient extends PingPongProducer

-{

-    /** Used for debugging. */

-    private final Logger log = Logger.getLogger(PingClient.class);

-

-    /** Used to count the number of ping clients created. */

-    private static int _pingClientCount;

-

-    /**

-     * Creates a ping producer with the specified parameters, of which there are many. See the class level comments

-     * for {@link PingPongProducer} for details. This constructor creates a connection to the broker and creates

-     * producer and consumer sessions on it, to send and recieve its pings and replies on.

-     *

-     * @param  overrides Properties containing any desired overrides to the defaults.

-     *

-     * @throws Exception Any exceptions are allowed to fall through.

-     */

-    public PingClient(Properties overrides) throws Exception

-    {

-        super(overrides);

-

-        _pingClientCount++;

-    }

-

-    /**

-     * Returns the ping destinations themselves as the reply destinations for this pinger to listen to. This has the

-     * effect of making this pinger listen to its own pings.

-     *

-     * @return The ping destinations.

-     */

-    public List<Destination> getReplyDestinations()

-    {

-        return _pingDestinations;

-    }

-

-    /**

-     * Supplies the multiplier for the number of ping clients that will hear each ping when doing pub/sub pinging.

-     *

-     * @return The scaling up of the number of expected pub/sub pings.

-     */

-    public int getConsumersPerDestination()

-    {

-        log.debug("public int getConsumersPerDestination(): called");

-

-        if (_isUnique)

-        {

-            log.debug(_noOfConsumers + " consumer per destination.");

-

-            return _noOfConsumers;

-        }

-        else

-        {

-            log.debug((_pingClientCount * _noOfConsumers) + " consumers per destination.");

-

-            return _pingClientCount * _noOfConsumers;

-        }

-    }

-}

diff --git a/qpid/java/perftests/src/main/java/org/apache/qpid/ping/PingDurableClient.java b/qpid/java/perftests/src/main/java/org/apache/qpid/ping/PingDurableClient.java
deleted file mode 100644
index 2750790354..0000000000
--- a/qpid/java/perftests/src/main/java/org/apache/qpid/ping/PingDurableClient.java
+++ /dev/null
@@ -1,451 +0,0 @@
-/*

- *

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- *

- *   http://www.apache.org/licenses/LICENSE-2.0

- *

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- *

- */

-package org.apache.qpid.ping;

-

-import org.apache.log4j.Logger;

-

-import org.apache.qpid.requestreply.PingPongProducer;

-import org.apache.qpid.util.CommandLineParser;

-

-import uk.co.thebadgerset.junit.extensions.util.MathUtils;

-import uk.co.thebadgerset.junit.extensions.util.ParsedProperties;

-

-import javax.jms.*;

-

-import java.io.BufferedReader;

-import java.io.IOException;

-import java.io.InputStreamReader;

-import java.util.List;

-import java.util.Properties;

-import java.util.concurrent.atomic.AtomicInteger;

-

-/**

- * PingDurableClient is a variation of the {@link PingPongProducer} ping tool. Instead of sending its pings and

- * receiving replies to them at the same time, this tool sends pings until it is signalled by some 'event' to stop

- * sending. It then waits for another signal before it re-opens a fresh connection and attempts to receive all of the

- * pings that it has succesfully sent. It is intended to be an interactive test that lets a user experiment with

- * failure conditions when using durable messaging.

- *

- * <p/>The events that can stop it from sending are input from the user on the console, failure of its connection to

- * the broker, completion of sending a specified number of messages, or expiry of a specified duration. In all cases

- * it will do its best to clean up and close the connection before opening a fresh connection to receive the pings

- * with.

- *

- * <p/>The event to re-connect and attempt to recieve the pings is input from the user on the console.

- *

- * <p/>This ping client inherits the configuration properties of its parent class ({@link PingPongProducer}) and

- * additionally accepts the following parameters:

- *

- * <p/><table><caption>Parameters</caption>

- * <tr><th> Parameter           <th> Default  <th> Comments

- * <tr><td> numMessages         <td> 100      <td> The total number of messages to send.

- * <tr><td> numMessagesToAction <td> -1       <td> The number of messages to send before taking a custom 'action'.

- * <tr><td> duration            <td> 30S      <td> The length of time to ping for. (Format dDhHmMsS, for d days, h hours,

- *                                                 m minutes and s seconds).

- * </table>

- *

- * <p/>This ping client also overrides some of the defaults of its parent class, to provide a reasonable set up

- * when no parameters are specified.

- *

- * <p/><table><caption>Parameters</caption>

- * <tr><th> Parameter        <th> Default  <th> Comments

- * <tr><td> uniqueDests      <td> false    <td> Prevents destination names being timestamped.

- * <tr><td> transacted       <td> true     <td> Only makes sense to test with transactions.

- * <tr><td> persistent       <td> true     <td> Only makes sense to test persistent.

- * <tr><td> durableDests     <td> true     <td> Should use durable queues with persistent messages.

- * <tr><td> commitBatchSize  <td> 10

- * <tr><td> rate             <td> 20       <td> Total default test time is 5 seconds.

- * </table>

- *

- * <p/>When a number of messages or duration is specified, this ping client will ping until the first of those limits

- * is reached. Reaching the limit will be interpreted as the first signal to stop sending, and the ping client will

- * wait for the second signal before receiving its pings.

- *

- * <p/>This class provides a mechanism for extensions to add arbitrary actions, after a particular number of messages

- * have been sent. When the number of messages equal the value set in the 'numMessagesToAction' property is method,

- * the {@link #takeAction} method is called. By default this does nothing, but extensions of this class can provide

- * custom behaviour with alternative implementations of this method (for example taking a backup).

- *

- * <p><table id="crc"><caption>CRC Card</caption>

- * <tr><th> Responsibilities <th> Collaborations

- * <tr><td> Send and receive pings.

- * <tr><td> Accept user input to signal stop sending.

- * <tr><td> Accept user input to signal start receiving.

- * <tr><td> Provide feedback on pings sent versus pings received.

- * <tr><td> Provide extension point for arbitrary action on a particular message count.

- * </table>

- */

-public class PingDurableClient extends PingPongProducer implements ExceptionListener

-{

-    private static final Logger log = Logger.getLogger(PingDurableClient.class);

-

-    public static final String NUM_MESSAGES_PROPNAME = "numMessages";

-    public static final String NUM_MESSAGES_DEFAULT = "100";

-    public static final String DURATION_PROPNAME = "duration";

-    public static final String DURATION_DEFAULT = "30S";

-    public static final String NUM_MESSAGES_TO_ACTION_PROPNAME = "numMessagesToAction";

-    public static final String NUM_MESSAGES_TO_ACTION_DEFAULT = "-1";

-

-    /** The maximum length of time to wait whilst receiving pings before assuming that no more are coming. */

-    private static final long TIME_OUT = 3000;

-

-    static

-    {

-        defaults.setProperty(NUM_MESSAGES_PROPNAME, NUM_MESSAGES_DEFAULT);

-        defaults.setProperty(DURATION_PROPNAME, DURATION_DEFAULT);

-        defaults.setProperty(UNIQUE_DESTS_PROPNAME, "false");

-        defaults.setProperty(TRANSACTED_PROPNAME, "true");

-        defaults.setProperty(PERSISTENT_MODE_PROPNAME, "true");

-        defaults.setProperty(TX_BATCH_SIZE_PROPNAME, "10");

-        defaults.setProperty(RATE_PROPNAME, "20");

-        defaults.setProperty(NUM_MESSAGES_TO_ACTION_PROPNAME, NUM_MESSAGES_TO_ACTION_DEFAULT);

-    }

-

-    /** Specifies the number of pings to send, if larger than 0. 0 means send until told to stop. */

-    private int numMessages;

-

-    /** Holds the number of messages to send before taking triggering the action. */

-    private int numMessagesToAction;

-

-    /** Sepcifies how long to ping for, if larger than 0. 0 means send until told to stop. */

-    private long duration;

-

-    /** Used to indciate that this application should terminate. Set by the shutdown hook. */

-    private boolean terminate = false;

-

-    /**

-     * @throws Exception Any exceptions are allowed to fall through.

-     */

-    public PingDurableClient(Properties overrides) throws Exception

-    {

-        super(overrides);

-        log.debug("public PingDurableClient(Properties overrides = " + overrides + "): called");

-

-        // Extract the additional configuration parameters.

-        ParsedProperties properties = new ParsedProperties(defaults);

-        properties.putAll(overrides);

-

-        numMessages = properties.getPropertyAsInteger(NUM_MESSAGES_PROPNAME);

-        String durationSpec = properties.getProperty(DURATION_PROPNAME);

-        numMessagesToAction = properties.getPropertyAsInteger(NUM_MESSAGES_TO_ACTION_PROPNAME);

-

-        if (durationSpec != null)

-        {

-            duration = MathUtils.parseDuration(durationSpec) * 1000000;

-        }

-    }

-

-    /**

-     * Starts the ping/wait/receive process.

-     *

-     * @param args The command line arguments.

-     */

-    public static void main(String[] args)

-    {

-        try

-        {

-            // Create a ping producer overriding its defaults with all options passed on the command line.

-            Properties options =

-                CommandLineParser.processCommandLine(args, new CommandLineParser(new String[][] {}), System.getProperties());

-            PingDurableClient pingProducer = new PingDurableClient(options);

-

-            // Create a shutdown hook to terminate the ping-pong producer.

-            Runtime.getRuntime().addShutdownHook(pingProducer.getShutdownHook());

-

-            // Ensure that the ping pong producer is registered to listen for exceptions on the connection too.

-            // pingProducer.getConnection().setExceptionListener(pingProducer);

-

-            // Run the test procedure.

-            int sent = pingProducer.send();

-            pingProducer.closeConnection();

-            pingProducer.waitForUser("Press return to begin receiving the pings.");

-            pingProducer.receive(sent);

-

-            System.exit(0);

-        }

-        catch (Exception e)

-        {

-            System.err.println(e.getMessage());

-            log.error("Top level handler caught execption.", e);

-            System.exit(1);

-        }

-    }

-

-    /**

-     * Performs the main test procedure implemented by this ping client. See the class level comment for details.

-     */

-    protected int send() throws Exception

-    {

-        log.debug("public void sendWaitReceive(): called");

-

-        log.debug("duration = " + duration);

-        log.debug("numMessages = " + numMessages);

-

-        if (duration > 0)

-        {

-            System.out.println("Sending for up to " + (duration / 1000000000f) + " seconds.");

-        }

-

-        if (_rate > 0)

-        {

-            System.out.println("Sending at " + _rate + " messages per second.");

-        }

-

-        if (numMessages > 0)

-        {

-            System.out.println("Sending up to " + numMessages + " messages.");

-        }

-

-        // Establish the connection and the message producer.

-        establishConnection(true, false);

-        _connection.start();

-

-        Message message = getTestMessage(getReplyDestinations().get(0), _messageSize, _persistent);

-

-        // Send pings until a terminating condition is received.

-        boolean endCondition = false;

-        int messagesSent = 0;

-        int messagesCommitted = 0;

-        int messagesNotCommitted = 0;

-        long start = System.nanoTime();

-

-        // Clear console in.

-        clearConsole();

-

-        while (!endCondition)

-        {

-            boolean committed = false;

-

-            try

-            {

-                committed = sendMessage(messagesSent, message) && _transacted;

-

-                messagesSent++;

-                messagesNotCommitted++;

-

-                // Keep count of the number of messsages currently committed and pending commit.

-                if (committed)

-                {

-                    log.debug("Adding " + messagesNotCommitted + " messages to the committed count.");

-                    messagesCommitted += messagesNotCommitted;

-                    messagesNotCommitted = 0;

-

-                    System.out.println("Commited: " + messagesCommitted);

-                }

-            }

-            catch (JMSException e)

-            {

-                log.debug("Got JMSException whilst sending.");

-                _publish = false;

-            }

-

-            // Perform the arbitrary action if the number of messages sent has reached the right number.

-            if (messagesSent == numMessagesToAction)

-            {

-                System.out.println("At action point, Messages sent = " + messagesSent + ", Messages Committed = "

-                    + messagesCommitted + ", Messages not Committed = " + messagesNotCommitted);

-                takeAction();

-            }

-

-            // Determine if the end condition has been met, based on the number of messages, time passed, errors on

-            // the connection or user input.

-            long now = System.nanoTime();

-

-            if ((duration != 0) && ((now - start) > duration))

-            {

-                System.out.println("Send halted because duration expired.");

-                endCondition = true;

-            }

-            else if ((numMessages != 0) && (messagesSent >= numMessages))

-            {

-                System.out.println("Send halted because # messages completed.");

-                endCondition = true;

-            }

-            else if (System.in.available() > 0)

-            {

-                System.out.println("Send halted by user input.");

-                endCondition = true;

-

-                clearConsole();

-            }

-            else if (!_publish)

-            {

-                System.out.println("Send halted by error on the connection.");

-                endCondition = true;

-            }

-        }

-

-        log.debug("messagesSent = " + messagesSent);

-        log.debug("messagesCommitted = " + messagesCommitted);

-        log.debug("messagesNotCommitted = " + messagesNotCommitted);

-

-        System.out.println("Messages sent: " + messagesSent + ", Messages Committed = " + messagesCommitted

-            + ", Messages not Committed = " + messagesNotCommitted);

-

-        return messagesSent;

-    }

-

-    protected void closeConnection()

-    {

-        // Clean up the connection.

-        try

-        {

-            close();

-        }

-        catch (JMSException e)

-        {

-            log.debug("There was an error whilst closing the connection: " + e, e);

-            System.out.println("There was an error whilst closing the connection.");

-

-            // Ignore as did best could manage to clean up.

-        }

-    }

-

-    protected void receive(int messagesSent) throws Exception

-    {

-        // Re-establish the connection and the message consumer.

-        _queueJVMSequenceID = new AtomicInteger();

-        _queueSharedID = new AtomicInteger();

-

-        establishConnection(false, true);

-        _consumer[0].setMessageListener(null);

-        _consumerConnection[0].start();

-

-        // Try to receive all of the pings that were successfully sent.

-        int messagesReceived = 0;

-        boolean endCondition = false;

-

-        while (!endCondition)

-        {

-            // Message received = _consumer.receiveNoWait();

-            Message received = _consumer[0].receive(TIME_OUT);

-            log.debug("received = " + received);

-

-            if (received != null)

-            {

-                messagesReceived++;

-            }

-

-            // Determine if the end condition has been met, based on the number of messages and time passed since last

-            // receiving a message.

-            if (received == null)

-            {

-                System.out.println("Timed out.");

-                endCondition = true;

-            }

-            else if (messagesReceived >= messagesSent)

-            {

-                System.out.println("Got all messages.");

-                endCondition = true;

-            }

-        }

-

-        // Ensure messages received are committed.

-        if (_consTransacted)

-        {

-            try

-            {

-                _consumerSession[0].commit();

-                System.out.println("Committed for all messages received.");

-            }

-            catch (JMSException e)

-            {

-                log.debug("Error during commit: " + e, e);

-                System.out.println("Error during commit.");

-                try

-                {

-                    _consumerSession[0].rollback();

-                    System.out.println("Rolled back on all messages received.");

-                }

-                catch (JMSException e2)

-                {

-                    log.debug("Error during rollback: " + e, e);

-                    System.out.println("Error on roll back of all messages received.");

-                }

-

-            }

-        }

-

-        log.debug("messagesReceived = " + messagesReceived);

-

-        System.out.println("Messages received: " + messagesReceived);

-

-        // Clean up the connection.

-        close();

-    }

-

-    /**

-     * Clears any pending input from the console.

-     */

-    private void clearConsole()

-    {

-        try

-        {

-            BufferedReader bis = new BufferedReader(new InputStreamReader(System.in));

-

-            // System.in.skip(System.in.available());

-            while (bis.ready())

-            {

-                bis.readLine();

-            }

-        }

-        catch (IOException e)

-        { }

-    }

-

-    /**

-     * Returns the ping destinations themselves as the reply destinations for this pinger to listen to. This has the

-     * effect of making this pinger listen to its own pings.

-     *

-     * @return The ping destinations.

-     */

-    public List<Destination> getReplyDestinations()

-    {

-        return _pingDestinations;

-    }

-

-    /**

-     * Gets a shutdown hook that will cleanly shut this down when it is running the ping loop. This can be registered with

-     * the runtime system as a shutdown hook. This shutdown hook sets an additional terminate flag, compared with the

-     * shutdown hook in {@link PingPongProducer}, because the publish flag is used to indicate that sending or receiving

-     * message should stop, not that the application should termiante.

-     *

-     * @return A shutdown hook for the ping loop.

-     */

-    public Thread getShutdownHook()

-    {

-        return new Thread(new Runnable()

-                {

-                    public void run()

-                    {

-                        stop();

-                        terminate = true;

-                    }

-                });

-    }

-

-    /**

-     * Performs an aribtrary action once the 'numMesagesToAction' count is reached on sending messages. This default

-     * implementation does nothing.

-     */

-    public void takeAction()

-    { }

-}

diff --git a/qpid/java/perftests/src/main/java/org/apache/qpid/ping/PingLatencyTestPerf.java b/qpid/java/perftests/src/main/java/org/apache/qpid/ping/PingLatencyTestPerf.java
deleted file mode 100644
index 55414664da..0000000000
--- a/qpid/java/perftests/src/main/java/org/apache/qpid/ping/PingLatencyTestPerf.java
+++ /dev/null
@@ -1,314 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.ping;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.apache.log4j.Logger;
-
-import org.apache.qpid.client.AMQSession;
-import org.apache.qpid.client.message.AMQMessage;
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.requestreply.PingPongProducer;
-
-import uk.co.thebadgerset.junit.extensions.TimingController;
-import uk.co.thebadgerset.junit.extensions.TimingControllerAware;
-import uk.co.thebadgerset.junit.extensions.util.ParsedProperties;
-
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.ObjectMessage;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.atomic.AtomicLong;
-
-/**
- * PingLatencyTestPerf is a performance test that outputs multiple timings from its test method, using the timing
- * controller interface supplied by the test runner from a seperate listener thread. It outputs round trip timings for
- * individual ping messages rather than for how long a complete batch of messages took to process. It also differs from
- * the {@link PingTestPerf} test that it extends because it can output timings as replies are received, rather than
- * waiting until all expected replies are received.
- *
- * <p/>This test does not output timings for every single ping message, as when running at high volume, writing the test
- * log for a vast number of messages would slow the testing down. Instead samples ping latency occasionally. The
- * frequency of ping sampling is set using the {@link #TEST_RESULTS_BATCH_SIZE_PROPNAME} property, to override the
- * default of every {@link #DEFAULT_TEST_RESULTS_BATCH_SIZE}.
- *
- * <p/>The size parameter logged for each individual ping is set to the size of the batch of messages that the
- * individual timed ping was taken from, rather than 1 for a single message. This is so that the total throughput
- * (messages / time) can be calculated in order to examine the relationship between throughput and latency.
- *
- * <p/><table id="crc"><caption>CRC Card</caption> <tr><td> Responsibilities <th> Collaborations <tr><td> Send many ping
- * messages and output timings for sampled individual pings. </table>
- */
-public class PingLatencyTestPerf extends PingTestPerf implements TimingControllerAware
-{
-    private static Logger _logger = Logger.getLogger(PingLatencyTestPerf.class);
-
-    /** Holds the name of the property to get the test results logging batch size. */
-    public static final String TEST_RESULTS_BATCH_SIZE_PROPNAME = "batchSize";
-
-    /** Holds the default test results logging batch size. */
-    public static final int DEFAULT_TEST_RESULTS_BATCH_SIZE = 1000;
-
-    /** Used to hold the timing controller passed from the test runner. */
-    private TimingController _timingController;
-
-    /** Used to generate unique correlation ids for each test run. */
-    private AtomicLong corellationIdGenerator = new AtomicLong();
-
-    /**
-     * Holds test specifics by correlation id. This consists of the expected number of messages and the timing
-     * controler.
-     */
-    private Map<String, PerCorrelationId> perCorrelationIds =
-        Collections.synchronizedMap(new HashMap<String, PerCorrelationId>());
-
-    /** Holds the batched results listener, that does logging on batch boundaries. */
-    private BatchedResultsListener batchedResultsListener = null;
-
-    /**
-     * Creates a new asynchronous ping performance test with the specified name.
-     *
-     * @param name The test name.
-     */
-    public PingLatencyTestPerf(String name)
-    {
-        super(name);
-
-        // Sets up the test parameters with defaults.
-        ParsedProperties.setSysPropertyIfNull(TEST_RESULTS_BATCH_SIZE_PROPNAME,
-            Integer.toString(DEFAULT_TEST_RESULTS_BATCH_SIZE));
-    }
-
-    /** Compile all the tests into a test suite. */
-    public static Test suite()
-    {
-        // Build a new test suite
-        TestSuite suite = new TestSuite("Ping Latency Tests");
-
-        // Run performance tests in read committed mode.
-        suite.addTest(new PingLatencyTestPerf("testPingLatency"));
-
-        return suite;
-    }
-
-    /**
-     * Accepts a timing controller from the test runner.
-     *
-     * @param timingController The timing controller to register mutliple timings with.
-     */
-    public void setTimingController(TimingController timingController)
-    {
-        _timingController = timingController;
-    }
-
-    /**
-     * Gets the timing controller passed in by the test runner.
-     *
-     * @return The timing controller passed in by the test runner.
-     */
-    public TimingController getTimingController()
-    {
-        return _timingController;
-    }
-
-    /**
-     * Sends the specified number of pings, asynchronously outputs timings on every batch boundary, and waits until all
-     * replies have been received or a time out occurs before exiting this method.
-     *
-     * @param numPings The number of pings to send.
-     */
-    public void testPingLatency(int numPings) throws Exception
-    {
-        _logger.debug("public void testPingLatency(int numPings): called");
-
-        // Ensure that at least one ping was requeusted.
-        if (numPings == 0)
-        {
-            _logger.error("Number of pings requested was zero.");
-        }
-
-        // Get the per thread test setup to run the test through.
-        PerThreadSetup perThreadSetup = threadSetup.get();
-        PingClient pingClient = perThreadSetup._pingClient;
-
-        // Advance the correlation id of messages to send, to make it unique for this run.
-        String messageCorrelationId = Long.toString(corellationIdGenerator.incrementAndGet());
-        _logger.debug("messageCorrelationId = " + messageCorrelationId);
-
-        // Initialize the count and timing controller for the new correlation id.
-        PerCorrelationId perCorrelationId = new PerCorrelationId();
-        TimingController tc = getTimingController().getControllerForCurrentThread();
-        perCorrelationId._tc = tc;
-        perCorrelationId._expectedCount = numPings;
-        perCorrelationIds.put(messageCorrelationId, perCorrelationId);
-
-        // Attach the chained message listener to the ping producer to listen asynchronously for the replies to these
-        // messages.
-        pingClient.setChainedMessageListener(batchedResultsListener);
-
-        // Generate a sample message of the specified size.
-        Message msg =
-            pingClient.getTestMessage(perThreadSetup._pingClient.getReplyDestinations().get(0),
-                testParameters.getPropertyAsInteger(PingPongProducer.MESSAGE_SIZE_PROPNAME),
-                testParameters.getPropertyAsBoolean(PingPongProducer.PERSISTENT_MODE_PROPNAME));
-
-        // Send the requested number of messages, and wait until they have all been received.
-        long timeout = Long.parseLong(testParameters.getProperty(PingPongProducer.TIMEOUT_PROPNAME));
-        int numReplies = pingClient.pingAndWaitForReply(msg, numPings, timeout, null);
-
-        // Check that all the replies were received and log a fail if they were not.
-        if (numReplies < numPings)
-        {
-            tc.completeTest(false, 0);
-        }
-
-        // Remove the chained message listener from the ping producer.
-        pingClient.removeChainedMessageListener();
-
-        // Remove the expected count and timing controller for the message correlation id, to ensure they are cleaned up.
-        perCorrelationIds.remove(messageCorrelationId);
-    }
-
-    /** Performs test fixture creation on a per thread basis. This will only be called once for each test thread. */
-    public void threadSetUp()
-    {
-        _logger.debug("public void threadSetUp(): called");
-
-        try
-        {
-            // Call the set up method in the super class. This creates a PingClient pinger.
-            super.threadSetUp();
-
-            // Create the chained message listener, only if it has not already been created.  This is set up with the
-            // batch size property, to tell it what batch size to output results on. A synchronized block is used to
-            // ensure that only one thread creates this.
-            synchronized (this)
-            {
-                if (batchedResultsListener == null)
-                {
-                    int batchSize = Integer.parseInt(testParameters.getProperty(TEST_RESULTS_BATCH_SIZE_PROPNAME));
-                    batchedResultsListener = new BatchedResultsListener(batchSize);
-                }
-            }
-
-            // Get the set up that the super class created.
-            PerThreadSetup perThreadSetup = threadSetup.get();
-
-            // Register the chained message listener on the pinger to do its asynchronous test timings from.
-            perThreadSetup._pingClient.setChainedMessageListener(batchedResultsListener);
-        }
-        catch (Exception e)
-        {
-            _logger.warn("There was an exception during per thread setup.", e);
-        }
-    }
-
-    /**
-     * BatchedResultsListener is a {@link org.apache.qpid.requestreply.PingPongProducer.ChainedMessageListener} that can
-     * be attached to the pinger, in order to receive notifications about every message received and the number
-     * remaining to be received. Whenever the number remaining crosses a batch size boundary this results listener
-     * outputs a test timing for the actual number of messages received in the current batch.
-     */
-    private class BatchedResultsListener implements PingPongProducer.ChainedMessageListener
-    {
-        /** The test results logging batch size. */
-        int _batchSize;
-        private boolean _strictAMQP;
-
-        /**
-         * Creates a results listener on the specified batch size.
-         *
-         * @param batchSize The batch size to use.
-         */
-        public BatchedResultsListener(int batchSize)
-        {
-            _batchSize = batchSize;
-            _strictAMQP =
-                Boolean.parseBoolean(System.getProperties().getProperty(AMQSession.STRICT_AMQP,
-                        AMQSession.STRICT_AMQP_DEFAULT));
-        }
-
-        /**
-         * This callback method is called from all of the pingers that this test creates. It uses the correlation id
-         * from the message to identify the timing controller for the test thread that was responsible for sending those
-         * messages.
-         *
-         * @param message        The message.
-         * @param remainingCount The count of messages remaining to be received with a particular correlation id.
-         *
-         * @throws javax.jms.JMSException Any underlying JMSException is allowed to fall through.
-         */
-        public void onMessage(Message message, int remainingCount, long latency) throws JMSException
-        {
-            _logger.debug("public void onMessage(Message message, int remainingCount = " + remainingCount + "): called");
-
-            // Check if a batch boundary has been crossed.
-            if ((remainingCount % _batchSize) == 0)
-            {
-                // Extract the correlation id from the message.
-                String correlationId = message.getJMSCorrelationID();
-
-                // Get the details for the correlation id and check that they are not null. They can become null
-                // if a test times out.
-                PerCorrelationId perCorrelationId = perCorrelationIds.get(correlationId);
-                if (perCorrelationId != null)
-                {
-                    // Get the timing controller and expected count for this correlation id.
-                    TimingController tc = perCorrelationId._tc;
-                    int expected = perCorrelationId._expectedCount;
-
-                    // Calculate how many messages were actually received in the last batch. This will be the batch size
-                    // except where the number expected is not a multiple of the batch size and this is the first remaining
-                    // count to cross a batch size boundary, in which case it will be the number expected modulo the batch
-                    // size.
-                    int receivedInBatch = ((expected - remainingCount) < _batchSize) ? (expected % _batchSize) : _batchSize;
-
-                    // Register a test result for the correlation id.
-                    try
-                    {
-                        tc.completeTest(true, receivedInBatch, latency);
-                    }
-                    catch (InterruptedException e)
-                    {
-                        // Ignore this. It means the test runner wants to stop as soon as possible.
-                        _logger.warn("Got InterruptedException.", e);
-                    }
-                }
-                // Else ignore, test timed out. Should log a fail here?
-            }
-        }
-    }
-
-    /**
-     * Holds state specific to each correlation id, needed to output test results. This consists of the count of the
-     * total expected number of messages, and the timing controller for the thread sending those message ids.
-     */
-    private static class PerCorrelationId
-    {
-        public int _expectedCount;
-        public TimingController _tc;
-    }
-}
diff --git a/qpid/java/perftests/src/main/java/org/apache/qpid/ping/PingSendOnlyClient.java b/qpid/java/perftests/src/main/java/org/apache/qpid/ping/PingSendOnlyClient.java
deleted file mode 100644
index 150f7c0d52..0000000000
--- a/qpid/java/perftests/src/main/java/org/apache/qpid/ping/PingSendOnlyClient.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*

- *

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- *

- *   http://www.apache.org/licenses/LICENSE-2.0

- *

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- *

- */

-

-package org.apache.qpid.ping;

-

-import java.util.Properties;

-

-import javax.jms.Destination;

-import javax.jms.JMSException;

-import javax.jms.Message;

-

-import org.apache.log4j.Logger;

-

-import org.apache.qpid.client.message.TestMessageFactory;

-import org.apache.qpid.util.CommandLineParser;

-

-/**

- * <p><table id="crc"><caption>CRC Card</caption>

- * <tr><th> Responsibilities <th> Collaborations

- * </table>

- */

-public class PingSendOnlyClient extends PingDurableClient

-{

-    private static final Logger log = Logger.getLogger(PingSendOnlyClient.class);

-

-    public PingSendOnlyClient(Properties overrides) throws Exception

-    {

-        super(overrides);

-    }

-

-    /**

-     * Starts the ping/wait/receive process.

-     *

-     * @param args The command line arguments.

-     */

-    public static void main(String[] args)

-    {

-        try

-        {

-            // Create a ping producer overriding its defaults with all options passed on the command line.

-            Properties options = CommandLineParser.processCommandLine(args, new CommandLineParser(new String[][] {}), System.getProperties());

-            PingSendOnlyClient pingProducer = new PingSendOnlyClient(options);

-

-            // Create a shutdown hook to terminate the ping-pong producer.

-            Runtime.getRuntime().addShutdownHook(pingProducer.getShutdownHook());

-

-            // Ensure that the ping pong producer is registered to listen for exceptions on the connection too.

-            // pingProducer.getConnection().setExceptionListener(pingProducer);

-

-            // Run the test procedure.

-            int sent = pingProducer.send();

-            pingProducer.waitForUser("Press return to close connection and quit.");

-            pingProducer.closeConnection();

-

-            System.exit(0);

-        }

-        catch (Exception e)

-        {

-            System.err.println(e.getMessage());

-            log.error("Top level handler caught execption.", e);

-            System.exit(1);

-        }

-    }

-

-    public Message getTestMessage(Destination replyQueue, int messageSize, boolean persistent) throws JMSException

-    {

-        Message msg = TestMessageFactory.newTextMessage(_producerSession, messageSize);

-

-        // Timestamp the message in nanoseconds.

-        msg.setLongProperty(MESSAGE_TIMESTAMP_PROPNAME, System.nanoTime());

-

-        return msg;

-    }

-}

diff --git a/qpid/java/perftests/src/main/java/org/apache/qpid/ping/PingTestPerf.java b/qpid/java/perftests/src/main/java/org/apache/qpid/ping/PingTestPerf.java
deleted file mode 100644
index 375007584b..0000000000
--- a/qpid/java/perftests/src/main/java/org/apache/qpid/ping/PingTestPerf.java
+++ /dev/null
@@ -1,196 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.ping;
-
-import junit.framework.Assert;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.apache.log4j.Logger;
-
-import org.apache.qpid.requestreply.PingPongProducer;
-
-import uk.co.thebadgerset.junit.extensions.AsymptoticTestCase;
-import uk.co.thebadgerset.junit.extensions.TestThreadAware;
-import uk.co.thebadgerset.junit.extensions.util.ParsedProperties;
-import uk.co.thebadgerset.junit.extensions.util.TestContextProperties;
-
-import javax.jms.*;
-
-/**
- * PingTestPerf is a ping test, that has been written with the intention of being scaled up to run many times
- * simultaneously to simluate many clients/producers/connections.
- *
- * <p/>A single run of the test using the default JUnit test runner will result in the sending and timing of a single
- * full round trip ping. This test may be scaled up using a suitable JUnit test runner.
- *
- * <p/>The setup/teardown cycle establishes a connection to a broker and sets up a queue to send ping messages to and a
- * temporary queue for replies. This setup is only established once for all the test repeats/threads that may be run,
- * except if the connection is lost in which case an attempt to re-establish the setup is made.
- *
- * <p/>The test cycle is: Connects to a queue, creates a temporary queue, creates messages containing a property that
- * is the name of the temporary queue, fires off a message on the original queue and waits for a response on the
- * temporary queue.
- *
- * <p/>Configurable test properties: message size, transacted or not, persistent or not. Broker connection details.
- *
- * <p><table id="crc"><caption>CRC Card</caption>
- * <tr><th> Responsibilities <th> Collaborations
- * </table>
- */
-public class PingTestPerf extends AsymptoticTestCase implements TestThreadAware
-{
-    private static Logger _logger = Logger.getLogger(PingTestPerf.class);
-
-    /** Thread local to hold the per-thread test setup fields. */
-    ThreadLocal<PerThreadSetup> threadSetup = new ThreadLocal<PerThreadSetup>();
-
-    /** Holds a property reader to extract the test parameters from. */
-    protected ParsedProperties testParameters =
-        TestContextProperties.getInstance(PingPongProducer.defaults /*System.getProperties()*/);
-
-    public PingTestPerf(String name)
-    {
-        super(name);
-
-        _logger.debug("testParameters = " + testParameters);
-    }
-
-    /**
-     * Compile all the tests into a test suite.
-     * @return The test method testPingOk.
-     */
-    public static Test suite()
-    {
-        // Build a new test suite
-        TestSuite suite = new TestSuite("Ping Performance Tests");
-
-        // Run performance tests in read committed mode.
-        suite.addTest(new PingTestPerf("testPingOk"));
-
-        return suite;
-    }
-
-    public void testPingOk(int numPings) throws Exception
-    {
-        if (numPings == 0)
-        {
-            Assert.fail("Number of pings requested was zero.");
-        }
-
-        // Get the per thread test setup to run the test through.
-        PerThreadSetup perThreadSetup = threadSetup.get();
-
-        if (perThreadSetup == null)
-        {
-            Assert.fail("Could not get per thread test setup, it was null.");
-        }
-
-        // Generate a sample message. This message is already time stamped and has its reply-to destination set.
-        Message msg =
-            perThreadSetup._pingClient.getTestMessage(perThreadSetup._pingClient.getReplyDestinations().get(0),
-                testParameters.getPropertyAsInteger(PingPongProducer.MESSAGE_SIZE_PROPNAME),
-                testParameters.getPropertyAsBoolean(PingPongProducer.PERSISTENT_MODE_PROPNAME));
-
-        // start the test
-        long timeout = Long.parseLong(testParameters.getProperty(PingPongProducer.TIMEOUT_PROPNAME));
-        int numReplies = perThreadSetup._pingClient.pingAndWaitForReply(msg, numPings, timeout, null);
-
-        // Fail the test if the timeout was exceeded.
-        if (numReplies != perThreadSetup._pingClient.getExpectedNumPings(numPings))
-        {
-            Assert.fail("The ping timed out after " + timeout + " ms. Messages Sent = " + numPings + ", MessagesReceived = "
-                + numReplies);
-        }
-    }
-
-    /**
-     * Performs test fixture creation on a per thread basis. This will only be called once for each test thread.
-     */
-    public void threadSetUp()
-    {
-        _logger.debug("public void threadSetUp(): called");
-
-        try
-        {
-            PerThreadSetup perThreadSetup = new PerThreadSetup();
-
-            // This is synchronized because there is a race condition, which causes one connection to sleep if
-            // all threads try to create connection concurrently.
-            synchronized (this)
-            {
-                // Establish a client to ping a Destination and listen the reply back from same Destination
-                perThreadSetup._pingClient = new PingClient(testParameters);
-                perThreadSetup._pingClient.establishConnection(true, true);
-            }
-            // Start the client connection
-            perThreadSetup._pingClient.start();
-
-            // Attach the per-thread set to the thread.
-            threadSetup.set(perThreadSetup);
-        }
-        catch (Exception e)
-        {
-            _logger.warn("There was an exception during per thread setup.", e);
-        }
-    }
-
-    /**
-     * Performs test fixture clean
-     */
-    public void threadTearDown()
-    {
-        _logger.debug("public void threadTearDown(): called");
-
-        try
-        {
-            // Get the per thread test fixture.
-            PerThreadSetup perThreadSetup = threadSetup.get();
-
-            // Close the pingers so that it cleans up its connection cleanly.
-            synchronized (this)
-            {
-                if ((perThreadSetup != null) && (perThreadSetup._pingClient != null))
-                {
-                    perThreadSetup._pingClient.close();
-                }
-            }
-        }
-        catch (JMSException e)
-        {
-            _logger.warn("There was an exception during per thread tear down.");
-        }
-        finally
-        {
-            // Ensure the per thread fixture is reclaimed.
-            threadSetup.remove();
-        }
-    }
-
-    protected static class PerThreadSetup
-    {
-        /**
-         * Holds the test ping client.
-         */
-        protected PingClient _pingClient;
-        protected String _correlationId;
-    }
-}
diff --git a/qpid/java/perftests/src/main/java/org/apache/qpid/requestreply/InitialContextHelper.java b/qpid/java/perftests/src/main/java/org/apache/qpid/requestreply/InitialContextHelper.java
deleted file mode 100644
index b684fd6b9b..0000000000
--- a/qpid/java/perftests/src/main/java/org/apache/qpid/requestreply/InitialContextHelper.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.qpid.requestreply;
-
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-import java.util.Properties;
-import java.io.InputStream;
-import java.io.IOException;
-
-/**
- *
- *
- */
-public class InitialContextHelper
-{
-
-    public static Context getInitialContext(String propertyFile) throws IOException, NamingException
-    {
-            if ((propertyFile == null) || (propertyFile.length() == 0))
-            {
-                propertyFile = "/perftests.properties";
-            }
-
-            Properties fileProperties = new Properties();
-            ClassLoader cl = Thread.currentThread().getContextClassLoader();
-            // NB: Need to change path to reflect package if moving classes around !
-            InputStream is = cl.getResourceAsStream(propertyFile);
-            if( is != null )
-            {
-            fileProperties.load(is);
-            return new InitialContext(fileProperties);
-            }
-        else
-            {
-                return new InitialContext();
-            }
-    }
-}
diff --git a/qpid/java/perftests/src/main/java/org/apache/qpid/requestreply/PingPongBouncer.java b/qpid/java/perftests/src/main/java/org/apache/qpid/requestreply/PingPongBouncer.java
deleted file mode 100644
index 8bcbdbd369..0000000000
--- a/qpid/java/perftests/src/main/java/org/apache/qpid/requestreply/PingPongBouncer.java
+++ /dev/null
@@ -1,392 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.requestreply;
-
-import java.io.IOException;
-import java.net.InetAddress;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-import javax.jms.*;
-import javax.naming.Context;
-
-import org.apache.log4j.Logger;
-
-/**
- * PingPongBouncer is a message listener the bounces back messages to their reply to destination. This is used to return
- * ping messages generated by {@link org.apache.qpid.requestreply.PingPongProducer} but could be used for other purposes
- * too.
- * <p/>
- * <p/>The correlation id from the received message is extracted, and placed into the reply as the correlation id. Messages
- * are bounced back to their reply-to destination. The original sender of the message has the option to use either a unique
- * temporary queue or the correlation id to correlate the original message to the reply.
- * <p/>
- * <p/>There is a verbose mode flag which causes information about each ping to be output to the console
- * (info level logging, so usually console). This can be helpfull to check the bounce backs are happening but should
- * be disabled for real timing tests as writing to the console will slow things down.
- * <p/>
- * <p><table id="crc"><caption>CRC Card</caption>
- * <tr><th> Responsibilities <th> Collaborations
- * <tr><td> Bounce back messages to their reply to destination.
- * <tr><td> Provide command line invocation to start the bounce back on a configurable broker url.
- * </table>
- *
- * @todo Replace the command line parsing with a neater tool.
- * @todo Make verbose accept a number of messages, only prints to console every X messages.
- */
-public class PingPongBouncer implements MessageListener
-{
-    private static final Logger _logger = Logger.getLogger(PingPongBouncer.class);
-
-    /**
-     * The default prefetch size for the message consumer.
-     */
-    private static final int PREFETCH = 1;
-
-    /**
-     * The default no local flag for the message consumer.
-     */
-    private static final boolean NO_LOCAL = true;
-
-    private static final String DEFAULT_DESTINATION_NAME = "ping";
-
-    /**
-     * The default exclusive flag for the message consumer.
-     */
-    private static final boolean EXCLUSIVE = false;
-
-    /**
-     * A convenient formatter to use when time stamping output.
-     */
-    protected static final SimpleDateFormat timestampFormatter = new SimpleDateFormat("hh:mm:ss:SS");
-
-    /**
-     * Used to indicate that the reply generator should log timing info to the console (logger info level).
-     */
-    private boolean _verbose = false;
-
-    /**
-     * Determines whether this bounce back client bounces back messages persistently.
-     */
-    private boolean _persistent = false;
-
-    private Destination _consumerDestination;
-
-    /**
-     * Keeps track of the response destination of the previous message for the last reply to producer cache.
-     */
-    private Destination _lastResponseDest;
-
-    /**
-     * The producer for sending replies with.
-     */
-    private MessageProducer _replyProducer;
-
-    /**
-     * The consumer controlSession.
-     */
-    private Session _consumerSession;
-
-    /**
-     * The producer controlSession.
-     */
-    private Session _producerSession;
-
-    /**
-     * Holds the connection to the broker.
-     */
-    private Connection _connection;
-
-    /**
-     * Flag used to indicate if this is a point to point or pub/sub ping client.
-     */
-    private boolean _isPubSub = false;
-
-    /**
-     * This flag is used to indicate that the user should be prompted to kill a broker, in order to test
-     * failover, immediately before committing a transaction.
-     */
-    protected boolean _failBeforeCommit = false;
-
-    /**
-     * This flag is used to indicate that the user should be prompted to a kill a broker, in order to test
-     * failover, immediate after committing a transaction.
-     */
-    protected boolean _failAfterCommit = false;
-
-    /**
-     * Creates a PingPongBouncer on the specified producer and consumer sessions.
-     *
-     * @param fileProperties  The path to the file properties
-     * @param factoryName     The factory name
-     * @param username        The broker username.
-     * @param password        The broker password.
-     * @param destinationName The name of the queue to receive pings on
-     *                        (or root of the queue name where many queues are generated).
-     * @param persistent      A flag to indicate that persistent message should be used.
-     * @param transacted      A flag to indicate that pings should be sent within transactions.
-     * @param selector        A message selector to filter received pings with.
-     * @param verbose         A flag to indicate that message timings should be sent to the console.
-     * @throws Exception All underlying exceptions allowed to fall through. This is only test code...
-     */
-    public PingPongBouncer(String fileProperties, String factoryName, String username, String password,
-                           String destinationName, boolean persistent, boolean transacted,
-                           String selector, boolean verbose, boolean pubsub) throws Exception
-    {
-        // Create a client id to uniquely identify this client.
-        InetAddress address = InetAddress.getLocalHost();
-        String clientId = address.getHostName() + System.currentTimeMillis();
-        _verbose = verbose;
-        _persistent = persistent;
-        setPubSub(pubsub);
-        // Connect to the broker.
-        Context context = InitialContextHelper.getInitialContext(fileProperties);
-        ConnectionFactory factory = (ConnectionFactory) context.lookup(factoryName);
-        setConnection(factory.createConnection(username, password));
-
-        // Create a controlSession to listen for messages on and one to send replies on, transactional depending on the
-        // command line option.
-        _consumerSession = (Session) getConnection().createSession(transacted, Session.AUTO_ACKNOWLEDGE);
-        _producerSession = (Session) getConnection().createSession(transacted, Session.AUTO_ACKNOWLEDGE);
-
-        // Create the queue to listen for message on.
-        createConsumerDestination(destinationName);
-        MessageConsumer consumer = _consumerSession.createConsumer(_consumerDestination, selector, NO_LOCAL);
-
-        // Create a producer for the replies, without a default destination.
-        _replyProducer = _producerSession.createProducer(null);
-        _replyProducer.setDisableMessageTimestamp(true);
-        _replyProducer.setDeliveryMode(_persistent ? DeliveryMode.PERSISTENT : DeliveryMode.NON_PERSISTENT);
-
-        // Set this up to listen for messages on the queue.
-        consumer.setMessageListener(this);
-    }
-
-    private static void usage()
-    {
-        System.err.println(
-                "Usage: PingPongBouncer \n" + "-host : broker host\n" + "-port : broker port\n" + "-destinationname : queue/topic name\n" + "-transacted : (true/false). Default is false\n" + "-persistent : (true/false). Default is false\n" + "-pubsub     : (true/false). Default is false\n" + "-selector   : selector string\n");
-    }
-
-    /**
-     * This is a callback method that is notified of all messages for which this has been registered as a message
-     * listener on a message consumer. It sends a reply (pong) to all messages it receieves on the reply to
-     * destination of the message.
-     *
-     * @param message The message that triggered this callback.
-     */
-    public void onMessage(Message message)
-    {
-        try
-        {
-            String messageCorrelationId = message.getJMSCorrelationID();
-            if (_verbose)
-            {
-                _logger.info(timestampFormatter
-                        .format(new Date()) + ": Got ping with correlation id, " + messageCorrelationId);
-            }
-
-            // Get the reply to destination from the message and check it is set.
-            Destination responseDest = message.getJMSReplyTo();
-
-            if (responseDest == null)
-            {
-                _logger.debug("Cannot send reply because reply-to destination is null.");
-
-                return;
-            }
-
-            // Spew out some timing information if verbose mode is on.
-            if (_verbose)
-            {
-                Long timestamp = message.getLongProperty("timestamp");
-
-                if (timestamp != null)
-                {
-                    long diff = System.currentTimeMillis() - timestamp;
-                    _logger.info("Time to bounce point: " + diff);
-                }
-            }
-
-            // Correlate the reply to the original.
-            message.setJMSCorrelationID(messageCorrelationId);
-
-            // Send the receieved message as the pong reply.
-            _replyProducer.send(responseDest, message);
-
-            if (_verbose)
-            {
-                _logger.info(timestampFormatter
-                        .format(new Date()) + ": Sent reply with correlation id, " + messageCorrelationId);
-            }
-
-            // Commit the transaction if running in transactional mode.
-            commitTx(_producerSession);
-        }
-        catch (JMSException e)
-        {
-            _logger.debug("There was a JMSException: " + e.getMessage(), e);
-        }
-    }
-
-    /**
-     * Gets the underlying connection that this ping client is running on.
-     *
-     * @return The underlying connection that this ping client is running on.
-     */
-    public Connection getConnection()
-    {
-        return _connection;
-    }
-
-    /**
-     * Sets the connection that this ping client is using.
-     *
-     * @param connection The ping connection.
-     */
-    public void setConnection(Connection connection)
-    {
-        this._connection = connection;
-    }
-
-    /**
-     * Sets or clears the pub/sub flag to indiciate whether this client is pinging a queue or a topic.
-     *
-     * @param pubsub <tt>true</tt> if this client is pinging a topic, <tt>false</tt> if it is pinging a queue.
-     */
-    public void setPubSub(boolean pubsub)
-    {
-        _isPubSub = pubsub;
-    }
-
-    /**
-     * Checks whether this client is a p2p or pub/sub ping client.
-     *
-     * @return <tt>true</tt> if this client is pinging a topic, <tt>false</tt> if it is pinging a queue.
-     */
-    public boolean isPubSub()
-    {
-        return _isPubSub;
-    }
-
-    /**
-     * Convenience method to commit the transaction on the specified controlSession. If the controlSession to commit on is not
-     * a transactional controlSession, this method does nothing.
-     * <p/>
-     * <p/>If the {@link #_failBeforeCommit} flag is set, this will prompt the user to kill the broker before the
-     * commit is applied. If the {@link #_failAfterCommit} flag is set, this will prompt the user to kill the broker
-     * after the commit is applied.
-     *
-     * @throws javax.jms.JMSException If the commit fails and then the rollback fails.
-     */
-    protected void commitTx(Session session) throws JMSException
-    {
-        if (session.getTransacted())
-        {
-            try
-            {
-                if (_failBeforeCommit)
-                {
-                    _logger.trace("Failing Before Commit");
-                    doFailover();
-                }
-
-                session.commit();
-
-                if (_failAfterCommit)
-                {
-                    _logger.trace("Failing After Commit");
-                    doFailover();
-                }
-
-                _logger.trace("Session Commited.");
-            }
-            catch (JMSException e)
-            {
-                _logger.trace("JMSException on commit:" + e.getMessage(), e);
-
-                try
-                {
-                    session.rollback();
-                    _logger.debug("Message rolled back.");
-                }
-                catch (JMSException jmse)
-                {
-                    _logger.trace("JMSE on rollback:" + jmse.getMessage(), jmse);
-
-                    // Both commit and rollback failed. Throw the rollback exception.
-                    throw jmse;
-                }
-            }
-        }
-    }
-
-    /**
-     * Prompts the user to terminate the named broker, in order to test failover functionality. This method will block
-     * until the user supplied some input on the terminal.
-     *
-     * @param broker The name of the broker to terminate.
-     */
-    protected void doFailover(String broker)
-    {
-        System.out.println("Kill Broker " + broker + " now.");
-        try
-        {
-            System.in.read();
-        }
-        catch (IOException e)
-        {
-        }
-
-        System.out.println("Continuing.");
-    }
-
-    /**
-     * Prompts the user to terminate the broker, in order to test failover functionality. This method will block
-     * until the user supplied some input on the terminal.
-     */
-    protected void doFailover()
-    {
-        System.out.println("Kill Broker now.");
-        try
-        {
-            System.in.read();
-        }
-        catch (IOException e)
-        {
-        }
-
-        System.out.println("Continuing.");
-
-    }
-
-    private void createConsumerDestination(String name) throws JMSException
-    {
-        if (isPubSub())
-        {
-            _consumerDestination = _consumerSession.createTopic(name);
-        }
-        else
-        {
-            _consumerDestination = _consumerSession.createQueue(name);
-        }
-    }
-}
diff --git a/qpid/java/perftests/src/main/java/org/apache/qpid/requestreply/PingPongProducer.java b/qpid/java/perftests/src/main/java/org/apache/qpid/requestreply/PingPongProducer.java
deleted file mode 100644
index da6d6eb7d0..0000000000
--- a/qpid/java/perftests/src/main/java/org/apache/qpid/requestreply/PingPongProducer.java
+++ /dev/null
@@ -1,1717 +0,0 @@
-/*

- *

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- *

- *   http://www.apache.org/licenses/LICENSE-2.0

- *

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- *

- */

-package org.apache.qpid.requestreply;

-

-import org.apache.log4j.Logger;

-import org.apache.log4j.NDC;

-

-import org.apache.qpid.test.framework.TestUtils;

-

-import uk.co.thebadgerset.junit.extensions.BatchedThrottle;

-import uk.co.thebadgerset.junit.extensions.Throttle;

-import uk.co.thebadgerset.junit.extensions.util.CommandLineParser;

-import uk.co.thebadgerset.junit.extensions.util.ParsedProperties;

-

-import javax.jms.*;

-import javax.naming.Context;

-import javax.naming.InitialContext;

-import javax.naming.NamingException;

-

-import java.io.*;

-import java.net.InetAddress;

-import java.text.DateFormat;

-import java.text.SimpleDateFormat;

-import java.util.*;

-import java.util.concurrent.CountDownLatch;

-import java.util.concurrent.SynchronousQueue;

-import java.util.concurrent.TimeUnit;

-import java.util.concurrent.atomic.AtomicInteger;

-import java.util.concurrent.atomic.AtomicLong;

-

-/**

- * PingPongProducer is a client that sends test messages, and waits for replies to these messages. The replies may

- * either be generated by another client (see {@link PingPongBouncer}, or an extension of it may be used that listens

- * to its own messages and does not send replies (see {@link org.apache.qpid.ping.PingClient}). The intention of ping

- * pong producer is that it is a swiss-army knife test client that makes almost every aspect of its behaviour

- * configurable.

- *

- * <p/>The pings are sent with a reply-to field set to a single temporary queue, which is the same for all pings. This

- * means that this class has to do some work to correlate pings with pongs; it expectes the original message correlation

- * id in the ping to be bounced back in the reply correlation id.

- *

- * <p/>This ping tool accepts a vast number of configuration options, all of which are passed in to the constructor. It

- * can ping topics or queues; ping multiple destinations; do persistent pings; send messages of any size; do pings within

- * transactions; control the number of pings to send in each transaction; limit its sending rate; and perform failover

- * testing. A complete list of accepted parameters, default values and comments on their usage is provided here:

- *

- * <p/><table><caption>Parameters</caption>

- * <tr><th> Parameter        <th> Default  <th> Comments

- * <tr><td> messageSize      <td> 0        <td> Message size in bytes. Not including any headers.

- * <tr><td> destinationName  <td> ping     <td> The root name to use to generate destination names to ping.

- * <tr><td> persistent       <td> false    <td> Determines whether peristent delivery is used.

- * <tr><td> transacted       <td> false    <td> Determines whether messages are sent/received in transactions.

- * <tr><td> broker           <td> tcp://localhost:5672 <td> Determines the broker to connect to.

- * <tr><td> virtualHost      <td> test     <td> Determines the virtual host to send all ping over.

- * <tr><td> rate             <td> 0        <td> The maximum rate (in hertz) to send messages at. 0 means no limit.

- * <tr><td> verbose          <td> false    <td> The verbose flag for debugging. Prints to console on every message.

- * <tr><td> pubsub           <td> false    <td> Whether to ping topics or queues. Uses p2p by default.

- * <tr><td> failAfterCommit  <td> false    <td> Whether to prompt user to kill broker after a commit batch.

- * <tr><td> failBeforeCommit <td> false    <td> Whether to prompt user to kill broker before a commit batch.

- * <tr><td> failAfterSend    <td> false    <td> Whether to prompt user to kill broker after a send.

- * <tr><td> failBeforeSend   <td> false    <td> Whether to prompt user to kill broker before a send.

- * <tr><td> failOnce         <td> true     <td> Whether to prompt for failover only once.

- * <tr><td> username         <td> guest    <td> The username to access the broker with.

- * <tr><td> password         <td> guest    <td> The password to access the broker with.

- * <tr><td> selector         <td> null     <td> Not used. Defines a message selector to filter pings with.

- * <tr><td> destinationCount <td> 1        <td> The number of destinations to send pings to.

- * <tr><td> numConsumers     <td> 1        <td> The number of consumers on each destination.

- * <tr><td> timeout          <td> 30000    <td> In milliseconds. The timeout to stop waiting for replies.

- * <tr><td> commitBatchSize  <td> 1        <td> The number of messages per transaction in transactional mode.

- * <tr><td> uniqueDests      <td> true     <td> Whether each receivers only listens to one ping destination or all.

- * <tr><td> durableDests     <td> false    <td> Whether or not durable destinations are used.

- * <tr><td> ackMode          <td> AUTO_ACK <td> The message acknowledgement mode. Possible values are:

- *                                               0 - SESSION_TRANSACTED

- *                                               1 - AUTO_ACKNOWLEDGE

- *                                               2 - CLIENT_ACKNOWLEDGE

- *                                               3 - DUPS_OK_ACKNOWLEDGE

- *                                               257 - NO_ACKNOWLEDGE

- *                                               258 - PRE_ACKNOWLEDGE

- * <tr><td> consTransacted   <td> false    <td> Whether or not consumers use transactions. Defaults to the same value

- *                                              as the 'transacted' option if not seperately defined.

- * <tr><td> consAckMode      <td> AUTO_ACK <td> The message acknowledgement mode for consumers. Defaults to the same

- *                                              value as 'ackMode' if not seperately defined.

- * <tr><td> maxPending       <td> 0        <td> The maximum size in bytes, of messages sent but not yet received.

- *                                              Limits the volume of messages currently buffered on the client

- *                                              or broker. Can help scale test clients by limiting amount of buffered

- *                                              data to avoid out of memory errors.

- * </table>

- *

- * <p/>This implements the Runnable interface with a run method that implements an infinite ping loop. The ping loop

- * does all its work through helper methods, so that code wishing to run a ping-pong cycle is not forced to do so by

- * starting a new thread. The command line invocation does take advantage of this ping loop. A shutdown hook is also

- * registered to terminate the ping-pong loop cleanly.

- *

- * <p/><table id="crc"><caption>CRC Card</caption>

- * <tr><th> Responsibilities <th> Collaborations

- * <tr><td> Provide a ping and wait for all responses cycle.

- * <tr><td> Provide command line invocation to loop the ping cycle on a configurable broker url.

- * </table>

- *

- * @todo Use read/write lock in the onmessage, not for reading writing but to make use of a shared and exlcusive lock pair.

- *       Obtain read lock on all messages, before decrementing the message count. At the end of the on message method add a

- *       block that obtains the write lock for the very last message, releases any waiting producer. Means that the last

- *       message waits until all other messages have been handled before releasing producers but allows messages to be

- *       processed concurrently, unlike the current synchronized block.

- */

-public class PingPongProducer implements Runnable, ExceptionListener

-{

-    /** Used for debugging. */

-    private static final Logger log = Logger.getLogger(PingPongProducer.class);

-

-    /** Holds the name of the property to determine whether of not client id is overridden at connection time.  */

-    public static final String OVERRIDE_CLIENT_ID_PROPNAME = "overrideClientId";

-

-    /** Holds the default value of the override client id flag. */

-    public static final String OVERRIDE_CLIENT_ID_DEAFULT = "false";

-

-    /** Holds the name of the property to define the JNDI factory name with. */

-    public static final String FACTORY_NAME_PROPNAME = "factoryName";

-

-    /** Holds the default JNDI name of the connection factory. */

-    public static final String FACTORY_NAME_DEAFULT = "local";

-

-    /** Holds the name of the property to set the JNDI initial context properties with. */

-    public static final String FILE_PROPERTIES_PROPNAME = "properties";

-

-    /** Holds the default file name of the JNDI initial context properties. */

-    public static final String FILE_PROPERTIES_DEAFULT = "perftests.properties";

-

-    /** Holds the name of the property to get the test message size from. */

-    public static final String MESSAGE_SIZE_PROPNAME = "messageSize";

-

-    /** Used to set up a default message size. */

-    public static final int MESSAGE_SIZE_DEAFULT = 0;

-

-    /** Holds the name of the property to get the ping queue name from. */

-    public static final String PING_QUEUE_NAME_PROPNAME = "destinationName";

-

-    /** Holds the name of the default destination to send pings on. */

-    public static final String PING_QUEUE_NAME_DEFAULT = "ping";

-

-    /** Holds the name of the property to get the queue name postfix from. */

-    public static final String QUEUE_NAME_POSTFIX_PROPNAME = "queueNamePostfix";

-

-    /** Holds the default queue name postfix value. */

-    public static final String QUEUE_NAME_POSTFIX_DEFAULT = "";

-

-    /** Holds the name of the property to get the test delivery mode from. */

-    public static final String PERSISTENT_MODE_PROPNAME = "persistent";

-

-    /** Holds the message delivery mode to use for the test. */

-    public static final boolean PERSISTENT_MODE_DEFAULT = false;

-

-    /** Holds the name of the property to get the test transactional mode from. */

-    public static final String TRANSACTED_PROPNAME = "transacted";

-

-    /** Holds the transactional mode to use for the test. */

-    public static final boolean TRANSACTED_DEFAULT = false;

-

-    /** Holds the name of the property to get the test consumer transacted mode from. */

-    public static final String CONSUMER_TRANSACTED_PROPNAME = "consTransacted";

-

-    /** Holds the consumer transactional mode default setting. */

-    public static final boolean CONSUMER_TRANSACTED_DEFAULT = false;

-

-    /** Holds the name of the property to get the test broker url from. */

-    public static final String BROKER_PROPNAME = "broker";

-

-    /** Holds the default broker url for the test. */

-    public static final String BROKER_DEFAULT = "tcp://localhost:5672";

-

-    /** Holds the name of the property to get the test broker virtual path. */

-    public static final String VIRTUAL_HOST_PROPNAME = "virtualHost";

-

-    /** Holds the default virtual path for the test. */

-    public static final String VIRTUAL_HOST_DEFAULT = "";

-

-    /** Holds the name of the property to get the message rate from. */

-    public static final String RATE_PROPNAME = "rate";

-

-    /** Defines the default rate (in pings per second) to send pings at. 0 means as fast as possible, no restriction. */

-    public static final int RATE_DEFAULT = 0;

-

-    /** Holds the name of the property to get the verbose mode proeprty from. */

-    public static final String VERBOSE_PROPNAME = "verbose";

-

-    /** Holds the default verbose mode. */

-    public static final boolean VERBOSE_DEFAULT = false;

-

-    /** Holds the name of the property to get the p2p or pub/sub messaging mode from. */

-    public static final String PUBSUB_PROPNAME = "pubsub";

-

-    /** Holds the pub/sub mode default, true means ping a topic, false means ping a queue. */

-    public static final boolean PUBSUB_DEFAULT = false;

-

-    /** Holds the name of the property to get the fail after commit flag from. */

-    public static final String FAIL_AFTER_COMMIT_PROPNAME = "failAfterCommit";

-

-    /** Holds the default failover after commit test flag. */

-    public static final boolean FAIL_AFTER_COMMIT_DEFAULT = false;

-

-    /** Holds the name of the proeprty to get the fail before commit flag from. */

-    public static final String FAIL_BEFORE_COMMIT_PROPNAME = "failBeforeCommit";

-

-    /** Holds the default failover before commit test flag. */

-    public static final boolean FAIL_BEFORE_COMMIT_DEFAULT = false;

-

-    /** Holds the name of the proeprty to get the fail after send flag from. */

-    public static final String FAIL_AFTER_SEND_PROPNAME = "failAfterSend";

-

-    /** Holds the default failover after send test flag. */

-    public static final boolean FAIL_AFTER_SEND_DEFAULT = false;

-

-    /** Holds the name of the property to get the fail before send flag from. */

-    public static final String FAIL_BEFORE_SEND_PROPNAME = "failBeforeSend";

-

-    /** Holds the default failover before send test flag. */

-    public static final boolean FAIL_BEFORE_SEND_DEFAULT = false;

-

-    /** Holds the name of the property to get the fail once flag from. */

-    public static final String FAIL_ONCE_PROPNAME = "failOnce";

-

-    /** The default failover once flag, true means only do one failover, false means failover on every commit cycle. */

-    public static final boolean FAIL_ONCE_DEFAULT = true;

-

-    /** Holds the name of the property to get the broker access username from. */

-    public static final String USERNAME_PROPNAME = "username";

-

-    /** Holds the default broker log on username. */

-    public static final String USERNAME_DEFAULT = "guest";

-

-    /** Holds the name of the property to get the broker access password from. */

-    public static final String PASSWORD_PROPNAME = "password";

-

-    /** Holds the default broker log on password. */

-    public static final String PASSWORD_DEFAULT = "guest";

-

-    /** Holds the name of the proeprty to get the. */

-    public static final String SELECTOR_PROPNAME = "selector";

-

-    /** Holds the default message selector. */

-    public static final String SELECTOR_DEFAULT = "";

-

-    /** Holds the name of the property to get the destination count from. */

-    public static final String DESTINATION_COUNT_PROPNAME = "destinationCount";

-

-    /** Defines the default number of destinations to ping. */

-    public static final int DESTINATION_COUNT_DEFAULT = 1;

-

-    /** Holds the name of the property to get the number of consumers per destination from. */

-    public static final String NUM_CONSUMERS_PROPNAME = "numConsumers";

-

-    /** Defines the default number consumers per destination. */

-    public static final int NUM_CONSUMERS_DEFAULT = 1;

-

-    /** Holds the name of the property to get the waiting timeout for response messages. */

-    public static final String TIMEOUT_PROPNAME = "timeout";

-

-    /** Default time to wait before assuming that a ping has timed out. */

-    public static final long TIMEOUT_DEFAULT = 30000;

-

-    /** Holds the name of the property to get the commit batch size from. */

-    public static final String TX_BATCH_SIZE_PROPNAME = "commitBatchSize";

-

-    /** Defines the default number of pings to send in each transaction when running transactionally. */

-    public static final int TX_BATCH_SIZE_DEFAULT = 1;

-

-    /** Holds the name of the property to get the unique destinations flag from. */

-    public static final String UNIQUE_DESTS_PROPNAME = "uniqueDests";

-

-    /** Defines the default value for the unique destinations property. */

-    public static final boolean UNIQUE_DESTS_DEFAULT = true;

-

-    /** Holds the name of the property to get the durable destinations flag from. */

-    public static final String DURABLE_DESTS_PROPNAME = "durableDests";

-

-    /** Defines the default value of the durable destinations flag. */

-    public static final boolean DURABLE_DESTS_DEFAULT = false;

-

-    /** Holds the name of the proeprty to get the message acknowledgement mode from. */

-    public static final String ACK_MODE_PROPNAME = "ackMode";

-

-    /** Defines the default message acknowledgement mode. */

-    public static final int ACK_MODE_DEFAULT = Session.AUTO_ACKNOWLEDGE;

-

-    /** Holds the name of the property to get the consumers message acknowledgement mode from. */

-    public static final String CONSUMER_ACK_MODE_PROPNAME = "consAckMode";

-

-    /** Defines the default consumers message acknowledgement mode. */

-    public static final int CONSUMER_ACK_MODE_DEFAULT = Session.AUTO_ACKNOWLEDGE;

-

-    /** Holds the name of the property to get the maximum pending message size setting from. */

-    public static final String MAX_PENDING_PROPNAME = "maxPending";

-

-    /** Defines the default value for the maximum pending message size setting. 0 means no limit. */

-    public static final int MAX_PENDING_DEFAULT = 0;

-

-    /** Defines the default prefetch size to use when consuming messages. */

-    public static final int PREFETCH_DEFAULT = 100;

-

-    /** Defines the default value of the no local flag to use when consuming messages. */

-    public static final boolean NO_LOCAL_DEFAULT = false;

-

-    /** Defines the default value of the exclusive flag to use when consuming messages. */

-    public static final boolean EXCLUSIVE_DEFAULT = false;

-

-    /** Holds the name of the property to store nanosecond timestamps in ping messages with. */

-    public static final String MESSAGE_TIMESTAMP_PROPNAME = "timestamp";

-

-    /** Holds the default configuration properties. */

-    public static ParsedProperties defaults = new ParsedProperties();

-

-    static

-    {

-        defaults.setPropertyIfNull(OVERRIDE_CLIENT_ID_PROPNAME, OVERRIDE_CLIENT_ID_DEAFULT);

-        defaults.setPropertyIfNull(FILE_PROPERTIES_PROPNAME, FILE_PROPERTIES_DEAFULT);

-        defaults.setPropertyIfNull(FACTORY_NAME_PROPNAME, FACTORY_NAME_DEAFULT);

-        defaults.setPropertyIfNull(BROKER_PROPNAME, BROKER_DEFAULT);

-        defaults.setPropertyIfNull(USERNAME_PROPNAME, USERNAME_DEFAULT);

-        defaults.setPropertyIfNull(PASSWORD_PROPNAME, PASSWORD_DEFAULT);

-        defaults.setPropertyIfNull(VIRTUAL_HOST_PROPNAME, VIRTUAL_HOST_DEFAULT);

-        defaults.setPropertyIfNull(PING_QUEUE_NAME_PROPNAME, PING_QUEUE_NAME_DEFAULT);

-        defaults.setPropertyIfNull(QUEUE_NAME_POSTFIX_PROPNAME, QUEUE_NAME_POSTFIX_DEFAULT);

-        defaults.setPropertyIfNull(SELECTOR_PROPNAME, SELECTOR_DEFAULT);

-        defaults.setPropertyIfNull(TRANSACTED_PROPNAME, TRANSACTED_DEFAULT);

-        defaults.setPropertyIfNull(CONSUMER_TRANSACTED_PROPNAME, CONSUMER_TRANSACTED_DEFAULT);

-        defaults.setPropertyIfNull(PERSISTENT_MODE_PROPNAME, PERSISTENT_MODE_DEFAULT);

-        defaults.setPropertyIfNull(ACK_MODE_PROPNAME, ACK_MODE_DEFAULT);

-        defaults.setPropertyIfNull(CONSUMER_ACK_MODE_PROPNAME, CONSUMER_ACK_MODE_DEFAULT);

-        defaults.setPropertyIfNull(MESSAGE_SIZE_PROPNAME, MESSAGE_SIZE_DEAFULT);

-        defaults.setPropertyIfNull(VERBOSE_PROPNAME, VERBOSE_DEFAULT);

-        defaults.setPropertyIfNull(PUBSUB_PROPNAME, PUBSUB_DEFAULT);

-        defaults.setPropertyIfNull(UNIQUE_DESTS_PROPNAME, UNIQUE_DESTS_DEFAULT);

-        defaults.setPropertyIfNull(DURABLE_DESTS_PROPNAME, DURABLE_DESTS_DEFAULT);

-        defaults.setPropertyIfNull(FAIL_BEFORE_COMMIT_PROPNAME, FAIL_BEFORE_COMMIT_DEFAULT);

-        defaults.setPropertyIfNull(FAIL_AFTER_COMMIT_PROPNAME, FAIL_AFTER_COMMIT_DEFAULT);

-        defaults.setPropertyIfNull(FAIL_BEFORE_SEND_PROPNAME, FAIL_BEFORE_SEND_DEFAULT);

-        defaults.setPropertyIfNull(FAIL_AFTER_SEND_PROPNAME, FAIL_AFTER_SEND_DEFAULT);

-        defaults.setPropertyIfNull(FAIL_ONCE_PROPNAME, FAIL_ONCE_DEFAULT);

-        defaults.setPropertyIfNull(TX_BATCH_SIZE_PROPNAME, TX_BATCH_SIZE_DEFAULT);

-        defaults.setPropertyIfNull(DESTINATION_COUNT_PROPNAME, DESTINATION_COUNT_DEFAULT);

-        defaults.setPropertyIfNull(NUM_CONSUMERS_PROPNAME, NUM_CONSUMERS_DEFAULT);

-        defaults.setPropertyIfNull(RATE_PROPNAME, RATE_DEFAULT);

-        defaults.setPropertyIfNull(TIMEOUT_PROPNAME, TIMEOUT_DEFAULT);

-        defaults.setPropertyIfNull(MAX_PENDING_PROPNAME, MAX_PENDING_DEFAULT);

-    }

-

-    /** Allows setting of client ID on the connection, rather than through the connection URL. */

-    protected boolean _overrideClientId;

-

-    /** Holds the JNDI name of the JMS connection factory. */

-    protected String _factoryName;

-

-    /** Holds the name of the properties file to configure JNDI with. */

-    protected String _fileProperties;

-

-    /** Holds the broker url. */

-    protected String _brokerDetails;

-

-    /** Holds the username to access the broker with. */

-    protected String _username;

-

-    /** Holds the password to access the broker with. */

-    protected String _password;

-

-    /** Holds the virtual host on the broker to run the tests through. */

-    protected String _virtualpath;

-

-    /** Holds the root name from which to generate test destination names. */

-    protected String _destinationName;

-

-    /** Holds the default queue name postfix value. */

-    protected String _queueNamePostfix;

-

-    /** Holds the message selector to filter the pings with. */

-    protected String _selector;

-

-    /** Holds the producers transactional mode flag. */

-    protected boolean _transacted;

-

-    /** Holds the consumers transactional mode flag. */

-    protected boolean _consTransacted;

-

-    /** Determines whether this producer sends persistent messages. */

-    protected boolean _persistent;

-

-    /** Holds the acknowledgement mode used for the producers. */

-    protected int _ackMode;

-

-    /** Holds the acknowledgement mode setting for the consumers. */

-    protected int _consAckMode;

-

-    /** Determines what size of messages this producer sends. */

-    protected int _messageSize;

-

-    /** Used to indicate that the ping loop should print out whenever it pings. */

-    protected boolean _verbose;

-

-    /** Flag used to indicate if this is a point to point or pub/sub ping client. */

-    protected boolean _isPubSub;

-

-    /** Flag used to indicate if the destinations should be unique client. */

-    protected boolean _isUnique;

-

-    /** Flag used to indicate that durable destination should be used. */

-    protected boolean _isDurable;

-

-    /** Flag used to indicate that the user should be prompted to terminate a broker, to test failover before a commit. */

-    protected boolean _failBeforeCommit;

-

-    /** Flag used to indicate that the user should be prompted to terminate a broker, to test failover after a commit. */

-    protected boolean _failAfterCommit;

-

-    /** Flag used to indicate that the user should be prompted to terminate a broker, to test failover before a send. */

-    protected boolean _failBeforeSend;

-

-    /** Flag used to indicate that the user should be prompted to terminate a broker, to test failover after a send. */

-    protected boolean _failAfterSend;

-

-    /** Flag used to indicate that failover prompting should only be done on the first commit, not on every commit. */

-    protected boolean _failOnce;

-

-    /** Holds the number of sends that should be performed in every transaction when using transactions. */

-    protected int _txBatchSize;

-

-    /** Holds the number of destinations to ping. */

-    protected int _noOfDestinations;

-

-    /** Holds the number of consumers per destination. */

-    protected int _noOfConsumers;

-

-    /** Holds the maximum send rate in herz. */

-    protected int _rate;

-

-    /**

-     * Holds the size of the maximum amount of pending data that the client should buffer, sending is suspended

-     * if this limit is breached.

-     */

-    protected int _maxPendingSize;

-

-    /** A source for providing sequential unique correlation ids. These will be unique within the same JVM. */

-    private static AtomicLong _correlationIdGenerator = new AtomicLong(0L);

-

-    /** A source for providing sequential unqiue ids for instances of this class to be identifed with. */

-    private static AtomicInteger _instanceIdGenerator = new AtomicInteger(0);

-

-    /** Holds this instances unique id. */

-    private int instanceId;

-

-    /**

-     * Holds a map from message ids to latches on which threads wait for replies. This map is shared accross multiple

-     * ping producers on the same JVM.

-     */

-    private static Map<String, PerCorrelationId> perCorrelationIds =

-        Collections.synchronizedMap(new HashMap<String, PerCorrelationId>());

-

-    /** A convenient formatter to use when time stamping output. */

-    protected static final DateFormat timestampFormatter = new SimpleDateFormat("hh:mm:ss:SS");

-

-    /** Holds the connection for the message producer. */

-    protected Connection _connection;

-

-    /** Holds the consumer connections. */

-    protected Connection[] _consumerConnection;

-

-    /** Holds the controlSession on which ping replies are received. */

-    protected Session[] _consumerSession;

-

-    /** Holds the producer controlSession, needed to create ping messages. */

-    protected Session _producerSession;

-

-    /** Holds the destination where the response messages will arrive. */

-    protected Destination _replyDestination;

-

-    /** Holds the set of destinations that this ping producer pings. */

-    protected List<Destination> _pingDestinations;

-

-    /** Used to restrict the sending rate to a specified limit. */

-    protected Throttle _rateLimiter;

-

-    /** Holds a message listener that this message listener chains all its messages to. */

-    protected ChainedMessageListener _chainedMessageListener = null;

-

-    /**

-     * This id generator is used to generate ids to append to the queue name to ensure that queues can be unique when

-     * creating multiple ping producers in the same JVM.

-     */

-    protected static AtomicInteger _queueJVMSequenceID = new AtomicInteger();

-

-    /**

-     * This id generator is used to generates ids that are only unique within this pinger. Creating multiple pingers

-     * on the same JVM using this id generator will allow them to ping on the same queues.

-     */

-    protected AtomicInteger _queueSharedID = new AtomicInteger();

-

-    /** Used to tell the ping loop when to terminate, it only runs while this is true. */

-    protected boolean _publish = true;

-

-    /** Holds the message producer to send the pings through. */

-    protected MessageProducer _producer;

-

-    /** Holds the message consumer to receive the ping replies through. */

-    protected MessageConsumer[] _consumer;

-

-    /** The prompt to display when asking the user to kill the broker for failover testing. */

-    private static final String KILL_BROKER_PROMPT = "Kill broker now, then press Return.";

-

-    /** Holds the name for this test client to be identified to the broker with. */

-    private String _clientID;

-

-    /** Keeps count of the total messages sent purely for debugging purposes. */

-    private static AtomicInteger numSent = new AtomicInteger();

-

-    /**

-     * Holds a monitor which is used to synchronize sender and receivers threads, where the sender has elected

-     * to wait until the number of unreceived message is reduced before continuing to send. This monitor is a

-     * fair SynchronousQueue becuase that provides fair scheduling, to ensure that all producer threads get an

-     * equal chance to produce messages.

-     */

-    static final SynchronousQueue _sendPauseMonitor = new SynchronousQueue(true);

-

-    /** Keeps a count of the number of message currently sent but not received. */

-    static AtomicInteger _unreceived = new AtomicInteger(0);

-

-    /**

-     * Creates a ping producer with the specified parameters, of which there are many. See the class level comments

-     * for details. This constructor creates a connection to the broker and creates producer and consumer sessions on

-     * it, to send and recieve its pings and replies on.

-     *

-     * @param overrides Properties containing any desired overrides to the defaults.

-     *

-     * @throws Exception Any exceptions are allowed to fall through.

-     */

-    public PingPongProducer(Properties overrides) throws Exception

-    {

-        // log.debug("public PingPongProducer(Properties overrides = " + overrides + "): called");

-        instanceId = _instanceIdGenerator.getAndIncrement();

-

-        // Create a set of parsed properties from the defaults overriden by the passed in values.

-        ParsedProperties properties = new ParsedProperties(defaults);

-        properties.putAll(overrides);

-

-        // Extract the configuration properties to set the pinger up with.

-        _overrideClientId = properties.getPropertyAsBoolean(OVERRIDE_CLIENT_ID_PROPNAME);

-        _factoryName = properties.getProperty(FACTORY_NAME_PROPNAME);

-        _fileProperties = properties.getProperty(FILE_PROPERTIES_PROPNAME);

-        _brokerDetails = properties.getProperty(BROKER_PROPNAME);

-        _username = properties.getProperty(USERNAME_PROPNAME);

-        _password = properties.getProperty(PASSWORD_PROPNAME);

-        _virtualpath = properties.getProperty(VIRTUAL_HOST_PROPNAME);

-        _destinationName = properties.getProperty(PING_QUEUE_NAME_PROPNAME);

-        _queueNamePostfix = properties.getProperty(QUEUE_NAME_POSTFIX_PROPNAME);

-        _selector = properties.getProperty(SELECTOR_PROPNAME);

-        _transacted = properties.getPropertyAsBoolean(TRANSACTED_PROPNAME);

-        _consTransacted = properties.getPropertyAsBoolean(CONSUMER_TRANSACTED_PROPNAME);

-        _persistent = properties.getPropertyAsBoolean(PERSISTENT_MODE_PROPNAME);

-        _messageSize = properties.getPropertyAsInteger(MESSAGE_SIZE_PROPNAME);

-        _verbose = properties.getPropertyAsBoolean(VERBOSE_PROPNAME);

-        _failAfterCommit = properties.getPropertyAsBoolean(FAIL_AFTER_COMMIT_PROPNAME);

-        _failBeforeCommit = properties.getPropertyAsBoolean(FAIL_BEFORE_COMMIT_PROPNAME);

-        _failAfterSend = properties.getPropertyAsBoolean(FAIL_AFTER_SEND_PROPNAME);

-        _failBeforeSend = properties.getPropertyAsBoolean(FAIL_BEFORE_SEND_PROPNAME);

-        _failOnce = properties.getPropertyAsBoolean(FAIL_ONCE_PROPNAME);

-        _txBatchSize = properties.getPropertyAsInteger(TX_BATCH_SIZE_PROPNAME);

-        _noOfDestinations = properties.getPropertyAsInteger(DESTINATION_COUNT_PROPNAME);

-        _noOfConsumers = properties.getPropertyAsInteger(NUM_CONSUMERS_PROPNAME);

-        _rate = properties.getPropertyAsInteger(RATE_PROPNAME);

-        _isPubSub = properties.getPropertyAsBoolean(PUBSUB_PROPNAME);

-        _isUnique = properties.getPropertyAsBoolean(UNIQUE_DESTS_PROPNAME);

-        _isDurable = properties.getPropertyAsBoolean(DURABLE_DESTS_PROPNAME);

-        _ackMode = _transacted ? 0 : properties.getPropertyAsInteger(ACK_MODE_PROPNAME);

-        _consAckMode = _consTransacted ? 0 : properties.getPropertyAsInteger(CONSUMER_ACK_MODE_PROPNAME);

-        _maxPendingSize = properties.getPropertyAsInteger(MAX_PENDING_PROPNAME);

-

-        // Check that one or more destinations were specified.

-        if (_noOfDestinations < 1)

-        {

-            throw new IllegalArgumentException("There must be at least one destination.");

-        }

-

-        // Set up a throttle to control the send rate, if a rate > 0 is specified.

-        if (_rate > 0)

-        {

-            _rateLimiter = new BatchedThrottle();

-            _rateLimiter.setRate(_rate);

-        }

-

-        // Create the connection and message producers/consumers.

-        // establishConnection(true, true);

-    }

-

-    /**

-     * Establishes a connection to the broker and creates message consumers and producers based on the parameters

-     * that this ping client was created with.

-     *

-     * @param producer Flag to indicate whether or not the producer should be set up.

-     * @param consumer Flag to indicate whether or not the consumers should be set up.

-     *

-     * @throws Exception Any exceptions are allowed to fall through.

-     */

-    public void establishConnection(boolean producer, boolean consumer) throws Exception

-    {

-        // log.debug("public void establishConnection(): called");

-

-        // Generate a unique identifying name for this client, based on it ip address and the current time.

-        InetAddress address = InetAddress.getLocalHost();

-        // _clientID = address.getHostName() + System.currentTimeMillis();

-        _clientID = "perftest_" + instanceId;

-

-        // Create a connection to the broker.

-        createConnection(_clientID);

-

-        // Create transactional or non-transactional sessions, based on the command line arguments.

-        _producerSession = _connection.createSession(_transacted, _ackMode);

-

-        _consumerSession = new Session[_noOfConsumers];

-

-        for (int i = 0; i < _noOfConsumers; i++)

-        {

-            _consumerSession[i] = _consumerConnection[i].createSession(_consTransacted, _consAckMode);

-        }

-

-        // Create the destinations to send pings to and receive replies from.

-        _replyDestination = _consumerSession[0].createTemporaryQueue();

-        createPingDestinations(_noOfDestinations, _selector, _destinationName, _isUnique, _isDurable);

-

-        // Create the message producer only if instructed to.

-        if (producer)

-        {

-            createProducer();

-        }

-

-        // Create the message consumer only if instructed to.

-        if (consumer)

-        {

-            createReplyConsumers(getReplyDestinations(), _selector);

-        }

-    }

-

-    /**

-     * Establishes a connection to the broker, based on the configuration parameters that this ping client was

-     * created with.

-     *

-     * @param clientID The clients identifier.

-     *

-     * @throws JMSException Underlying exceptions allowed to fall through.

-     * @throws NamingException Underlying exceptions allowed to fall through.

-     * @throws IOException Underlying exceptions allowed to fall through.

-     */

-    protected void createConnection(String clientID) throws JMSException, NamingException, IOException

-    {

-        // _log.debug("protected void createConnection(String clientID = " + clientID + "): called");

-

-        // _log.debug("Creating a connection for the message producer.");

-      

-

-        Context context = InitialContextHelper.getInitialContext(_fileProperties);

-        ConnectionFactory factory = (ConnectionFactory) context.lookup(_factoryName);

-        _connection = factory.createConnection(_username, _password);

-

-        if (_overrideClientId)

-        {

-            _connection.setClientID(clientID);

-        }

-

-        // _log.debug("Creating " + _noOfConsumers + " connections for the consumers.");

-

-        _consumerConnection = new Connection[_noOfConsumers];

-

-        for (int i = 0; i < _noOfConsumers; i++)

-        {

-            _consumerConnection[i] = factory.createConnection(_username, _password);

-            // _consumerConnection[i].setClientID(clientID);

-        }

-    }

-

-    /**

-     * Starts a ping-pong loop running from the command line. The bounce back client {@link PingPongBouncer} also needs

-     * to be started to bounce the pings back again.

-     *

-     * @param args The command line arguments.

-     */

-    public static void main(String[] args)

-    {

-        try

-        {

-            Properties options =

-                CommandLineParser.processCommandLine(args, new CommandLineParser(new String[][] {}), System.getProperties());

-

-            // Create a ping producer overriding its defaults with all options passed on the command line.

-            PingPongProducer pingProducer = new PingPongProducer(options);

-            pingProducer.establishConnection(true, true);

-

-            // Start the ping producers dispatch thread running.

-            pingProducer._connection.start();

-

-            // Create a shutdown hook to terminate the ping-pong producer.

-            Runtime.getRuntime().addShutdownHook(pingProducer.getShutdownHook());

-

-            // Ensure that the ping pong producer is registered to listen for exceptions on the connection too.

-            pingProducer._connection.setExceptionListener(pingProducer);

-

-            // Create the ping loop thread and run it until it is terminated by the shutdown hook or exception.

-            Thread pingThread = new Thread(pingProducer);

-            pingThread.run();

-            pingThread.join();

-        }

-        catch (Exception e)

-        {

-            System.err.println(e.getMessage());

-            log.error("Top level handler caught execption.", e);

-            System.exit(1);

-        }

-    }

-

-    /**

-     * Convenience method for a short pause.

-     *

-     * @param sleepTime The time in milliseconds to pause for.

-     */

-    public static void pause(long sleepTime)

-    {

-        if (sleepTime > 0)

-        {

-            try

-            {

-                Thread.sleep(sleepTime);

-            }

-            catch (InterruptedException ie)

-            { }

-        }

-    }

-

-    /**

-     * Gets all the reply destinations (to listen for replies on). In this case this will just be the single reply to

-     * destination of this pinger.

-     *

-     * @return The single reply to destination of this pinger, wrapped in a list.

-     */

-    public List<Destination> getReplyDestinations()

-    {

-        // log.debug("public List<Destination> getReplyDestinations(): called");

-

-        List<Destination> replyDestinations = new ArrayList<Destination>();

-        replyDestinations.add(_replyDestination);

-

-        // log.debug("replyDestinations = " + replyDestinations);

-

-        return replyDestinations;

-    }

-

-    /**

-     * Creates the producer to send the pings on. This is created without a default destination. Its persistent delivery

-     * flag is set accoring the ping producer creation options.

-     *

-     * @throws JMSException Any JMSExceptions are allowed to fall through.

-     */

-    public void createProducer() throws JMSException

-    {

-        // log.debug("public void createProducer(): called");

-

-        _producer = (MessageProducer) _producerSession.createProducer(null);

-        _producer.setDeliveryMode(_persistent ? DeliveryMode.PERSISTENT : DeliveryMode.NON_PERSISTENT);

-

-        // log.debug("Created producer for " + (_persistent ? "persistent" : "non-persistent") + " messages.");

-    }

-

-    /**

-     * Creates consumers for the specified number of destinations. The destinations themselves are also created by this

-     * method.

-     *

-     * @param noOfDestinations The number of destinations to create consumers for.

-     * @param selector         The message selector to filter the consumers with.

-     * @param rootName         The root of the name, or actual name if only one is being created.

-     * @param unique           <tt>true</tt> to make the destinations unique to this pinger, <tt>false</tt> to share the

-     *                         numbering with all pingers on the same JVM.

-     * @param durable          If the destinations are durable topics.

-     *

-     * @throws JMSException Any JMSExceptions are allowed to fall through.

-     */

-    public void createPingDestinations(int noOfDestinations, String selector, String rootName, boolean unique,

-        boolean durable) throws JMSException

-    {

-        /*log.debug("public void createPingDestinations(int noOfDestinations = " + noOfDestinations + ", String selector = "

-            + selector + ", String rootName = " + rootName + ", boolean unique = " + unique + ", boolean durable = "

-            + durable + "): called");*/

-

-        _pingDestinations = new ArrayList<Destination>();

-

-        // Create the desired number of ping destinations and consumers for them.

-        // log.debug("Creating " + noOfDestinations + " destinations to ping.");

-

-        for (int i = 0; i < noOfDestinations; i++)

-        {

-            Destination destination;

-            String id;

-

-            // Generate an id, unique within this pinger or to the whole JVM depending on the unique flag.

-            if (unique)

-            {

-                // log.debug("Creating unique destinations.");

-                id = "_" + _queueJVMSequenceID.incrementAndGet() + "_" + _connection.getClientID();

-            }

-            else

-            {

-                // log.debug("Creating shared destinations.");

-                id = "_" + _queueSharedID.incrementAndGet();

-            }

-

-            // Check if this is a pub/sub pinger, in which case create topics.

-            if (_isPubSub)

-            {

-                destination = _producerSession.createTopic(rootName + id);

-                // log.debug("Created non-durable topic " + destination);

-

-                if (durable)

-                {

-                    _producerSession.createDurableSubscriber((Topic) destination, _connection.getClientID());

-                }

-            }

-            // Otherwise this is a p2p pinger, in which case create queues.

-            else

-            {

-                destination = _producerSession.createQueue(rootName + id + _queueNamePostfix);

-                // log.debug("Created queue " + destination);

-            }

-

-            // Keep the destination.

-            _pingDestinations.add(destination);

-        }

-    }

-

-    /**

-     * Creates consumers for the specified destinations and registers this pinger to listen to their messages.

-     *

-     * @param destinations The destinations to listen to.

-     * @param selector     A selector to filter the messages with.

-     *

-     * @throws javax.jms.JMSException Any JMSExceptions are allowed to fall through.

-     */

-    public void createReplyConsumers(Collection<Destination> destinations, String selector) throws JMSException

-    {

-        /*log.debug("public void createReplyConsumers(Collection<Destination> destinations = " + destinations

-            + ", String selector = " + selector + "): called");*/

-

-        log.debug("There are " + destinations.size() + " destinations.");

-        log.debug("Creating " + _noOfConsumers + " consumers on each destination.");

-        log.debug("Total number of consumers is: " + (destinations.size() * _noOfConsumers));

-

-        for (Destination destination : destinations)

-        {

-            _consumer = new MessageConsumer[_noOfConsumers];

-

-            for (int i = 0; i < _noOfConsumers; i++)

-            {

-                // Create a consumer for the destination and set this pinger to listen to its messages.

-                _consumer[i] = _consumerSession[i].createConsumer(destination, selector, NO_LOCAL_DEFAULT);

-

-                final int consumerNo = i;

-

-                _consumer[i].setMessageListener(new MessageListener()

-                    {

-                        public void onMessage(Message message)

-                        {

-                            onMessageWithConsumerNo(message, consumerNo);

-                        }

-                    });

-

-                log.debug("Set consumer " + i + " to listen to replies sent to destination: " + destination);

-            }

-        }

-    }

-

-    /**

-     * Stores the received message in the replies map, then resets the boolean latch that a thread waiting for a

-     * correlating reply may be waiting on. This is only done if the reply has a correlation id that is expected in the

-     * replies map.

-     *

-     * @param message    The received message.

-     * @param consumerNo The consumer number within this test pinger instance.

-     */

-    public void onMessageWithConsumerNo(Message message, int consumerNo)

-    {

-        // log.debug("public void onMessageWithConsumerNo(Message message, int consumerNo = " + consumerNo + "): called");

-        try

-        {

-            long now = System.nanoTime();

-            long timestamp = getTimestamp(message);

-            long pingTime = now - timestamp;

-

-            // NDC.push("id" + instanceId + "/cons" + consumerNo);

-

-            // Extract the messages correlation id.

-            String correlationID = message.getJMSCorrelationID();

-            // log.debug("correlationID = " + correlationID);

-

-            // int num = message.getIntProperty("MSG_NUM");

-            // log.info("Message " + num + " received.");

-

-            boolean isRedelivered = message.getJMSRedelivered();

-            // log.debug("isRedelivered = " + isRedelivered);

-

-            if (!isRedelivered)

-            {

-                // Countdown on the traffic light if there is one for the matching correlation id.

-                PerCorrelationId perCorrelationId = perCorrelationIds.get(correlationID);

-

-                if (perCorrelationId != null)

-                {

-                    CountDownLatch trafficLight = perCorrelationId.trafficLight;

-

-                    // Restart the timeout timer on every message.

-                    perCorrelationId.timeOutStart = System.nanoTime();

-

-                    // log.debug("Reply was expected, decrementing the latch for the id, " + correlationID);

-

-                    // Release waiting senders if there are some and using maxPending limit.

-                    if ((_maxPendingSize > 0))

-                    {

-                        // Decrement the count of sent but not yet received messages.

-                        int unreceived = _unreceived.decrementAndGet();

-                        int unreceivedSize =

-                            (unreceived * ((_messageSize == 0) ? 1 : _messageSize))

-                            / (_isPubSub ? getConsumersPerDestination() : 1);

-

-                        // log.debug("unreceived = " + unreceived);

-                        // log.debug("unreceivedSize = " + unreceivedSize);

-

-                        // synchronized (_sendPauseMonitor)

-                        // {

-                        if (unreceivedSize < _maxPendingSize)

-                        {

-                            _sendPauseMonitor.poll();

-                        }

-                        // }

-                    }

-

-                    // Decrement the countdown latch. Before this point, it is possible that two threads might enter this

-                    // method simultanesouly with the same correlation id. Decrementing the latch in a synchronized block

-                    // ensures that each thread will get a unique value for the remaining messages.

-                    long trueCount;

-                    long remainingCount;

-

-                    synchronized (trafficLight)

-                    {

-                        trafficLight.countDown();

-

-                        trueCount = trafficLight.getCount();

-                        remainingCount = trueCount - 1;

-

-                        // NDC.push("/rem" + remainingCount);

-

-                        // log.debug("remainingCount = " + remainingCount);

-                        // log.debug("trueCount = " + trueCount);

-

-                        // Commit on transaction batch size boundaries. At this point in time the waiting producer

-                        // remains blocked, even on the last message.

-                        // Commit count is divided by noOfConsumers in p2p mode, so that each consumer only commits on

-                        // each batch boundary. For pub/sub each consumer gets every message so no division is done.

-                        // When running in client ack mode, an ack is done instead of a commit, on the commit batch

-                        // size boundaries.

-                        long commitCount = _isPubSub ? remainingCount : (remainingCount / _noOfConsumers);

-                        // log.debug("commitCount = " + commitCount);

-

-                        if ((commitCount % _txBatchSize) == 0)

-                        {

-                            if (_consAckMode == 2)

-                            {

-                                // log.debug("Doing client ack for consumer " + consumerNo + ".");

-                                message.acknowledge();

-                            }

-                            else

-                            {

-                                // log.debug("Trying commit for consumer " + consumerNo + ".");

-                                commitTx(_consumerSession[consumerNo]);

-                                // log.info("Tx committed on consumer " + consumerNo);

-                            }

-                        }

-

-                        // Forward the message and remaining count to any interested chained message listener.

-                        if (_chainedMessageListener != null)

-                        {

-                            _chainedMessageListener.onMessage(message, (int) remainingCount, pingTime);

-                        }

-

-                        // Check if this is the last message, in which case release any waiting producers. This is done

-                        // after the transaction has been committed and any listeners notified.

-                        if (trueCount == 1)

-                        {

-                            trafficLight.countDown();

-                        }

-                    }

-                }

-                else

-                {

-                    log.warn("Got unexpected message with correlationId: " + correlationID);

-                }

-            }

-            else

-            {

-                log.warn("Got redelivered message, ignoring.");

-            }

-        }

-        catch (JMSException e)

-        {

-            log.warn("There was a JMSException: " + e.getMessage(), e);

-        }

-        finally

-        {

-            // log.debug("public void onMessageWithConsumerNo(Message message, int consumerNo): ending");

-            // NDC.clear();

-        }

-    }

-

-    /**

-     * Sends the specified number of ping message and then waits for all correlating replies. If the wait times out

-     * before a reply arrives, then a null reply is returned from this method. This method allows the caller to specify

-     * the correlation id.

-     *

-     * @param message              The message to send. If this is null, one is generated.

-     * @param numPings             The number of ping messages to send.

-     * @param timeout              The timeout in milliseconds.

-     * @param messageCorrelationId The message correlation id. If this is null, one is generated.

-     *

-     * @return The number of replies received. This may be less than the number sent if the timeout terminated the wait

-     *         for all prematurely.

-     *

-     * @throws JMSException         All underlying JMSExceptions are allowed to fall through.

-     * @throws InterruptedException When interrupted by a timeout

-     */

-    public int pingAndWaitForReply(Message message, int numPings, long timeout, String messageCorrelationId)

-        throws JMSException, InterruptedException

-    {

-        /*log.debug("public int pingAndWaitForReply(Message message, int numPings = " + numPings + ", long timeout = "

-            + timeout + ", String messageCorrelationId = " + messageCorrelationId + "): called");*/

-

-        // Generate a unique correlation id to put on the messages before sending them, if one was not specified.

-        if (messageCorrelationId == null)

-        {

-            messageCorrelationId = Long.toString(_correlationIdGenerator.incrementAndGet());

-        }

-

-        try

-        {

-            // NDC.push("prod");

-

-            // Create a count down latch to count the number of replies with. This is created before the messages are

-            // sent so that the replies cannot be received before the count down is created.

-            // One is added to this, so that the last reply becomes a special case. The special case is that the

-            // chained message listener must be called before this sender can be unblocked, but that decrementing the

-            // countdown needs to be done before the chained listener can be called.

-            PerCorrelationId perCorrelationId = new PerCorrelationId();

-

-            perCorrelationId.trafficLight = new CountDownLatch(getExpectedNumPings(numPings) + 1);

-            perCorrelationIds.put(messageCorrelationId, perCorrelationId);

-

-            // Set up the current time as the start time for pinging on the correlation id. This is used to determine

-            // timeouts.

-            perCorrelationId.timeOutStart = System.nanoTime();

-

-            // Send the specifed number of messages.

-            pingNoWaitForReply(message, numPings, messageCorrelationId);

-

-            boolean timedOut;

-            boolean allMessagesReceived;

-            int numReplies;

-

-            do

-            {

-                // Block the current thread until replies to all the messages are received, or it times out.

-                perCorrelationId.trafficLight.await(timeout, TimeUnit.MILLISECONDS);

-

-                // Work out how many replies were receieved.

-                numReplies = getExpectedNumPings(numPings) - (int) perCorrelationId.trafficLight.getCount();

-

-                allMessagesReceived = numReplies == getExpectedNumPings(numPings);

-

-                // log.debug("numReplies = " + numReplies);

-                // log.debug("allMessagesReceived = " + allMessagesReceived);

-

-                // Recheck the timeout condition.

-                long now = System.nanoTime();

-                long lastMessageReceievedAt = perCorrelationId.timeOutStart;

-                timedOut = (now - lastMessageReceievedAt) > (timeout * 1000000);

-

-                // log.debug("now = " + now);

-                // log.debug("lastMessageReceievedAt = " + lastMessageReceievedAt);

-            }

-            while (!timedOut && !allMessagesReceived);

-

-            if ((numReplies < getExpectedNumPings(numPings)) && _verbose)

-            {

-                log.info("Timed out (" + timeout + " ms) before all replies received on id, " + messageCorrelationId);

-            }

-            else if (_verbose)

-            {

-                log.info("Got all replies on id, " + messageCorrelationId);

-            }

-

-            // commitTx(_consumerSession);

-

-            // log.debug("public int pingAndWaitForReply(Message message, int numPings, long timeout): ending");

-

-            return numReplies;

-        }

-        // Ensure that the message countdown latch is always removed from the reply map. The reply map is long lived,

-        // so will be a memory leak if this is not done.

-        finally

-        {

-            // NDC.pop();

-            perCorrelationIds.remove(messageCorrelationId);

-        }

-    }

-

-    /**

-     * Sends the specified number of ping messages and does not wait for correlating replies.

-     *

-     * @param message              The message to send.

-     * @param numPings             The number of pings to send.

-     * @param messageCorrelationId A correlation id to place on all messages sent.

-     *

-     * @throws JMSException All underlying JMSExceptions are allowed to fall through.

-     */

-    public void pingNoWaitForReply(Message message, int numPings, String messageCorrelationId) throws JMSException

-    {

-        /*log.debug("public void pingNoWaitForReply(Message message, int numPings = " + numPings

-            + ", String messageCorrelationId = " + messageCorrelationId + "): called");*/

-

-        if (message == null)

-        {

-            message = getTestMessage(getReplyDestinations().get(0), _messageSize, _persistent);

-        }

-

-        message.setJMSCorrelationID(messageCorrelationId);

-

-        // Set up a committed flag to detect uncommitted messages at the end of the send loop. This may occurr if the

-        // transaction batch size is not a factor of the number of pings. In which case an extra commit at the end is

-        // needed.

-        boolean committed = false;

-

-        // Send all of the ping messages.

-        for (int i = 0; i < numPings; i++)

-        {

-            // Re-timestamp the message.

-            // message.setLongProperty(MESSAGE_TIMESTAMP_PROPNAME, System.nanoTime());

-

-            // Send the message, passing in the message count.

-            committed = sendMessage(i, message);

-

-            // Spew out per message timings on every message sonly in verbose mode.

-            /*if (_verbose)

-            {

-                log.info(timestampFormatter.format(new Date()) + ": Pinged at with correlation id, " + messageCorrelationId);

-            }*/

-        }

-

-        // Call commit if the send loop finished before reaching a batch size boundary so there may still be uncommitted messages.

-        if (!committed)

-        {

-            commitTx(_producerSession);

-        }

-    }

-

-    /**

-     * Sends the sepcified message, applies rate limiting and possibly commits the current transaction. The count of

-     * messages sent so far must be specified and is used to round robin the ping destinations (where there are more

-     * than one), and to determine if the transaction batch size has been reached and the sent messages should be

-     * committed.

-     *

-     * @param i       The count of messages sent so far in a loop of multiple calls to this send method.

-     * @param message The message to send.

-     *

-     * @return <tt>true</tt> if the messages were committed, <tt>false</tt> otherwise.

-     *

-     * @throws JMSException All underlyiung JMSExceptions are allowed to fall through.

-     */

-    protected boolean sendMessage(int i, Message message) throws JMSException

-    {

-        try

-        {

-            NDC.push("id" + instanceId + "/prod");

-

-            // log.debug("protected boolean sendMessage(int i = " + i + ", Message message): called");

-            // log.debug("_txBatchSize = " + _txBatchSize);

-

-            // Round robin the destinations as the messages are sent.

-            Destination destination = _pingDestinations.get(i % _pingDestinations.size());

-

-            // Prompt the user to kill the broker when doing failover testing.

-            _failBeforeSend = waitForUserToPromptOnFailure(_failBeforeSend);

-

-            // Get the test setup for the correlation id.

-            String correlationID = message.getJMSCorrelationID();

-            PerCorrelationId perCorrelationId = perCorrelationIds.get(correlationID);

-

-            // If necessary, wait until the max pending message size comes within its limit.

-            if (_maxPendingSize > 0)

-            {

-                synchronized (_sendPauseMonitor)

-                {

-                    // Used to keep track of the number of times that send has to wait.

-                    int numWaits = 0;

-

-                    // The maximum number of waits before the test gives up and fails. This has been chosen to correspond with

-                    // the test timeout.

-                    int waitLimit = (int) (TIMEOUT_DEFAULT / 10000);

-

-                    while (true)

-                    {

-                        // Get the size estimate of sent but not yet received messages.

-                        int unreceived = _unreceived.get();

-                        int unreceivedSize =

-                            (unreceived * ((_messageSize == 0) ? 1 : _messageSize))

-                            / (_isPubSub ? getConsumersPerDestination() : 1);

-

-                        // log.debug("unreceived = " + unreceived);

-                        // log.debug("unreceivedSize = " + unreceivedSize);

-                        // log.debug("_maxPendingSize = " + _maxPendingSize);

-

-                        if (unreceivedSize > _maxPendingSize)

-                        {

-                            // log.debug("unreceived size estimate over limit = " + unreceivedSize);

-

-                            // Fail the test if the send has had to wait more than the maximum allowed number of times.

-                            if (numWaits > waitLimit)

-                            {

-                                String errorMessage =

-                                    "Send has had to wait for the unreceivedSize (" + unreceivedSize

-                                    + ") to come below the maxPendingSize (" + _maxPendingSize + ") more that " + waitLimit

-                                    + " times.";

-                                log.warn(errorMessage);

-                                throw new RuntimeException(errorMessage);

-                            }

-

-                            // Wait on the send pause barrier for the limit to be re-established.

-                            try

-                            {

-                                long start = System.nanoTime();

-                                // _sendPauseMonitor.wait(10000);

-                                _sendPauseMonitor.offer(new Object(), 10000, TimeUnit.MILLISECONDS);

-                                long end = System.nanoTime();

-

-                                // Count the wait only if it was for > 99% of the requested wait time.

-                                if (((float) (end - start) / (float) (10000 * 1000000L)) > 0.99)

-                                {

-                                    numWaits++;

-                                }

-                            }

-                            catch (InterruptedException e)

-                            {

-                                // Restore the interrupted status

-                                Thread.currentThread().interrupt();

-                                throw new RuntimeException(e);

-                            }

-                        }

-                        else

-                        {

-                            break;

-                        }

-                    }

-                }

-            }

-

-            // Send the message either to its round robin destination, or its default destination.

-            // int num = numSent.incrementAndGet();

-            // message.setIntProperty("MSG_NUM", num);

-            setTimestamp(message);

-

-            if (destination == null)

-            {

-                _producer.send(message);

-            }

-            else

-            {

-                _producer.send(destination, message);

-            }

-

-            // Increase the unreceived size, this may actually happen after the message is received.

-            // The unreceived size is incremented by the number of consumers that will get a copy of the message,

-            // in pub/sub mode.

-            if (_maxPendingSize > 0)

-            {

-                int newUnreceivedCount = _unreceived.addAndGet(_isPubSub ? getConsumersPerDestination() : 1);

-                // log.debug("newUnreceivedCount = " + newUnreceivedCount);

-            }

-

-            // Apply message rate throttling if a rate limit has been set up.

-            if (_rateLimiter != null)

-            {

-                _rateLimiter.throttle();

-            }

-

-            // Call commit every time the commit batch size is reached.

-            boolean committed = false;

-

-            // Commit on every transaction batch size boundary. Here i + 1 is the count of actual messages sent.

-            if (((i + 1) % _txBatchSize) == 0)

-            {

-                // log.debug("Trying commit on producer session.");

-                committed = commitTx(_producerSession);

-            }

-

-            return committed;

-        }

-        finally

-        {

-            NDC.clear();

-        }

-    }

-

-    /**

-     * If the specified fail flag is set, this method waits for the user to cause a failure and then indicate to the

-     * test that the failure has occurred, before the method returns.

-     *

-     * @param failFlag The fail flag to test.

-     *

-     * @return The new value for the fail flag. If the {@link #_failOnce} flag is set, then each fail flag is only

-     *         used once, then reset.

-     */

-    private boolean waitForUserToPromptOnFailure(boolean failFlag)

-    {

-        if (failFlag)

-        {

-            if (_failOnce)

-            {

-                failFlag = false;

-            }

-

-            // log.debug("Failing Before Send");

-            waitForUser(KILL_BROKER_PROMPT);

-        }

-

-        return failFlag;

-    }

-

-    /**

-     * Implements a single iteration of the ping loop. This sends the number of pings specified by the transaction batch

-     * size property, and waits for replies to all of them. Any errors cause the publish flag to be cleared, which will

-     * terminate the pinger.

-     */

-    public void pingLoop()

-    {

-        try

-        {

-            // Generate a sample message and time stamp it.

-            Message msg = getTestMessage(_replyDestination, _messageSize, _persistent);

-            // setTimestamp(msg);

-

-            // Send the message and wait for a reply.

-            pingAndWaitForReply(msg, TX_BATCH_SIZE_DEFAULT, TIMEOUT_DEFAULT, null);

-        }

-        catch (JMSException e)

-        {

-            _publish = false;

-            // log.debug("There was a JMSException: " + e.getMessage(), e);

-        }

-        catch (InterruptedException e)

-        {

-            _publish = false;

-            // log.debug("There was an interruption: " + e.getMessage(), e);

-        }

-    }

-

-    /**

-     * Sets a chained message listener. The message listener on this pinger, chains all its messages to the one set

-     * here.

-     *

-     * @param messageListener The chained message listener.

-     */

-    public void setChainedMessageListener(ChainedMessageListener messageListener)

-    {

-        _chainedMessageListener = messageListener;

-    }

-

-    /** Removes any chained message listeners from this pinger. */

-    public void removeChainedMessageListener()

-    {

-        _chainedMessageListener = null;

-    }

-

-    /**

-     * Generates a test message of the specified size, with the specified reply-to destination and persistence flag.

-     *

-     * @param replyQueue  The reply-to destination for the message.

-     * @param messageSize The desired size of the message in bytes.

-     * @param persistent  <tt>true</tt> if the message should use persistent delivery, <tt>false</tt> otherwise.

-     *

-     * @return A freshly generated test message.

-     *

-     * @throws javax.jms.JMSException All underlying JMSException are allowed to fall through.

-     */

-    public Message getTestMessage(Destination replyQueue, int messageSize, boolean persistent) throws JMSException

-    {

-        // return TestMessageFactory.newObjectMessage(_producerSession, replyQueue, messageSize, persistent);

-        return TestUtils.createTestMessageOfSize(_producerSession, messageSize);

-    }

-

-    /**

-     * Sets the current time in nanoseconds as the timestamp on the message.

-     *

-     * @param msg The message to timestamp.

-     *

-     * @throws JMSException Any JMSExceptions are allowed to fall through.

-     */

-    protected void setTimestamp(Message msg) throws JMSException

-    {

-        /*if (((AMQSession)_producerSession).isStrictAMQP())

-        {

-            ((AMQMessage)msg).setTimestampProperty(new AMQShortString(MESSAGE_TIMESTAMP_PROPNAME), System.nanoTime());

-        }

-        else

-        {*/

-        msg.setLongProperty(MESSAGE_TIMESTAMP_PROPNAME, System.nanoTime());

-        // }

-    }

-

-    /**

-     * Extracts the nanosecond timestamp from a message.

-     *

-     * @param msg The message to extract the time stamp from.

-     *

-     * @return The timestamp in nanos.

-     *

-     * @throws JMSException Any JMSExceptions are allowed to fall through.

-     */

-    protected long getTimestamp(Message msg) throws JMSException

-    {

-        /*if (((AMQSession)_producerSession).isStrictAMQP())

-        {

-            Long value = ((AMQMessage)msg).getTimestampProperty(new AMQShortString(MESSAGE_TIMESTAMP_PROPNAME));

-

-            return (value == null) ? 0L : value;

-        }

-        else

-        {*/

-        return msg.getLongProperty(PingPongProducer.MESSAGE_TIMESTAMP_PROPNAME);

-            // }

-    }

-

-    /**

-     * Stops the ping loop by clearing the publish flag. The current loop will complete when it notices that this flag

-     * has been cleared.

-     */

-    public void stop()

-    {

-        _publish = false;

-    }

-

-    /**

-     * Starts the producer and consumer connections.

-     *

-     * @throws JMSException Any JMSExceptions are allowed to fall through.

-     */

-    public void start() throws JMSException

-    {

-        // log.debug("public void start(): called");

-

-        _connection.start();

-        // log.debug("Producer started.");

-

-        for (int i = 0; i < _noOfConsumers; i++)

-        {

-            _consumerConnection[i].start();

-            // log.debug("Consumer " + i + " started.");

-        }

-    }

-

-    /** Implements a ping loop that repeatedly pings until the publish flag becomes false. */

-    public void run()

-    {

-        // Keep running until the publish flag is cleared.

-        while (_publish)

-        {

-            pingLoop();

-        }

-    }

-

-    /**

-     * Callback method, implementing ExceptionListener. This should be registered to listen for exceptions on the

-     * connection, this clears the publish flag which in turn will halt the ping loop.

-     *

-     * @param e The exception that triggered this callback method.

-     */

-    public void onException(JMSException e)

-    {

-        // log.debug("public void onException(JMSException e = " + e + "): called", e);

-        _publish = false;

-    }

-

-    /**

-     * Gets a shutdown hook that will cleanly shut this down when it is running the ping loop. This can be registered

-     * with the runtime system as a shutdown hook.

-     *

-     * @return A shutdown hook for the ping loop.

-     */

-    public Thread getShutdownHook()

-    {

-        return new Thread(new Runnable()

-                {

-                    public void run()

-                    {

-                        stop();

-                    }

-                });

-    }

-

-    /**

-     * Closes all of the producer and consumer connections.

-     *

-     * @throws JMSException All JMSException are allowed to fall through.

-     */

-    public void close() throws JMSException

-    {

-        // log.debug("public void close(): called");

-

-        try

-        {

-            if (_connection != null)

-            {

-                // log.debug("Before close producer connection.");

-                _connection.close();

-                // log.debug("Closed producer connection.");

-            }

-

-            for (int i = 0; i < _noOfConsumers; i++)

-            {

-                if (_consumerConnection[i] != null)

-                {

-                    // log.debug("Before close consumer connection " + i + ".");

-                    _consumerConnection[i].close();

-                    // log.debug("Closed consumer connection " + i + ".");

-                }

-            }

-        }

-        finally

-        {

-            _connection = null;

-            _producerSession = null;

-            _consumerSession = null;

-            _consumerConnection = null;

-            _producer = null;

-            _consumer = null;

-            _pingDestinations = null;

-            _replyDestination = null;

-        }

-    }

-

-    /**

-     * Convenience method to commit the transaction on the specified controlSession. If the controlSession to commit on is not a

-     * transactional controlSession, this method does nothing (unless the failover after send flag is set).

-     *

-     * <p/>If the {@link #_failAfterSend} flag is set, this will prompt the user to kill the broker before the commit is

-     * applied. This flag applies whether the pinger is transactional or not.

-     *

-     * <p/>If the {@link #_failBeforeCommit} flag is set, this will prompt the user to kill the broker before the commit

-     * is applied. If the {@link #_failAfterCommit} flag is set, this will prompt the user to kill the broker after the

-     * commit is applied. These flags will only apply if using a transactional pinger.

-     *

-     * @param session The controlSession to commit

-     *

-     * @return <tt>true</tt> if the controlSession was committed, <tt>false</tt> if it was not.

-     *

-     * @throws javax.jms.JMSException If the commit fails and then the rollback fails.

-     *

-     * @todo Consider moving the fail after send logic into the send method. It is confusing to have it in this commit

-     * method, because commits only apply to transactional pingers, but fail after send applied to transactional and

-     * non-transactional alike.

-     */

-    protected boolean commitTx(Session session) throws JMSException

-    {

-        // log.debug("protected void commitTx(Session session): called");

-

-        boolean committed = false;

-

-        _failAfterSend = waitForUserToPromptOnFailure(_failAfterSend);

-

-        if (session.getTransacted())

-        {

-            // log.debug("Session is transacted.");

-

-            try

-            {

-                _failBeforeCommit = waitForUserToPromptOnFailure(_failBeforeCommit);

-

-                long start = System.nanoTime();

-                session.commit();

-                committed = true;

-                // log.debug("Time taken to commit :" + ((System.nanoTime() - start) / 1000000f) + " ms");

-

-                _failAfterCommit = waitForUserToPromptOnFailure(_failAfterCommit);

-

-                // log.debug("Session Commited.");

-            }

-            catch (JMSException e)

-            {

-                // log.debug("JMSException on commit:" + e.getMessage(), e);

-

-                try

-                {

-                    session.rollback();

-                    // log.debug("Message rolled back.");

-                }

-                catch (JMSException jmse)

-                {

-                    // log.debug("JMSE on rollback:" + jmse.getMessage(), jmse);

-

-                    // Both commit and rollback failed. Throw the rollback exception.

-                    throw jmse;

-                }

-            }

-        }

-

-        return committed;

-    }

-

-    /**

-     * Outputs a prompt to the console and waits for the user to press return.

-     *

-     * @param prompt The prompt to display on the console.

-     */

-    public void waitForUser(String prompt)

-    {

-        System.out.println(prompt);

-

-        try

-        {

-            System.in.read();

-        }

-        catch (IOException e)

-        {

-            // Ignored.

-        }

-

-        System.out.println("Continuing.");

-    }

-

-    /**

-     * Gets the number of consumers that are listening to each destination in the test.

-     *

-     * @return int The number of consumers subscribing to each topic.

-     */

-    public int getConsumersPerDestination()

-    {

-        return _noOfConsumers;

-    }

-

-    /**

-     * Calculates how many pings are expected to be received for the given number sent.

-     *

-     * @param numpings The number of pings that will be sent.

-     *

-     * @return The number that should be received, for the test to pass.

-     */

-    public int getExpectedNumPings(int numpings)

-    {

-        // log.debug("public int getExpectedNumPings(int numpings = " + numpings + "): called");

-

-        // log.debug("Each ping will be received by " + (_isPubSub ? getConsumersPerDestination() : 1) + " consumers.");

-

-        return numpings * (_isPubSub ? getConsumersPerDestination() : 1);

-    }

-

-    /**

-     * Defines a chained message listener interface that can be attached to this pinger. Whenever this pinger's {@link

-     * PingPongProducer#onMessageWithConsumerNo} method is called, the chained listener set through the {@link

-     * PingPongProducer#setChainedMessageListener} method is passed the message, and the remaining expected count of

-     * messages with that correlation id.

-     *

-     * <p/>Provided only one pinger is producing messages with that correlation id, the chained listener will always be

-     * given unique message counts. It will always be called while the producer waiting for all messages to arrive is

-     * still blocked.

-     */

-    public static interface ChainedMessageListener

-    {

-        /**

-         * Notifies interested listeners about message arrival and important test stats, the number of messages

-         * remaining in the test, and the messages send timestamp.

-         *

-         * @param message        The newly arrived message.

-         * @param remainingCount The number of messages left to complete the test.

-         * @param latency        The nanosecond latency of the message.

-         *

-         * @throws JMSException Any JMS exceptions is allowed to fall through.

-         */

-        public void onMessage(Message message, int remainingCount, long latency) throws JMSException;

-    }

-

-    /**

-     * Holds information on each correlation id. The countdown latch, the current timeout timer... More stuff to be

-     * added to this: read/write lock to make onMessage more concurrent as described in class header comment.

-     */

-    protected static class PerCorrelationId

-    {

-        /** Holds a countdown on number of expected messages. */

-        CountDownLatch trafficLight;

-

-        /** Holds the last timestamp that the timeout was reset to. */

-        Long timeOutStart;

-    }

-}

diff --git a/qpid/java/perftests/src/main/java/org/apache/qpid/requestreply/PingPongTestPerf.java b/qpid/java/perftests/src/main/java/org/apache/qpid/requestreply/PingPongTestPerf.java
deleted file mode 100644
index 780589768f..0000000000
--- a/qpid/java/perftests/src/main/java/org/apache/qpid/requestreply/PingPongTestPerf.java
+++ /dev/null
@@ -1,251 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.requestreply;
-
-import junit.framework.Assert;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.apache.log4j.Logger;
-
-import uk.co.thebadgerset.junit.extensions.AsymptoticTestCase;
-import uk.co.thebadgerset.junit.extensions.util.ParsedProperties;
-import uk.co.thebadgerset.junit.extensions.util.TestContextProperties;
-
-import javax.jms.*;
-
-/**
- * PingPongTestPerf is a full round trip ping test, that has been written with the intention of being scaled up to run
- * many times simultaneously to simluate many clients/producer/connections. A full round trip ping sends a message from
- * a producer to a conumer, then the consumer replies to the message on a temporary queue.
- *
- * <p/>A single run of the test using the default JUnit test runner will result in the sending and timing of the number
- * of pings specified by the test size and time how long it takes for all of these to complete. This test may be scaled
- * up using a suitable JUnit test runner. See {@link uk.co.thebadgerset.junit.extensions.TKTestRunner} for more
- * information on how to do this.
- *
- * <p/>The setup/teardown cycle establishes a connection to a broker and sets up a queue to send ping messages to and a
- * temporary queue for replies. This setup is only established once for all the test repeats, but each test threads
- * gets its own connection/producer/consumer, this is only re-established if the connection is lost.
- *
- * <p/>The test cycle is: Connects to a queue, creates a temporary queue, creates messages containing a property that
- * is the name of the temporary queue, fires off many messages on the original queue and waits for them all to come
- * back on the temporary queue.
- *
- * <p/>Configurable test properties: message size, transacted or not, persistent or not. Broker connection details.
- *
- * <p><table id="crc"><caption>CRC Card</caption>
- * <tr><th> Responsibilities <th> Collaborations
- * </table>
- */
-public class PingPongTestPerf extends AsymptoticTestCase
-{
-    private static Logger _logger = Logger.getLogger(PingPongTestPerf.class);
-
-    /** Thread local to hold the per-thread test setup fields. */
-    ThreadLocal<PerThreadSetup> threadSetup = new ThreadLocal<PerThreadSetup>();
-
-    // Set up a property reader to extract the test parameters from. Once ContextualProperties is available in
-    // the project dependencies, use it to get property overrides for configurable tests and to notify the test runner
-    // of the test parameters to log with the results. It also providers some basic type parsing convenience methods.
-    // private Properties testParameters = System.getProperties();
-    private ParsedProperties testParameters =
-        TestContextProperties.getInstance(PingPongProducer.defaults /*System.getProperties()*/);
-
-    public PingPongTestPerf(String name)
-    {
-        super(name);
-
-        _logger.debug(testParameters);
-
-        // Sets up the test parameters with defaults.
-        /*testParameters.setPropertyIfNull(PingPongProducer.TX_BATCH_SIZE_PROPNAME,
-            Integer.toString(PingPongProducer.TX_BATCH_SIZE_DEFAULT));
-        testParameters.setPropertyIfNull(PingPongProducer.MESSAGE_SIZE_PROPNAME,
-            Integer.toString(PingPongProducer.MESSAGE_SIZE_DEAFULT));
-        testParameters.setPropertyIfNull(PingPongProducer.PING_QUEUE_NAME_PROPNAME,
-            PingPongProducer.PING_QUEUE_NAME_DEFAULT);
-        testParameters.setPropertyIfNull(PingPongProducer.PERSISTENT_MODE_PROPNAME,
-            Boolean.toString(PingPongProducer.PERSISTENT_MODE_DEFAULT));
-        testParameters.setPropertyIfNull(PingPongProducer.TRANSACTED_PROPNAME,
-            Boolean.toString(PingPongProducer.TRANSACTED_DEFAULT));
-        testParameters.setPropertyIfNull(PingPongProducer.BROKER_PROPNAME, PingPongProducer.BROKER_DEFAULT);
-        testParameters.setPropertyIfNull(PingPongProducer.USERNAME_PROPNAME, PingPongProducer.USERNAME_DEFAULT);
-        testParameters.setPropertyIfNull(PingPongProducer.PASSWORD_PROPNAME, PingPongProducer.PASSWORD_DEFAULT);
-        testParameters.setPropertyIfNull(PingPongProducer.VIRTUAL_HOST_PROPNAME, PingPongProducer.VIRTUAL_HOST_DEFAULT);
-        testParameters.setPropertyIfNull(PingPongProducer.VERBOSE_PROPNAME,
-            Boolean.toString(PingPongProducer.VERBOSE_DEFAULT));
-        testParameters.setPropertyIfNull(PingPongProducer.RATE_PROPNAME, Integer.toString(PingPongProducer.RATE_DEFAULT));
-        testParameters.setPropertyIfNull(PingPongProducer.PUBSUB_PROPNAME,
-            Boolean.toString(PingPongProducer.PUBSUB_DEFAULT));
-        testParameters.setPropertyIfNull(PingPongProducer.TX_BATCH_SIZE_PROPNAME,
-            Integer.toString(PingPongProducer.TX_BATCH_SIZE_DEFAULT));
-        testParameters.setPropertyIfNull(PingPongProducer.TIMEOUT_PROPNAME, Long.toString(PingPongProducer.TIMEOUT_DEFAULT));
-        testParameters.setPropertyIfNull(PingPongProducer.DESTINATION_COUNT_PROPNAME,
-            Integer.toString(PingPongProducer.DESTINATION_COUNT_DEFAULT));
-        testParameters.setPropertyIfNull(PingPongProducer.FAIL_AFTER_COMMIT_PROPNAME,
-            PingPongProducer.FAIL_AFTER_COMMIT_DEFAULT);
-        testParameters.setPropertyIfNull(PingPongProducer.FAIL_BEFORE_COMMIT_PROPNAME,
-            PingPongProducer.FAIL_BEFORE_COMMIT_DEFAULT);
-        testParameters.setPropertyIfNull(PingPongProducer.FAIL_AFTER_SEND_PROPNAME,
-            PingPongProducer.FAIL_AFTER_SEND_DEFAULT);
-        testParameters.setPropertyIfNull(PingPongProducer.FAIL_BEFORE_SEND_PROPNAME,
-            PingPongProducer.FAIL_BEFORE_SEND_DEFAULT);
-        testParameters.setPropertyIfNull(PingPongProducer.FAIL_ONCE_PROPNAME, PingPongProducer.FAIL_ONCE_DEFAULT);
-        testParameters.setPropertyIfNull(PingPongProducer.UNIQUE_DESTS_PROPNAME,
-            Boolean.toString(PingPongProducer.UNIQUE_DESTS_DEFAULT));
-        testParameters.setPropertyIfNull(PingPongProducer.ACK_MODE_PROPNAME,
-            Integer.toString(PingPongProducer.ACK_MODE_DEFAULT));
-        testParameters.setPropertyIfNull(PingPongProducer.PAUSE_AFTER_BATCH_PROPNAME,
-            PingPongProducer.PAUSE_AFTER_BATCH_DEFAULT);*/
-    }
-
-    /**
-     * Compile all the tests into a test suite.
-     */
-    public static Test suite()
-    {
-        // Build a new test suite
-        TestSuite suite = new TestSuite("Ping-Pong Performance Tests");
-
-        // Run performance tests in read committed mode.
-        suite.addTest(new PingPongTestPerf("testPingPongOk"));
-
-        return suite;
-    }
-
-    private static void setSystemPropertyIfNull(String propName, String propValue)
-    {
-        if (System.getProperty(propName) == null)
-        {
-            System.setProperty(propName, propValue);
-        }
-    }
-
-    public void testPingPongOk(int numPings) throws Exception
-    {
-        // Get the per thread test setup to run the test through.
-        PerThreadSetup perThreadSetup = threadSetup.get();
-
-        // Generate a sample message. This message is already time stamped and has its reply-to destination set.
-        Message msg =
-            perThreadSetup._testPingProducer.getTestMessage(perThreadSetup._testPingProducer.getReplyDestinations().get(0),
-                testParameters.getPropertyAsInteger(PingPongProducer.MESSAGE_SIZE_PROPNAME),
-                testParameters.getPropertyAsBoolean(PingPongProducer.PERSISTENT_MODE_PROPNAME));
-
-        // Send the message and wait for a reply.
-        int numReplies =
-            perThreadSetup._testPingProducer.pingAndWaitForReply(msg, numPings, PingPongProducer.TIMEOUT_DEFAULT, null);
-
-        // Fail the test if the timeout was exceeded.
-        if (numReplies != numPings)
-        {
-            Assert.fail("The ping timed out, got " + numReplies + " out of " + numPings);
-        }
-    }
-
-    /**
-     * Performs test fixture creation on a per thread basis. This will only be called once for each test thread.
-     */
-    public void threadSetUp()
-    {
-        try
-        {
-            PerThreadSetup perThreadSetup = new PerThreadSetup();
-
-            // Extract the test set up paramaeters.
-            String fileProperties = testParameters.getProperty(PingPongProducer.FILE_PROPERTIES_PROPNAME);
-            String factoryName = testParameters.getProperty(PingPongProducer.FACTORY_NAME_PROPNAME);
-            String username = testParameters.getProperty(PingPongProducer.USERNAME_PROPNAME);
-            String password = testParameters.getProperty(PingPongProducer.PASSWORD_PROPNAME);
-            String destinationName = testParameters.getProperty(PingPongProducer.PING_QUEUE_NAME_PROPNAME);
-            boolean persistent = testParameters.getPropertyAsBoolean(PingPongProducer.PERSISTENT_MODE_PROPNAME);
-            boolean transacted = testParameters.getPropertyAsBoolean(PingPongProducer.TRANSACTED_PROPNAME);
-            String selector = testParameters.getProperty(PingPongProducer.SELECTOR_PROPNAME);
-            boolean verbose = testParameters.getPropertyAsBoolean(PingPongProducer.VERBOSE_PROPNAME);
-            boolean pubsub = testParameters.getPropertyAsBoolean(PingPongProducer.PUBSUB_PROPNAME);
-
-            synchronized (this)
-            {
-                // Establish a bounce back client on the ping queue to bounce back the pings.
-                perThreadSetup._testPingBouncer =
-                    new PingPongBouncer(fileProperties, factoryName, username, password, destinationName, persistent,
-                        transacted, selector, verbose, pubsub);
-
-                // Start the connections for client and producer running.
-                perThreadSetup._testPingBouncer.getConnection().start();
-
-                // Establish a ping-pong client on the ping queue to send the pings and receive replies with.
-                perThreadSetup._testPingProducer = new PingPongProducer(testParameters);
-                perThreadSetup._testPingProducer.establishConnection(true, true);
-                perThreadSetup._testPingProducer.start();
-            }
-
-            // Attach the per-thread set to the thread.
-            threadSetup.set(perThreadSetup);
-        }
-        catch (Exception e)
-        {
-            _logger.warn("There was an exception during per thread setup.", e);
-        }
-    }
-
-    /**
-     * Performs test fixture clean
-     */
-    public void threadTearDown()
-    {
-        _logger.debug("public void threadTearDown(): called");
-
-        try
-        {
-            // Get the per thread test fixture.
-            PerThreadSetup perThreadSetup = threadSetup.get();
-
-            // Close the pingers so that it cleans up its connection cleanly.
-            synchronized (this)
-            {
-                perThreadSetup._testPingProducer.close();
-                // perThreadSetup._testPingBouncer.close();
-            }
-
-            // Ensure the per thread fixture is reclaimed.
-            threadSetup.remove();
-        }
-        catch (JMSException e)
-        {
-            _logger.warn("There was an exception during per thread tear down.");
-        }
-    }
-
-    protected static class PerThreadSetup
-    {
-        /**
-         * Holds the test ping-pong producer.
-         */
-        private PingPongProducer _testPingProducer;
-
-        /**
-         * Holds the test ping client.
-         */
-        private PingPongBouncer _testPingBouncer;
-    }
-}
diff --git a/qpid/java/perftests/src/main/java/perftests.log4j b/qpid/java/perftests/src/main/java/perftests.log4j
deleted file mode 100644
index badb617432..0000000000
--- a/qpid/java/perftests/src/main/java/perftests.log4j
+++ /dev/null
@@ -1,51 +0,0 @@
-#

-# Licensed to the Apache Software Foundation (ASF) under one

-# or more contributor license agreements.  See the NOTICE file

-# distributed with this work for additional information

-# regarding copyright ownership.  The ASF licenses this file

-# to you under the Apache License, Version 2.0 (the

-# "License"); you may not use this file except in compliance

-# with the License.  You may obtain a copy of the License at

-# 

-#   http://www.apache.org/licenses/LICENSE-2.0

-# 

-# Unless required by applicable law or agreed to in writing,

-# software distributed under the License is distributed on an

-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-# KIND, either express or implied.  See the License for the

-# specific language governing permissions and limitations

-# under the License.

-#

-log4j.rootLogger=${root.logging.level}

-

-

-log4j.logger.org.apache.qpid=${amqj.logging.level}, console

-log4j.additivity.org.apache.qpid=false

-

-log4j.logger.org.apache.qpidity=${amqj.logging.level}, console

-log4j.additivity.org.apache.qpidity=false

-

-log4j.logger.org.apache.mina=ERROR, console

-log4j.additivity.org.apache.mina=false

-

-log4j.logger.org.apache.qpid.requestreply=${amqj.test.logging.level}

-log4j.logger.org.apache.qpid.pingpong=${amqj.test.logging.level}

-log4j.logger.org.apache.qpid.ping=${amqj.test.logging.level}

-log4j.logger.org.apache.qpid.topic=${amqj.test.logging.level}

-

-

-log4j.logger.uk.co.thebadgerset.junit.extensions=${badger.level}, console

-log4j.additivity.uk.co.thebadgerset.junit.extensions=false

-

-log4j.appender.console=org.apache.log4j.ConsoleAppender

-log4j.appender.console.Threshold=all

-log4j.appender.console.layout=org.apache.log4j.PatternLayout

-

-log4j.appender.console.layout.ConversionPattern=%t %d %p [%c{4}] %m%n

-#log4j.appender.console.layout.ConversionPattern=%t %p [%c] %m%n

-

-log4j.appender.fileApp=org.apache.log4j.FileAppender

-log4j.appender.fileApp.file=${log.dir}/perftests.volumetest.log

-log4j.appender.fileApp.Threshold=info

-log4j.appender.fileApp.append=false

-log4j.appender.fileApp.layout=org.apache.log4j.PatternLayout

diff --git a/qpid/java/perftests/src/main/java/perftests.properties b/qpid/java/perftests/src/main/java/perftests.properties
deleted file mode 100644
index d97d0d3906..0000000000
--- a/qpid/java/perftests/src/main/java/perftests.properties
+++ /dev/null
@@ -1,46 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one

-# or more contributor license agreements.  See the NOTICE file

-# distributed with this work for additional information

-# regarding copyright ownership.  The ASF licenses this file

-# to you under the Apache License, Version 2.0 (the

-# "License"); you may not use this file except in compliance

-# with the License.  You may obtain a copy of the License at

-#

-#   http://www.apache.org/licenses/LICENSE-2.0

-#

-# Unless required by applicable law or agreed to in writing,

-# software distributed under the License is distributed on an

-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-# KIND, either express or implied.  See the License for the

-# specific language governing permissions and limitations

-# under the License.

-

-

-java.naming.factory.initial = org.apache.qpid.jndi.PropertiesFileInitialContextFactory

-

-# use the following property to configure the default connector

-#java.naming.provider.url - ignored.

-

-# register some connection factories

-# connectionfactory.[jndiname] = [ConnectionURL]

-#connectionfactory.local = amqp://guest:guest@clientid/test?brokerlist='tcp://192.168.1.10:5672'

-connectionfactory.local = amqp://guest:guest@clientid/test?brokerlist='tcp://localhost:5672'

-

-# A 0.10 connection factory

-##connectionfactory.local = qpid:password=pass;username=name@tcp:192.168.1.10:5672

-

-# register some queues in JNDI using the form

-# queue.[jndiName] = [physicalName]

-#queue.MyQueue = example.MyQueue

-queue.syncQueue = syncQueue

-queue.testQueue = testQueue

-

-# register some topics in JNDI using the form

-# topic.[jndiName] = [physicalName]

-#topic.ibmStocks = stocks.nyse.ibm

-topic.testTopic = testTopic

-

-# Register an AMQP destination in JNDI

-#   NOTE: Qpid currently only supports direct,topics and headers

-# destination.[jniName] = [BindingURL]

-destination.direct = direct://amq.direct//directQueue